diff options
| -rw-r--r-- | recordmydesktop/src/Makefile.am | 152 | ||||
| -rw-r--r-- | recordmydesktop/src/recordmydesktop.c | 18 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_block_utils.c (renamed from recordmydesktop/src/block_utils.c) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_block_utils.h (renamed from recordmydesktop/src/block_utils.h) | 6 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_cache.c | 6 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_cache.h | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_cache_audio.c (renamed from recordmydesktop/src/cache_audio.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_cache_audio.h (renamed from recordmydesktop/src/cache_audio.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_cache_frame.c (renamed from recordmydesktop/src/cache_frame.c) | 6 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_cache_frame.h (renamed from recordmydesktop/src/cache_frame.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_capture_sound.c (renamed from recordmydesktop/src/capture_sound.c) | 6 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_capture_sound.h (renamed from recordmydesktop/src/capture_sound.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_encode_cache.c (renamed from recordmydesktop/src/encode_cache.c) | 10 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_encode_cache.h (renamed from recordmydesktop/src/encode_cache.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_encode_image_buffer.c (renamed from recordmydesktop/src/encode_image_buffer.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_encode_image_buffer.h (renamed from recordmydesktop/src/encode_image_buffer.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_encode_sound_buffer.c (renamed from recordmydesktop/src/encode_sound_buffer.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_encode_sound_buffer.h (renamed from recordmydesktop/src/encode_sound_buffer.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_error.h | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_flush_to_ogg.c (renamed from recordmydesktop/src/flush_to_ogg.c) | 8 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_flush_to_ogg.h (renamed from recordmydesktop/src/flush_to_ogg.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_frame.h | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_get_frame.c (renamed from recordmydesktop/src/get_frame.c) | 14 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_get_frame.h (renamed from recordmydesktop/src/get_frame.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_getzpixmap.c (renamed from recordmydesktop/src/getzpixmap.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_getzpixmap.h (renamed from recordmydesktop/src/getzpixmap.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_init_encoder.c (renamed from recordmydesktop/src/init_encoder.c) | 10 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_init_encoder.h (renamed from recordmydesktop/src/init_encoder.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_initialize_data.c (renamed from recordmydesktop/src/initialize_data.c) | 12 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_initialize_data.h (renamed from recordmydesktop/src/initialize_data.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_jack.c | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_jack.h | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_load_cache.c (renamed from recordmydesktop/src/load_cache.c) | 10 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_load_cache.h (renamed from recordmydesktop/src/load_cache.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_macro.h (renamed from recordmydesktop/src/rmdmacro.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_make_dummy_pointer.c (renamed from recordmydesktop/src/make_dummy_pointer.c) | 6 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_make_dummy_pointer.h (renamed from recordmydesktop/src/make_dummy_pointer.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_opendev.c (renamed from recordmydesktop/src/opendev.c) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_opendev.h (renamed from recordmydesktop/src/opendev.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_parseargs.c (renamed from recordmydesktop/src/parseargs.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_parseargs.h (renamed from recordmydesktop/src/parseargs.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_poll_events.c (renamed from recordmydesktop/src/poll_events.c) | 8 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_poll_events.h (renamed from recordmydesktop/src/poll_events.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_queryextensions.c (renamed from recordmydesktop/src/queryextensions.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_queryextensions.h (renamed from recordmydesktop/src/queryextensions.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_rectinsert.c (renamed from recordmydesktop/src/rectinsert.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_rectinsert.h (renamed from recordmydesktop/src/rectinsert.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_register_callbacks.c (renamed from recordmydesktop/src/register_callbacks.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_register_callbacks.h (renamed from recordmydesktop/src/register_callbacks.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_rescue.c | 12 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_setbrwindow.c (renamed from recordmydesktop/src/setbrwindow.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_setbrwindow.h (renamed from recordmydesktop/src/setbrwindow.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_shortcuts.c (renamed from recordmydesktop/src/shortcuts.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_shortcuts.h (renamed from recordmydesktop/src/shortcuts.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_specsfile.c (renamed from recordmydesktop/src/specsfile.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_specsfile.h (renamed from recordmydesktop/src/specsfile.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_threads.c (renamed from recordmydesktop/src/rmdthreads.c) | 21 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_threads.h (renamed from recordmydesktop/src/rmdthreads.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_timer.c | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_timer.h | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_types.h (renamed from recordmydesktop/src/rmdtypes.h) | 0 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_update_image.c (renamed from recordmydesktop/src/update_image.c) | 8 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_update_image.h (renamed from recordmydesktop/src/update_image.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_wm_check.c (renamed from recordmydesktop/src/wm_check.c) | 4 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_wm_check.h (renamed from recordmydesktop/src/wm_check.h) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_yuv_utils.c (renamed from recordmydesktop/src/yuv_utils.c) | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/rmd_yuv_utils.h (renamed from recordmydesktop/src/yuv_utils.h) | 6 | ||||
| -rw-r--r-- | recordmydesktop/src/test-rectinsert-types.h | 2 | ||||
| -rw-r--r-- | recordmydesktop/src/test-rectinsert.c | 6 |
69 files changed, 226 insertions, 223 deletions
diff --git a/recordmydesktop/src/Makefile.am b/recordmydesktop/src/Makefile.am index b334e7b..575b6da 100644 --- a/recordmydesktop/src/Makefile.am +++ b/recordmydesktop/src/Makefile.am @@ -1,77 +1,77 @@ bin_PROGRAMS = recordmydesktop recordmydesktop_SOURCES = \ - block_utils.c \ - block_utils.h \ - cache_audio.c \ - cache_audio.h \ - cache_frame.c \ - cache_frame.h \ - capture_sound.c \ - capture_sound.h \ - encode_cache.c \ - encode_cache.h \ - encode_image_buffer.c \ - encode_image_buffer.h \ - encode_sound_buffer.c \ - encode_sound_buffer.h \ - flush_to_ogg.c \ - flush_to_ogg.h \ - get_frame.c \ - get_frame.h \ - getzpixmap.c \ - getzpixmap.h \ - init_encoder.c \ - init_encoder.h \ - initialize_data.c \ - initialize_data.h \ - load_cache.c \ - load_cache.h \ - make_dummy_pointer.c \ - make_dummy_pointer.h \ - opendev.c \ - opendev.h \ - parseargs.c \ - parseargs.h \ - poll_events.c \ - poll_events.h \ - queryextensions.c \ - queryextensions.h \ - recordmydesktop.c \ - rectinsert.c \ - rectinsert.h \ - register_callbacks.c \ - register_callbacks.h \ - rmd_cache.c \ - rmd_cache.h \ - rmd_error.c \ - rmd_error.h \ - rmd_frame.c \ - rmd_frame.h \ - rmd_jack.c \ - rmd_jack.h \ - rmd_rescue.c \ - rmd_rescue.h \ - rmd_timer.c \ - rmd_timer.h \ - rmdthreads.c \ - rmdthreads.h \ - rmdmacro.h \ - rmdtypes.h \ - setbrwindow.c \ - setbrwindow.h \ - shortcuts.c \ - shortcuts.h \ - skeleton.c \ - skeleton.h \ - specsfile.c \ - specsfile.h \ - update_image.c \ - update_image.h \ - yuv_utils.c \ - yuv_utils.h \ - wm_check.c \ - wm_check.h + recordmydesktop.c \ + rmd_block_utils.c \ + rmd_block_utils.h \ + rmd_cache.c \ + rmd_cache.h \ + rmd_cache_audio.c \ + rmd_cache_audio.h \ + rmd_cache_frame.c \ + rmd_cache_frame.h \ + rmd_capture_sound.c \ + rmd_capture_sound.h \ + rmd_encode_cache.c \ + rmd_encode_cache.h \ + rmd_encode_image_buffer.c \ + rmd_encode_image_buffer.h \ + rmd_encode_sound_buffer.c \ + rmd_encode_sound_buffer.h \ + rmd_error.c \ + rmd_error.h \ + rmd_flush_to_ogg.c \ + rmd_flush_to_ogg.h \ + rmd_frame.c \ + rmd_frame.h \ + rmd_get_frame.c \ + rmd_get_frame.h \ + rmd_getzpixmap.c \ + rmd_getzpixmap.h \ + rmd_init_encoder.c \ + rmd_init_encoder.h \ + rmd_initialize_data.c \ + rmd_initialize_data.h \ + rmd_jack.c \ + rmd_jack.h \ + rmd_load_cache.c \ + rmd_load_cache.h \ + rmd_macro.h \ + rmd_make_dummy_pointer.c \ + rmd_make_dummy_pointer.h \ + rmd_opendev.c \ + rmd_opendev.h \ + rmd_parseargs.c \ + rmd_parseargs.h \ + rmd_poll_events.c \ + rmd_poll_events.h \ + rmd_queryextensions.c \ + rmd_queryextensions.h \ + rmd_rectinsert.c \ + rmd_rectinsert.h \ + rmd_register_callbacks.c \ + rmd_register_callbacks.h \ + rmd_rescue.c \ + rmd_rescue.h \ + rmd_setbrwindow.c \ + rmd_setbrwindow.h \ + rmd_shortcuts.c \ + rmd_shortcuts.h \ + rmd_specsfile.c \ + rmd_specsfile.h \ + rmd_threads.c \ + rmd_threads.h \ + rmd_timer.c \ + rmd_timer.h \ + rmd_types.h \ + rmd_update_image.c \ + rmd_update_image.h \ + rmd_wm_check.c \ + rmd_wm_check.h \ + rmd_yuv_utils.c \ + rmd_yuv_utils.h \ + skeleton.c \ + skeleton.h recordmydesktop_CPPFLAGS = -D_THREAD_SAFE -pthread -Wall recordmydesktop_LDFLAGS = @X_LIBS@ @X_EXTRA_LIBS@ @X_PRE_LIBS@ @@ -83,10 +83,10 @@ EXTRA_PROGRAMS = test-rectinsert CLEANFILES = $(EXTRA_PROGRAMS) test_rectinsert_SOURCES = \ - test-rectinsert.c \ - test-rectinsert-data.c \ - test-rectinsert-data.h \ - test-rectinsert-types.h \ - rectinsert.c + test-rectinsert.c \ + test-rectinsert-data.c \ + test-rectinsert-data.h \ + test-rectinsert-types.h \ + rmd_rectinsert.c test_rectinsert_CFLAGS = -Wall diff --git a/recordmydesktop/src/recordmydesktop.c b/recordmydesktop/src/recordmydesktop.c index eeb04a5..5eb4bf2 100644 --- a/recordmydesktop/src/recordmydesktop.c +++ b/recordmydesktop/src/recordmydesktop.c @@ -26,18 +26,18 @@ #include "config.h" -#include "rmdtypes.h" +#include "rmd_types.h" -#include "encode_cache.h" -#include "initialize_data.h" -#include "parseargs.h" -#include "queryextensions.h" +#include "rmd_encode_cache.h" +#include "rmd_initialize_data.h" +#include "rmd_parseargs.h" +#include "rmd_queryextensions.h" #include "rmd_cache.h" #include "rmd_error.h" -#include "rmdthreads.h" -#include "setbrwindow.h" -#include "shortcuts.h" -#include "wm_check.h" +#include "rmd_threads.h" +#include "rmd_setbrwindow.h" +#include "rmd_shortcuts.h" +#include "rmd_wm_check.h" int main(int argc,char **argv){ diff --git a/recordmydesktop/src/block_utils.c b/recordmydesktop/src/rmd_block_utils.c index 99b4ce0..20b5aac 100644 --- a/recordmydesktop/src/block_utils.c +++ b/recordmydesktop/src/rmd_block_utils.c @@ -26,7 +26,7 @@ #include "config.h" -#include "block_utils.h" +#include "rmd_block_utils.h" // FIXME: These globals are modified in other source files! We keep diff --git a/recordmydesktop/src/block_utils.h b/recordmydesktop/src/rmd_block_utils.h index 1c2e429..02aa77f 100644 --- a/recordmydesktop/src/block_utils.h +++ b/recordmydesktop/src/rmd_block_utils.h @@ -27,9 +27,9 @@ #ifndef BLOCK_UTILS_H #define BLOCK_UTILS_H 1 -#include "rmdtypes.h" -#include "rmdmacro.h" -#include "yuv_utils.h" +#include "rmd_macro.h" +#include "rmd_types.h" +#include "rmd_yuv_utils.h" // We keep these global for now. FIXME: Isolate them. diff --git a/recordmydesktop/src/rmd_cache.c b/recordmydesktop/src/rmd_cache.c index 6fa23eb..18e7bf3 100644 --- a/recordmydesktop/src/rmd_cache.c +++ b/recordmydesktop/src/rmd_cache.c @@ -28,11 +28,11 @@ #include <sys/stat.h> -#include "rmdtypes.h" +#include "rmd_types.h" #include "rmd_cache.h" -#include "specsfile.h" -#include "rmdmacro.h" +#include "rmd_macro.h" +#include "rmd_specsfile.h" /** diff --git a/recordmydesktop/src/rmd_cache.h b/recordmydesktop/src/rmd_cache.h index 4ddb5e9..01efa21 100644 --- a/recordmydesktop/src/rmd_cache.h +++ b/recordmydesktop/src/rmd_cache.h @@ -27,7 +27,7 @@ #ifndef RMD_CACHE_H #define RMD_CACHE_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/cache_audio.c b/recordmydesktop/src/rmd_cache_audio.c index 25f86d3..dc2edf3 100644 --- a/recordmydesktop/src/cache_audio.c +++ b/recordmydesktop/src/rmd_cache_audio.c @@ -28,9 +28,9 @@ #include <pthread.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "cache_audio.h" +#include "rmd_cache_audio.h" #include "rmd_jack.h" diff --git a/recordmydesktop/src/cache_audio.h b/recordmydesktop/src/rmd_cache_audio.h index 3c2a3ce..2820c42 100644 --- a/recordmydesktop/src/cache_audio.h +++ b/recordmydesktop/src/rmd_cache_audio.h @@ -27,7 +27,7 @@ #ifndef CACHE_AUDIO_H #define CACHE_AUDIO_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/cache_frame.c b/recordmydesktop/src/rmd_cache_frame.c index 4528ae9..1c98ec9 100644 --- a/recordmydesktop/src/cache_frame.c +++ b/recordmydesktop/src/rmd_cache_frame.c @@ -29,11 +29,11 @@ #include <signal.h> #include <math.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "cache_frame.h" +#include "rmd_block_utils.h" #include "rmd_cache.h" -#include "block_utils.h" +#include "rmd_cache_frame.h" //minimize hard disk access diff --git a/recordmydesktop/src/cache_frame.h b/recordmydesktop/src/rmd_cache_frame.h index adf698c..347c50d 100644 --- a/recordmydesktop/src/cache_frame.h +++ b/recordmydesktop/src/rmd_cache_frame.h @@ -27,7 +27,7 @@ #ifndef CACHE_FRAME_H #define CACHE_FRAME_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/capture_sound.c b/recordmydesktop/src/rmd_capture_sound.c index 0607aa7..b9be47b 100644 --- a/recordmydesktop/src/capture_sound.c +++ b/recordmydesktop/src/rmd_capture_sound.c @@ -28,11 +28,11 @@ #include <pthread.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "capture_sound.h" -#include "opendev.h" +#include "rmd_capture_sound.h" #include "rmd_jack.h" +#include "rmd_opendev.h" void *CaptureSound(ProgData *pdata){ diff --git a/recordmydesktop/src/capture_sound.h b/recordmydesktop/src/rmd_capture_sound.h index c2b6d18..b4e6531 100644 --- a/recordmydesktop/src/capture_sound.h +++ b/recordmydesktop/src/rmd_capture_sound.h @@ -27,7 +27,7 @@ #ifndef CAPTURE_SOUND_H #define CAPTURE_SOUND_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/encode_cache.c b/recordmydesktop/src/rmd_encode_cache.c index a1d23a3..40b0a8d 100644 --- a/recordmydesktop/src/encode_cache.c +++ b/recordmydesktop/src/rmd_encode_cache.c @@ -28,12 +28,12 @@ #include <pthread.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "encode_cache.h" -#include "flush_to_ogg.h" -#include "init_encoder.h" -#include "load_cache.h" +#include "rmd_encode_cache.h" +#include "rmd_flush_to_ogg.h" +#include "rmd_init_encoder.h" +#include "rmd_load_cache.h" void EncodeCache(ProgData *pdata){ diff --git a/recordmydesktop/src/encode_cache.h b/recordmydesktop/src/rmd_encode_cache.h index 661b00b..2c021c3 100644 --- a/recordmydesktop/src/encode_cache.h +++ b/recordmydesktop/src/rmd_encode_cache.h @@ -27,7 +27,7 @@ #ifndef ENCODE_CACHE_H #define ENCODE_CACHE_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/encode_image_buffer.c b/recordmydesktop/src/rmd_encode_image_buffer.c index aee3673..4b91239 100644 --- a/recordmydesktop/src/encode_image_buffer.c +++ b/recordmydesktop/src/rmd_encode_image_buffer.c @@ -26,9 +26,9 @@ #include "config.h" -#include "rmdtypes.h" +#include "rmd_types.h" -#include "encode_image_buffer.h" +#include "rmd_encode_image_buffer.h" void *EncodeImageBuffer(ProgData *pdata){ diff --git a/recordmydesktop/src/encode_image_buffer.h b/recordmydesktop/src/rmd_encode_image_buffer.h index e5bb51f..dcb2435 100644 --- a/recordmydesktop/src/encode_image_buffer.h +++ b/recordmydesktop/src/rmd_encode_image_buffer.h @@ -27,7 +27,7 @@ #ifndef ENCODE_IMAGE_BUFFER_H #define ENCODE_IMAGE_BUFFER_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/encode_sound_buffer.c b/recordmydesktop/src/rmd_encode_sound_buffer.c index 5b7c880..3f67d40 100644 --- a/recordmydesktop/src/encode_sound_buffer.c +++ b/recordmydesktop/src/rmd_encode_sound_buffer.c @@ -28,9 +28,9 @@ #include <pthread.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "encode_sound_buffer.h" +#include "rmd_encode_sound_buffer.h" #include "rmd_jack.h" diff --git a/recordmydesktop/src/encode_sound_buffer.h b/recordmydesktop/src/rmd_encode_sound_buffer.h index 1757240..b773e12 100644 --- a/recordmydesktop/src/encode_sound_buffer.h +++ b/recordmydesktop/src/rmd_encode_sound_buffer.h @@ -27,7 +27,7 @@ #ifndef ENCODE_SOUND_BUFFER_H #define ENCODE_SOUND_BUFFER_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/rmd_error.h b/recordmydesktop/src/rmd_error.h index 82529c7..4d27264 100644 --- a/recordmydesktop/src/rmd_error.h +++ b/recordmydesktop/src/rmd_error.h @@ -27,7 +27,7 @@ #ifndef RMD_ERROR_H #define RMD_ERROR_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /* diff --git a/recordmydesktop/src/flush_to_ogg.c b/recordmydesktop/src/rmd_flush_to_ogg.c index 05007af..1f78115 100644 --- a/recordmydesktop/src/flush_to_ogg.c +++ b/recordmydesktop/src/rmd_flush_to_ogg.c @@ -28,11 +28,11 @@ #include <pthread.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "encode_image_buffer.h" -#include "encode_sound_buffer.h" -#include "flush_to_ogg.h" +#include "rmd_encode_image_buffer.h" +#include "rmd_encode_sound_buffer.h" +#include "rmd_flush_to_ogg.h" //we copy the page because the next call to ogg_stream_pageout diff --git a/recordmydesktop/src/flush_to_ogg.h b/recordmydesktop/src/rmd_flush_to_ogg.h index d7a2fcd..a97a3b3 100644 --- a/recordmydesktop/src/flush_to_ogg.h +++ b/recordmydesktop/src/rmd_flush_to_ogg.h @@ -27,7 +27,7 @@ #ifndef FLUSH_TO_OGG_H #define FLUSH_TO_OGG_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/rmd_frame.h b/recordmydesktop/src/rmd_frame.h index 9d46662..c3969f8 100644 --- a/recordmydesktop/src/rmd_frame.h +++ b/recordmydesktop/src/rmd_frame.h @@ -27,7 +27,7 @@ #ifndef RMD_FRAME_H #define RMD_FRAME_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /* diff --git a/recordmydesktop/src/get_frame.c b/recordmydesktop/src/rmd_get_frame.c index bc221db..045368c 100644 --- a/recordmydesktop/src/get_frame.c +++ b/recordmydesktop/src/rmd_get_frame.c @@ -33,16 +33,16 @@ #include <X11/extensions/Xfixes.h> #include <X11/extensions/XShm.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "get_frame.h" -#include "getzpixmap.h" -#include "poll_events.h" -#include "rectinsert.h" #include "rmd_cache.h" #include "rmd_frame.h" -#include "update_image.h" -#include "yuv_utils.h" +#include "rmd_get_frame.h" +#include "rmd_getzpixmap.h" +#include "rmd_poll_events.h" +#include "rmd_rectinsert.h" +#include "rmd_update_image.h" +#include "rmd_yuv_utils.h" #define AVG_4_PIXELS(data_array,width_img,k_tm,i_tm,offset)\ diff --git a/recordmydesktop/src/get_frame.h b/recordmydesktop/src/rmd_get_frame.h index 9c4c6d0..36c378d 100644 --- a/recordmydesktop/src/get_frame.h +++ b/recordmydesktop/src/rmd_get_frame.h @@ -27,7 +27,7 @@ #ifndef GET_FRAME_H #define GET_FRAME_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/getzpixmap.c b/recordmydesktop/src/rmd_getzpixmap.c index b73bd01..f001844 100644 --- a/recordmydesktop/src/getzpixmap.c +++ b/recordmydesktop/src/rmd_getzpixmap.c @@ -31,9 +31,9 @@ #include <X11/extensions/shmstr.h> #include <X11/extensions/XShm.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "getzpixmap.h" +#include "rmd_getzpixmap.h" int GetZPixmap(Display *dpy, diff --git a/recordmydesktop/src/getzpixmap.h b/recordmydesktop/src/rmd_getzpixmap.h index 68242b0..b154e5a 100644 --- a/recordmydesktop/src/getzpixmap.h +++ b/recordmydesktop/src/rmd_getzpixmap.h @@ -27,7 +27,7 @@ #ifndef GETZPIXMAP_H #define GETZPIXMAP_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/init_encoder.c b/recordmydesktop/src/rmd_init_encoder.c index b093292..4fb2538 100644 --- a/recordmydesktop/src/init_encoder.c +++ b/recordmydesktop/src/rmd_init_encoder.c @@ -26,15 +26,17 @@ #include "config.h" +#include <stdio.h> #include <string.h> #include <sys/stat.h> -#include "rmdtypes.h" - -#include "init_encoder.h" -#include "rmdmacro.h" #include "skeleton.h" +#include "rmd_types.h" + +#include "rmd_init_encoder.h" +#include "rmd_macro.h" + static void m_add_fishead_packet(ogg_stream_state *m_ogg_state) { diff --git a/recordmydesktop/src/init_encoder.h b/recordmydesktop/src/rmd_init_encoder.h index 42ebaa8..fd871bb 100644 --- a/recordmydesktop/src/init_encoder.h +++ b/recordmydesktop/src/rmd_init_encoder.h @@ -27,7 +27,7 @@ #ifndef INIT_ENCODER_H #define INIT_ENCODER_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/initialize_data.c b/recordmydesktop/src/rmd_initialize_data.c index 72d38cb..c71dc9b 100644 --- a/recordmydesktop/src/initialize_data.c +++ b/recordmydesktop/src/rmd_initialize_data.c @@ -28,15 +28,15 @@ #include <pthread.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "block_utils.h" -#include "init_encoder.h" -#include "make_dummy_pointer.h" -#include "opendev.h" +#include "rmd_block_utils.h" #include "rmd_cache.h" +#include "rmd_init_encoder.h" #include "rmd_jack.h" -#include "yuv_utils.h" +#include "rmd_make_dummy_pointer.h" +#include "rmd_opendev.h" +#include "rmd_yuv_utils.h" #ifdef HAVE_LIBASOUND diff --git a/recordmydesktop/src/initialize_data.h b/recordmydesktop/src/rmd_initialize_data.h index 3ffc244..29bd2fc 100644 --- a/recordmydesktop/src/initialize_data.h +++ b/recordmydesktop/src/rmd_initialize_data.h @@ -27,7 +27,7 @@ #ifndef INITIALIZE_DATA_H #define INITIALIZE_DATA_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/rmd_jack.c b/recordmydesktop/src/rmd_jack.c index 9038781..25ae297 100644 --- a/recordmydesktop/src/rmd_jack.c +++ b/recordmydesktop/src/rmd_jack.c @@ -28,10 +28,10 @@ #include <pthread.h> -#include "rmdtypes.h" +#include "rmd_types.h" #include "rmd_jack.h" -#include "rmdmacro.h" +#include "rmd_macro.h" #ifdef HAVE_JACK_H diff --git a/recordmydesktop/src/rmd_jack.h b/recordmydesktop/src/rmd_jack.h index 96492b0..55d8991 100644 --- a/recordmydesktop/src/rmd_jack.h +++ b/recordmydesktop/src/rmd_jack.h @@ -27,7 +27,7 @@ #ifndef RMD_JACK_H #define RMD_JACK_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" #ifdef HAVE_JACK_H diff --git a/recordmydesktop/src/load_cache.c b/recordmydesktop/src/rmd_load_cache.c index 4a86ada..c402473 100644 --- a/recordmydesktop/src/load_cache.c +++ b/recordmydesktop/src/rmd_load_cache.c @@ -29,13 +29,13 @@ #include <pthread.h> #include <signal.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "encode_image_buffer.h" -#include "encode_sound_buffer.h" -#include "load_cache.h" #include "rmd_cache.h" -#include "rmdmacro.h" +#include "rmd_encode_image_buffer.h" +#include "rmd_encode_sound_buffer.h" +#include "rmd_load_cache.h" +#include "rmd_macro.h" //The number of bytes for every diff --git a/recordmydesktop/src/load_cache.h b/recordmydesktop/src/rmd_load_cache.h index fca0cbb..055c720 100644 --- a/recordmydesktop/src/load_cache.h +++ b/recordmydesktop/src/rmd_load_cache.h @@ -27,7 +27,7 @@ #ifndef LOAD_CACHE #define LOAD_CACHE 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/rmdmacro.h b/recordmydesktop/src/rmd_macro.h index c02adc2..78e6102 100644 --- a/recordmydesktop/src/rmdmacro.h +++ b/recordmydesktop/src/rmd_macro.h @@ -31,7 +31,7 @@ #include <limits.h> -#include "rmdtypes.h" +#include "rmd_types.h" //define which way we are reading a pixmap diff --git a/recordmydesktop/src/make_dummy_pointer.c b/recordmydesktop/src/rmd_make_dummy_pointer.c index 77363e5..e49178e 100644 --- a/recordmydesktop/src/make_dummy_pointer.c +++ b/recordmydesktop/src/rmd_make_dummy_pointer.c @@ -26,10 +26,10 @@ #include "config.h" -#include "rmdtypes.h" +#include "rmd_types.h" -#include "make_dummy_pointer.h" -#include "rmdmacro.h" +#include "rmd_macro.h" +#include "rmd_make_dummy_pointer.h" unsigned char *MakeDummyPointer(DisplaySpecs *specs, diff --git a/recordmydesktop/src/make_dummy_pointer.h b/recordmydesktop/src/rmd_make_dummy_pointer.h index 391416b..c0aa144 100644 --- a/recordmydesktop/src/make_dummy_pointer.h +++ b/recordmydesktop/src/rmd_make_dummy_pointer.h @@ -27,7 +27,7 @@ #ifndef MAKE_DUMMY_POINTER_H #define MAKE_DUMMY_POINTER_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/opendev.c b/recordmydesktop/src/rmd_opendev.c index 43d2dcd..9b334ab 100644 --- a/recordmydesktop/src/opendev.c +++ b/recordmydesktop/src/rmd_opendev.c @@ -38,7 +38,7 @@ #include <sys/soundcard.h> #endif -#include "opendev.h" +#include "rmd_opendev.h" #ifdef HAVE_LIBASOUND diff --git a/recordmydesktop/src/opendev.h b/recordmydesktop/src/rmd_opendev.h index c6ac144..c782a02 100644 --- a/recordmydesktop/src/opendev.h +++ b/recordmydesktop/src/rmd_opendev.h @@ -27,7 +27,7 @@ #ifndef OPENDEV_H #define OPENDEV_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" #ifdef HAVE_LIBASOUND diff --git a/recordmydesktop/src/parseargs.c b/recordmydesktop/src/rmd_parseargs.c index 863f34f..4fa1eac 100644 --- a/recordmydesktop/src/parseargs.c +++ b/recordmydesktop/src/rmd_parseargs.c @@ -26,10 +26,10 @@ #include "config.h" -#include "rmdtypes.h" +#include "rmd_types.h" +#include "rmd_macro.h" #include "rmd_rescue.h" -#include "rmdmacro.h" static void PrintConfig(void) { diff --git a/recordmydesktop/src/parseargs.h b/recordmydesktop/src/rmd_parseargs.h index cec12d9..02c3966 100644 --- a/recordmydesktop/src/parseargs.h +++ b/recordmydesktop/src/rmd_parseargs.h @@ -27,7 +27,7 @@ #ifndef PARSEARGS_H #define PARSEARGS_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/poll_events.c b/recordmydesktop/src/rmd_poll_events.c index 35e1320..bfe96c9 100644 --- a/recordmydesktop/src/poll_events.c +++ b/recordmydesktop/src/rmd_poll_events.c @@ -34,11 +34,11 @@ #include <signal.h> #include <pthread.h> -#include "poll_events.h" -#include "rectinsert.h" #include "rmd_frame.h" -#include "rmdmacro.h" -#include "rmdtypes.h" +#include "rmd_macro.h" +#include "rmd_poll_events.h" +#include "rmd_rectinsert.h" +#include "rmd_types.h" #define CLIP_EVENT_AREA(e,brwin,wgeom){\ diff --git a/recordmydesktop/src/poll_events.h b/recordmydesktop/src/rmd_poll_events.h index 6195237..b0418b9 100644 --- a/recordmydesktop/src/poll_events.h +++ b/recordmydesktop/src/rmd_poll_events.h @@ -27,7 +27,7 @@ #ifndef POLL_EVENTS_H #define POLL_EVENTS_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/queryextensions.c b/recordmydesktop/src/rmd_queryextensions.c index 3164932..cc9c69c 100644 --- a/recordmydesktop/src/queryextensions.c +++ b/recordmydesktop/src/rmd_queryextensions.c @@ -30,9 +30,9 @@ #include <X11/extensions/Xfixes.h> #include <X11/extensions/Xdamage.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "queryextensions.h" +#include "rmd_queryextensions.h" void QueryExtensions(Display *dpy, diff --git a/recordmydesktop/src/queryextensions.h b/recordmydesktop/src/rmd_queryextensions.h index bde9abd..578bd73 100644 --- a/recordmydesktop/src/queryextensions.h +++ b/recordmydesktop/src/rmd_queryextensions.h @@ -27,7 +27,7 @@ #ifndef QUERYEXTENSIONS_H #define QUERYEXTENSIONS_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/rectinsert.c b/recordmydesktop/src/rmd_rectinsert.c index 258ff6e..df43e15 100644 --- a/recordmydesktop/src/rectinsert.c +++ b/recordmydesktop/src/rmd_rectinsert.c @@ -26,8 +26,8 @@ #include "config.h" -#include "rmdtypes.h" -#include "rectinsert.h" +#include "rmd_rectinsert.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/rectinsert.h b/recordmydesktop/src/rmd_rectinsert.h index 414f01f..6f93cb6 100644 --- a/recordmydesktop/src/rectinsert.h +++ b/recordmydesktop/src/rmd_rectinsert.h @@ -28,7 +28,7 @@ #define RECTINSERT_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/register_callbacks.c b/recordmydesktop/src/rmd_register_callbacks.c index de6d93e..6291825 100644 --- a/recordmydesktop/src/register_callbacks.c +++ b/recordmydesktop/src/rmd_register_callbacks.c @@ -28,9 +28,9 @@ #include <signal.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "register_callbacks.h" +#include "rmd_register_callbacks.h" // There seem to be no way of passing user data to the signal handler, diff --git a/recordmydesktop/src/register_callbacks.h b/recordmydesktop/src/rmd_register_callbacks.h index 1fb3b76..b1e41e2 100644 --- a/recordmydesktop/src/register_callbacks.h +++ b/recordmydesktop/src/rmd_register_callbacks.h @@ -28,7 +28,7 @@ #define REGISTER_CALLBACKS_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/rmd_rescue.c b/recordmydesktop/src/rmd_rescue.c index 783636f..b017e92 100644 --- a/recordmydesktop/src/rmd_rescue.c +++ b/recordmydesktop/src/rmd_rescue.c @@ -28,14 +28,14 @@ #include <pthread.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "block_utils.h" -#include "encode_cache.h" -#include "initialize_data.h" -#include "register_callbacks.h" +#include "rmd_block_utils.h" +#include "rmd_encode_cache.h" +#include "rmd_initialize_data.h" +#include "rmd_register_callbacks.h" #include "rmd_rescue.h" -#include "specsfile.h" +#include "rmd_specsfile.h" int rmdRescue(const char *path){ diff --git a/recordmydesktop/src/setbrwindow.c b/recordmydesktop/src/rmd_setbrwindow.c index edc4d14..17b77bb 100644 --- a/recordmydesktop/src/setbrwindow.c +++ b/recordmydesktop/src/rmd_setbrwindow.c @@ -26,9 +26,9 @@ #include "config.h" -#include "rmdtypes.h" +#include "rmd_types.h" -#include "setbrwindow.h" +#include "rmd_setbrwindow.h" /** diff --git a/recordmydesktop/src/setbrwindow.h b/recordmydesktop/src/rmd_setbrwindow.h index 0ed9c93..91894fd 100644 --- a/recordmydesktop/src/setbrwindow.h +++ b/recordmydesktop/src/rmd_setbrwindow.h @@ -27,7 +27,7 @@ #ifndef SETBRWINDOW_H #define SETBRWINDOW_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/shortcuts.c b/recordmydesktop/src/rmd_shortcuts.c index a449f57..a4031bc 100644 --- a/recordmydesktop/src/shortcuts.c +++ b/recordmydesktop/src/rmd_shortcuts.c @@ -33,8 +33,8 @@ #include <X11/Xlibint.h> #include <X11/keysym.h> -#include "rmdtypes.h" -#include "shortcuts.h" +#include "rmd_shortcuts.h" +#include "rmd_types.h" int RegisterShortcut(Display *dpy, Window root, diff --git a/recordmydesktop/src/shortcuts.h b/recordmydesktop/src/rmd_shortcuts.h index ea93ba2..6b36854 100644 --- a/recordmydesktop/src/shortcuts.h +++ b/recordmydesktop/src/rmd_shortcuts.h @@ -27,7 +27,7 @@ #ifndef SHORTCUTS_H #define CHORTCUTS_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /* diff --git a/recordmydesktop/src/specsfile.c b/recordmydesktop/src/rmd_specsfile.c index a34037f..13ec249 100644 --- a/recordmydesktop/src/specsfile.c +++ b/recordmydesktop/src/rmd_specsfile.c @@ -29,8 +29,8 @@ #include <stdlib.h> #include <stdio.h> -#include "rmdtypes.h" -#include "specsfile.h" +#include "rmd_specsfile.h" +#include "rmd_types.h" int WriteSpecsFile(ProgData *pdata){ diff --git a/recordmydesktop/src/specsfile.h b/recordmydesktop/src/rmd_specsfile.h index eed0942..f381eaa 100644 --- a/recordmydesktop/src/specsfile.h +++ b/recordmydesktop/src/rmd_specsfile.h @@ -27,7 +27,7 @@ #ifndef SPECSFILE_H #define SPECSFILE_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /* diff --git a/recordmydesktop/src/rmdthreads.c b/recordmydesktop/src/rmd_threads.c index 6fac928..f500384 100644 --- a/recordmydesktop/src/rmdthreads.c +++ b/recordmydesktop/src/rmd_threads.c @@ -31,18 +31,19 @@ #include <stdlib.h> #include <unistd.h> -#include "cache_audio.h" -#include "cache_frame.h" -#include "capture_sound.h" -#include "encode_image_buffer.h" -#include "encode_sound_buffer.h" -#include "flush_to_ogg.h" -#include "get_frame.h" -#include "register_callbacks.h" +#include "rmd_types.h" + +#include "rmd_cache_audio.h" +#include "rmd_cache_frame.h" +#include "rmd_capture_sound.h" +#include "rmd_encode_image_buffer.h" +#include "rmd_encode_sound_buffer.h" +#include "rmd_flush_to_ogg.h" +#include "rmd_get_frame.h" #include "rmd_jack.h" +#include "rmd_register_callbacks.h" +#include "rmd_threads.h" #include "rmd_timer.h" -#include "rmdthreads.h" -#include "rmdtypes.h" void rmdThreads(ProgData *pdata){ diff --git a/recordmydesktop/src/rmdthreads.h b/recordmydesktop/src/rmd_threads.h index c832c1c..e2c103a 100644 --- a/recordmydesktop/src/rmdthreads.h +++ b/recordmydesktop/src/rmd_threads.h @@ -27,7 +27,7 @@ #ifndef RMDTHREADS_H #define RMDTHREADS_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/rmd_timer.c b/recordmydesktop/src/rmd_timer.c index ed3dbc2..78de72b 100644 --- a/recordmydesktop/src/rmd_timer.c +++ b/recordmydesktop/src/rmd_timer.c @@ -30,7 +30,7 @@ #include <stdio.h> #include <stdlib.h> -#include "rmdtypes.h" +#include "rmd_types.h" #include "rmd_timer.h" diff --git a/recordmydesktop/src/rmd_timer.h b/recordmydesktop/src/rmd_timer.h index 28b9898..d9292d9 100644 --- a/recordmydesktop/src/rmd_timer.h +++ b/recordmydesktop/src/rmd_timer.h @@ -27,7 +27,7 @@ #ifndef RMD_TIMER_H #define RMD_TIMER_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/rmdtypes.h b/recordmydesktop/src/rmd_types.h index e520c84..e520c84 100644 --- a/recordmydesktop/src/rmdtypes.h +++ b/recordmydesktop/src/rmd_types.h diff --git a/recordmydesktop/src/update_image.c b/recordmydesktop/src/rmd_update_image.c index 7d22cc9..0051e69 100644 --- a/recordmydesktop/src/update_image.c +++ b/recordmydesktop/src/rmd_update_image.c @@ -30,11 +30,11 @@ #include <X11/extensions/shmstr.h> #include <X11/extensions/XShm.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "getzpixmap.h" -#include "update_image.h" -#include "yuv_utils.h" +#include "rmd_getzpixmap.h" +#include "rmd_update_image.h" +#include "rmd_yuv_utils.h" void UpdateImage(Display * dpy, diff --git a/recordmydesktop/src/update_image.h b/recordmydesktop/src/rmd_update_image.h index 7c67e25..f31e735 100644 --- a/recordmydesktop/src/update_image.h +++ b/recordmydesktop/src/rmd_update_image.h @@ -27,7 +27,7 @@ #ifndef UPDATE_IMAGE_H #define UPDATE_IMAGE_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/wm_check.c b/recordmydesktop/src/rmd_wm_check.c index 79bff6b..b0692da 100644 --- a/recordmydesktop/src/wm_check.c +++ b/recordmydesktop/src/rmd_wm_check.c @@ -28,9 +28,9 @@ #include <X11/Xatom.h> -#include "rmdtypes.h" +#include "rmd_types.h" -#include "wm_check.h" +#include "rmd_wm_check.h" char *rmdWMCheck(Display *dpy,Window root){ diff --git a/recordmydesktop/src/wm_check.h b/recordmydesktop/src/rmd_wm_check.h index 1867dc2..12f33dd 100644 --- a/recordmydesktop/src/wm_check.h +++ b/recordmydesktop/src/rmd_wm_check.h @@ -27,7 +27,7 @@ #ifndef WM_CHECK_H #define WM_CHECK_H 1 -#include "rmdtypes.h" +#include "rmd_types.h" /** diff --git a/recordmydesktop/src/yuv_utils.c b/recordmydesktop/src/rmd_yuv_utils.c index 742905e..8996ad7 100644 --- a/recordmydesktop/src/yuv_utils.c +++ b/recordmydesktop/src/rmd_yuv_utils.c @@ -26,7 +26,7 @@ #include "config.h" -#include "yuv_utils.h" +#include "rmd_yuv_utils.h" // Keep these global (for performance reasons I assume). unsigned char Yr[256], Yg[256], Yb[256], diff --git a/recordmydesktop/src/yuv_utils.h b/recordmydesktop/src/rmd_yuv_utils.h index 7b417b6..b1af63b 100644 --- a/recordmydesktop/src/yuv_utils.h +++ b/recordmydesktop/src/rmd_yuv_utils.h @@ -27,9 +27,9 @@ #ifndef YUV_UTILS_H #define YUV_UTILS_H 1 -#include "rmdtypes.h" -#include "block_utils.h" -#include "rmdmacro.h" +#include "rmd_block_utils.h" +#include "rmd_macro.h" +#include "rmd_types.h" // The macros work directly on this data (for performance reasons I diff --git a/recordmydesktop/src/test-rectinsert-types.h b/recordmydesktop/src/test-rectinsert-types.h index dd2425e..b9f0c32 100644 --- a/recordmydesktop/src/test-rectinsert-types.h +++ b/recordmydesktop/src/test-rectinsert-types.h @@ -24,7 +24,7 @@ #define TEST_RECTINSERT_TYPES_H -#include "rmdtypes.h" +#include "rmd_types.h" #define STATE_WIDTH 20 diff --git a/recordmydesktop/src/test-rectinsert.c b/recordmydesktop/src/test-rectinsert.c index d79d2f8..28eb665 100644 --- a/recordmydesktop/src/test-rectinsert.c +++ b/recordmydesktop/src/test-rectinsert.c @@ -22,10 +22,10 @@ #include "config.h" -#include "rmdtypes.h" -#include "test-rectinsert-types.h" +#include "rmd_types.h" +#include "rmd_rectinsert.h" -#include "rectinsert.h" +#include "test-rectinsert-types.h" #include "test-rectinsert-data.h" |