From 4f0c2b0026230b33a5a2510912699361310e45ef Mon Sep 17 00:00:00 2001 From: enselic Date: Fri, 12 Sep 2008 22:40:44 +0000 Subject: Don't include config.h, recordmydesktop.h, rmdtypes.h, rmdfuncs.h or skeleton.h as system headers. include/rmdfunc.h include/rmdmacro.h include/rmdtypes.h include/recordmydesktop.h src/cleanup.c src/opendev.c src/rmd_jack.c src/wm_check.c src/get_frame.c src/parseargs.c src/rmd_cache.c src/rmd_error.c src/rmd_timer.c src/shortcuts.c src/specsfile.c src/getzpixmap.c src/load_cache.c src/rectinsert.c src/rmd_rescue.c src/rmdthreads.c src/cache_audio.c src/poll_events.c src/setbrwindow.c src/encode_cache.c src/flush_to_ogg.c src/init_encoder.c src/update_image.c src/capture_sound.c src/initialize_data.c src/queryextensions.c src/recordmydesktop.c src/make_dummy_pointer.c src/register_callbacks.c src/encode_image_buffer.c src/encode_sound_buffer.c: Changed. git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@515 f606c939-3180-4ac9-a4b8-4b8779d57d0a --- recordmydesktop/include/recordmydesktop.h | 2 +- recordmydesktop/include/rmdfunc.h | 4 +++- recordmydesktop/include/rmdmacro.h | 4 +++- recordmydesktop/include/rmdtypes.h | 2 +- recordmydesktop/src/cache_audio.c | 5 ++++- recordmydesktop/src/capture_sound.c | 3 ++- recordmydesktop/src/cleanup.c | 2 +- recordmydesktop/src/encode_cache.c | 2 +- recordmydesktop/src/encode_image_buffer.c | 5 ++++- recordmydesktop/src/encode_sound_buffer.c | 3 ++- recordmydesktop/src/flush_to_ogg.c | 2 +- recordmydesktop/src/get_frame.c | 3 +-- recordmydesktop/src/getzpixmap.c | 3 ++- recordmydesktop/src/init_encoder.c | 6 ++++-- recordmydesktop/src/initialize_data.c | 3 ++- recordmydesktop/src/load_cache.c | 2 +- recordmydesktop/src/make_dummy_pointer.c | 4 +++- recordmydesktop/src/opendev.c | 4 ++-- recordmydesktop/src/parseargs.c | 3 ++- recordmydesktop/src/poll_events.c | 9 +++++---- recordmydesktop/src/queryextensions.c | 4 +++- recordmydesktop/src/recordmydesktop.c | 2 +- recordmydesktop/src/rectinsert.c | 3 +-- recordmydesktop/src/register_callbacks.c | 3 ++- recordmydesktop/src/rmd_cache.c | 3 ++- recordmydesktop/src/rmd_error.c | 6 ++++-- recordmydesktop/src/rmd_jack.c | 3 ++- recordmydesktop/src/rmd_rescue.c | 2 +- recordmydesktop/src/rmd_timer.c | 5 +++-- recordmydesktop/src/rmdthreads.c | 7 ++++--- recordmydesktop/src/setbrwindow.c | 3 ++- recordmydesktop/src/shortcuts.c | 5 +++-- recordmydesktop/src/specsfile.c | 6 +++--- recordmydesktop/src/update_image.c | 3 ++- recordmydesktop/src/wm_check.c | 3 ++- 35 files changed, 80 insertions(+), 49 deletions(-) diff --git a/recordmydesktop/include/recordmydesktop.h b/recordmydesktop/include/recordmydesktop.h index 9c63a7f..adbc233 100644 --- a/recordmydesktop/include/recordmydesktop.h +++ b/recordmydesktop/include/recordmydesktop.h @@ -29,7 +29,7 @@ #define RECORDMYDESKTOP_H 1 #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif //header inclusion is completely fucked up diff --git a/recordmydesktop/include/rmdfunc.h b/recordmydesktop/include/rmdfunc.h index 01a1c92..a920150 100644 --- a/recordmydesktop/include/rmdfunc.h +++ b/recordmydesktop/include/rmdfunc.h @@ -24,15 +24,17 @@ * For further information contact me at johnvarouhakis@gmail.com * ******************************************************************************/ + #ifndef RMDFUNC_H #define RMDFUNC_H 1 #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif #include "rmdtypes.h" + /**Function prototypes*/ /** diff --git a/recordmydesktop/include/rmdmacro.h b/recordmydesktop/include/rmdmacro.h index 13455ed..90fbe2a 100644 --- a/recordmydesktop/include/rmdmacro.h +++ b/recordmydesktop/include/rmdmacro.h @@ -24,15 +24,17 @@ * For further information contact me at johnvarouhakis@gmail.com * ******************************************************************************/ + #ifndef RMDMACRO_H #define RMDMACRO_H 1 #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif #include "rmdtypes.h" + //define which way we are reading a pixmap #if __BYTE_ORDER == __LITTLE_ENDIAN #define __ABYTE 3 diff --git a/recordmydesktop/include/rmdtypes.h b/recordmydesktop/include/rmdtypes.h index 08e72dd..2601211 100644 --- a/recordmydesktop/include/rmdtypes.h +++ b/recordmydesktop/include/rmdtypes.h @@ -26,7 +26,7 @@ #define RMDTYPES_H 1 #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif diff --git a/recordmydesktop/src/cache_audio.c b/recordmydesktop/src/cache_audio.c index 27e90b5..387d536 100644 --- a/recordmydesktop/src/cache_audio.c +++ b/recordmydesktop/src/cache_audio.c @@ -24,7 +24,10 @@ * For further information contact me at johnvarouhakis@gmail.com * ******************************************************************************/ -#include + +#include "recordmydesktop.h" + + void *CacheSoundBuffer(ProgData *pdata){ //We are simply going to throw sound on the disk. //It's sound is tiny compared to that of image, so diff --git a/recordmydesktop/src/capture_sound.c b/recordmydesktop/src/capture_sound.c index f6e5c2a..1a87429 100644 --- a/recordmydesktop/src/capture_sound.c +++ b/recordmydesktop/src/capture_sound.c @@ -25,7 +25,8 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" + void *CaptureSound(ProgData *pdata){ diff --git a/recordmydesktop/src/cleanup.c b/recordmydesktop/src/cleanup.c index 1874535..26b6e1f 100644 --- a/recordmydesktop/src/cleanup.c +++ b/recordmydesktop/src/cleanup.c @@ -24,7 +24,7 @@ * For further information contact me at johnvarouhakis@gmail.com * ******************************************************************************/ -#include +#include "recordmydesktop.h" void CleanUp(void){ diff --git a/recordmydesktop/src/encode_cache.c b/recordmydesktop/src/encode_cache.c index 833c9e9..73b79c6 100644 --- a/recordmydesktop/src/encode_cache.c +++ b/recordmydesktop/src/encode_cache.c @@ -25,7 +25,7 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" void EncodeCache(ProgData *pdata){ diff --git a/recordmydesktop/src/encode_image_buffer.c b/recordmydesktop/src/encode_image_buffer.c index e081db4..7b21263 100644 --- a/recordmydesktop/src/encode_image_buffer.c +++ b/recordmydesktop/src/encode_image_buffer.c @@ -24,7 +24,10 @@ * For further information contact me at johnvarouhakis@gmail.com * ******************************************************************************/ -#include + +#include "recordmydesktop.h" + + void *EncodeImageBuffer(ProgData *pdata){ pdata->th_encoding_clean=0; while(pdata->running){ diff --git a/recordmydesktop/src/encode_sound_buffer.c b/recordmydesktop/src/encode_sound_buffer.c index 8125abe..c58d926 100644 --- a/recordmydesktop/src/encode_sound_buffer.c +++ b/recordmydesktop/src/encode_sound_buffer.c @@ -25,7 +25,8 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" + void *EncodeSoundBuffer(ProgData *pdata){ int sampread=pdata->periodsize; diff --git a/recordmydesktop/src/flush_to_ogg.c b/recordmydesktop/src/flush_to_ogg.c index 5b50f01..b8a1b1e 100644 --- a/recordmydesktop/src/flush_to_ogg.c +++ b/recordmydesktop/src/flush_to_ogg.c @@ -24,7 +24,7 @@ * For further information contact me at johnvarouhakis@gmail.com * ******************************************************************************/ -#include +#include "recordmydesktop.h" //we copy the page because the next call to ogg_stream_pageout //will invalidate it. But we must have pages from diff --git a/recordmydesktop/src/get_frame.c b/recordmydesktop/src/get_frame.c index 7274d7f..8de95aa 100644 --- a/recordmydesktop/src/get_frame.c +++ b/recordmydesktop/src/get_frame.c @@ -25,8 +25,7 @@ ******************************************************************************/ -#include - +#include "recordmydesktop.h" #include "rectinsert.h" diff --git a/recordmydesktop/src/getzpixmap.c b/recordmydesktop/src/getzpixmap.c index fdc1b3d..742ffb8 100644 --- a/recordmydesktop/src/getzpixmap.c +++ b/recordmydesktop/src/getzpixmap.c @@ -25,7 +25,8 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" + int GetZPixmap(Display *dpy, Window root, diff --git a/recordmydesktop/src/init_encoder.c b/recordmydesktop/src/init_encoder.c index ab79c6e..b9413bc 100644 --- a/recordmydesktop/src/init_encoder.c +++ b/recordmydesktop/src/init_encoder.c @@ -25,9 +25,11 @@ ******************************************************************************/ -#include #include -#include + +#include "recordmydesktop.h" +#include "skeleton.h" + void m_add_fishead_packet(ogg_stream_state *m_ogg_state){ diff --git a/recordmydesktop/src/initialize_data.c b/recordmydesktop/src/initialize_data.c index 083519b..f6fe59d 100644 --- a/recordmydesktop/src/initialize_data.c +++ b/recordmydesktop/src/initialize_data.c @@ -25,7 +25,8 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" + #ifdef HAVE_LIBASOUND void FixBufferSize(snd_pcm_uframes_t *buffsize){ diff --git a/recordmydesktop/src/load_cache.c b/recordmydesktop/src/load_cache.c index 020e90f..e61b8f6 100644 --- a/recordmydesktop/src/load_cache.c +++ b/recordmydesktop/src/load_cache.c @@ -25,7 +25,7 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" //The number of bytes for every diff --git a/recordmydesktop/src/make_dummy_pointer.c b/recordmydesktop/src/make_dummy_pointer.c index ef552d6..033e112 100644 --- a/recordmydesktop/src/make_dummy_pointer.c +++ b/recordmydesktop/src/make_dummy_pointer.c @@ -24,7 +24,9 @@ * For further information contact me at johnvarouhakis@gmail.com * ******************************************************************************/ -#include + +#include "recordmydesktop.h" + unsigned char *MakeDummyPointer(DisplaySpecs *specs, int size, diff --git a/recordmydesktop/src/opendev.c b/recordmydesktop/src/opendev.c index c3d6960..45ce2d0 100644 --- a/recordmydesktop/src/opendev.c +++ b/recordmydesktop/src/opendev.c @@ -27,9 +27,9 @@ -// #include +// #include "recordmydesktop.h" #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif #include diff --git a/recordmydesktop/src/parseargs.c b/recordmydesktop/src/parseargs.c index ae07562..335691c 100644 --- a/recordmydesktop/src/parseargs.c +++ b/recordmydesktop/src/parseargs.c @@ -25,7 +25,8 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" + void PrintConfig(void){ fprintf(stderr,"\nrecordMyDesktop was compiled with" diff --git a/recordmydesktop/src/poll_events.c b/recordmydesktop/src/poll_events.c index ee281e6..5cbb16d 100644 --- a/recordmydesktop/src/poll_events.c +++ b/recordmydesktop/src/poll_events.c @@ -26,7 +26,7 @@ #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif #include @@ -35,9 +35,10 @@ #include #include #include -#include -#include -#include + +#include "rmdfunc.h" +#include "rmdtypes.h" +#include "rmdmacro.h" #include "rectinsert.h" diff --git a/recordmydesktop/src/queryextensions.c b/recordmydesktop/src/queryextensions.c index 72ca74f..a733f34 100644 --- a/recordmydesktop/src/queryextensions.c +++ b/recordmydesktop/src/queryextensions.c @@ -25,9 +25,11 @@ ******************************************************************************/ -#include #include +#include "recordmydesktop.h" + + void QueryExtensions(Display *dpy, ProgArgs *args, int *damage_event, diff --git a/recordmydesktop/src/recordmydesktop.c b/recordmydesktop/src/recordmydesktop.c index 49f9d1b..413e22c 100644 --- a/recordmydesktop/src/recordmydesktop.c +++ b/recordmydesktop/src/recordmydesktop.c @@ -25,7 +25,7 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" int main(int argc,char **argv){ diff --git a/recordmydesktop/src/rectinsert.c b/recordmydesktop/src/rectinsert.c index c293b44..61e931e 100644 --- a/recordmydesktop/src/rectinsert.c +++ b/recordmydesktop/src/rectinsert.c @@ -25,8 +25,7 @@ ******************************************************************************/ -#include - +#include "recordmydesktop.h" #include "rectinsert.h" diff --git a/recordmydesktop/src/register_callbacks.c b/recordmydesktop/src/register_callbacks.c index ba1b371..c20a94b 100644 --- a/recordmydesktop/src/register_callbacks.c +++ b/recordmydesktop/src/register_callbacks.c @@ -25,7 +25,8 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" + void SetPaused(int signum){ diff --git a/recordmydesktop/src/rmd_cache.c b/recordmydesktop/src/rmd_cache.c index ad4388f..823b08b 100644 --- a/recordmydesktop/src/rmd_cache.c +++ b/recordmydesktop/src/rmd_cache.c @@ -24,7 +24,8 @@ * For further information contact me at johnvarouhakis@gmail.com * ******************************************************************************/ -#include + +#include "recordmydesktop.h" /** diff --git a/recordmydesktop/src/rmd_error.c b/recordmydesktop/src/rmd_error.c index 89ad8e6..4c0a449 100644 --- a/recordmydesktop/src/rmd_error.c +++ b/recordmydesktop/src/rmd_error.c @@ -26,14 +26,16 @@ #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif #include #include #include #include -#include + +#include "rmdfunc.h" + int rmdErrorHandler( Display *dpy, XErrorEvent *e ) { diff --git a/recordmydesktop/src/rmd_jack.c b/recordmydesktop/src/rmd_jack.c index aacb883..7dca73b 100644 --- a/recordmydesktop/src/rmd_jack.c +++ b/recordmydesktop/src/rmd_jack.c @@ -25,7 +25,8 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" + #ifdef HAVE_JACK_H diff --git a/recordmydesktop/src/rmd_rescue.c b/recordmydesktop/src/rmd_rescue.c index 59eb1eb..e480468 100644 --- a/recordmydesktop/src/rmd_rescue.c +++ b/recordmydesktop/src/rmd_rescue.c @@ -26,7 +26,7 @@ -#include +#include "recordmydesktop.h" int rmdRescue(const char *path){ diff --git a/recordmydesktop/src/rmd_timer.c b/recordmydesktop/src/rmd_timer.c index ff6fddc..5aac3bd 100644 --- a/recordmydesktop/src/rmd_timer.c +++ b/recordmydesktop/src/rmd_timer.c @@ -26,12 +26,13 @@ #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif #include #include -#include + +#include "recordmydesktop.h" void *rmdTimer(ProgData *pdata){ diff --git a/recordmydesktop/src/rmdthreads.c b/recordmydesktop/src/rmdthreads.c index dcd270e..a0bdb87 100644 --- a/recordmydesktop/src/rmdthreads.c +++ b/recordmydesktop/src/rmdthreads.c @@ -26,15 +26,16 @@ #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif #include #include #include #include -#include -#include + +#include "rmdfunc.h" +#include "rmdtypes.h" diff --git a/recordmydesktop/src/setbrwindow.c b/recordmydesktop/src/setbrwindow.c index 94c1fa0..2d1f453 100644 --- a/recordmydesktop/src/setbrwindow.c +++ b/recordmydesktop/src/setbrwindow.c @@ -25,7 +25,8 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" + /** *Align the recording window to a divisible by 2 pixel start and diff --git a/recordmydesktop/src/shortcuts.c b/recordmydesktop/src/shortcuts.c index 235a7fe..9b4779a 100644 --- a/recordmydesktop/src/shortcuts.c +++ b/recordmydesktop/src/shortcuts.c @@ -26,7 +26,7 @@ #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif #include @@ -35,7 +35,8 @@ #include #include #include -#include + +#include "rmdtypes.h" int RegisterShortcut(Display *dpy, Window root, diff --git a/recordmydesktop/src/specsfile.c b/recordmydesktop/src/specsfile.c index 0e3b8e4..ffc89ec 100644 --- a/recordmydesktop/src/specsfile.c +++ b/recordmydesktop/src/specsfile.c @@ -24,15 +24,15 @@ * For further information contact me at johnvarouhakis@gmail.com * ******************************************************************************/ + #ifdef HAVE_CONFIG_H - #include + #include "config.h" #endif - #include #include -#include +#include "rmdtypes.h" int WriteSpecsFile(ProgData *pdata){ diff --git a/recordmydesktop/src/update_image.c b/recordmydesktop/src/update_image.c index 9807321..bccd544 100644 --- a/recordmydesktop/src/update_image.c +++ b/recordmydesktop/src/update_image.c @@ -25,7 +25,8 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" + void UpdateImage(Display * dpy, yuv_buffer *yuv, diff --git a/recordmydesktop/src/wm_check.c b/recordmydesktop/src/wm_check.c index d667e1a..eea614b 100644 --- a/recordmydesktop/src/wm_check.c +++ b/recordmydesktop/src/wm_check.c @@ -25,7 +25,8 @@ ******************************************************************************/ -#include +#include "recordmydesktop.h" + char *rmdWMCheck(Display *dpy,Window root){ -- cgit v1.2.3