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/load_cache.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) (limited to 'recordmydesktop/src/load_cache.c') diff --git a/recordmydesktop/src/load_cache.c b/recordmydesktop/src/load_cache.c index 82db79f..8be5dda 100644 --- a/recordmydesktop/src/load_cache.c +++ b/recordmydesktop/src/load_cache.c @@ -26,11 +26,13 @@ #include +#include "rmdtypes.h" + #include "encode_image_buffer.h" #include "encode_sound_buffer.h" #include "load_cache.h" -#include "recordmydesktop.h" #include "rmd_cache.h" +#include "rmdmacro.h" //The number of bytes for every @@ -225,9 +227,11 @@ void *LoadCache(ProgData *pdata){ //sync missing_frames+=frame.header->current_total- (extra_frames+frame.header->frameno); - if(frames_total) - fprintf(stdout,"\r[%d%%] ", - ((frame.header->frameno+extra_frames)*100)/frames_total); + if (pdata->frames_total) { + fprintf(stdout, + "\r[%d%%] ", + ((frame.header->frameno + extra_frames) * 100) / pdata->frames_total); + } else fprintf(stdout,"\r[%d frames rendered] ", (frame.header->frameno+extra_frames)); -- cgit v1.2.1