From 172b458884bec3c8379c9951de96a9e3b21ca770 Mon Sep 17 00:00:00 2001 From: enselic Date: Sun, 14 Sep 2008 07:27:50 +0000 Subject: src/recordmydesktop.h: Deleted. The last globals were migrated to ProgData. recordmydesktop.h should actually never exist (as long as rmd isn't e.g. a library) since recordmydesktop.c is the main() program and it would be weird if other modules had a dependeny to it. src/rmdtypes.h: Put the last globals in ProgData instead. src/Makefile.am src/cache_audio.c src/cache_frame.c src/capture_sound.c src/encode_cache.c src/encode_image_buffer.c src/encode_sound_buffer.c src/flush_to_ogg.c src/get_frame.c src/getzpixmap.c src/init_encoder.c src/initialize_data.c src/load_cache.c src/make_dummy_pointer.c src/parseargs.c src/queryextensions.c src/recordmydesktop.c src/register_callbacks.c src/rmd_cache.c src/rmd_jack.c src/rmd_rescue.c src/rmd_timer.c src/setbrwindow.c src/update_image.c src/wm_check.c: Adapted. git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@541 f606c939-3180-4ac9-a4b8-4b8779d57d0a --- recordmydesktop/src/encode_image_buffer.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'recordmydesktop/src/encode_image_buffer.c') diff --git a/recordmydesktop/src/encode_image_buffer.c b/recordmydesktop/src/encode_image_buffer.c index 5b3f84d..1fa1176 100644 --- a/recordmydesktop/src/encode_image_buffer.c +++ b/recordmydesktop/src/encode_image_buffer.c @@ -24,7 +24,8 @@ * For further information contact me at johnvarouhakis@gmail.com * ******************************************************************************/ -#include "recordmydesktop.h" +#include "rmdtypes.h" + #include "encode_image_buffer.h" @@ -37,7 +38,7 @@ void *EncodeImageBuffer(ProgData *pdata){ &pdata->img_buff_ready_mutex); pthread_mutex_unlock(&pdata->img_buff_ready_mutex); pdata->th_enc_thread_waiting=0; - encoder_busy=1; + pdata->encoder_busy = 1; if (pdata->paused) { pthread_mutex_lock(&pdata->pause_mutex); pthread_cond_wait(&pdata->pause_cond, &pdata->pause_mutex); @@ -61,7 +62,7 @@ void *EncodeImageBuffer(ProgData *pdata){ pdata->avd+=pdata->frametime; } } - encoder_busy=0; + pdata->encoder_busy = 0; } //last packet pdata->th_encoding_clean=1; -- cgit v1.2.1