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

1 files changed, 9 insertions, 4 deletions

diff --git a/recordmydesktop/src/cache_frame.c b/recordmydesktop/src/cache_frame.c
index 776e98a..1cb3bfa 100644
--- a/recordmydesktop/src/cache_frame.c
+++ b/recordmydesktop/src/cache_frame.c
@@ -26,8 +26,9 @@
 
 #include <signal.h>
 
+#include "rmdtypes.h"
+
 #include "cache_frame.h"
-#include "recordmydesktop.h"
 #include "rmd_cache.h"
 #include "block_utils.h"
 
@@ -169,7 +170,7 @@ void *CacheImageBuffer(ProgData *pdata){
 
         strncpy(fheader.frame_prefix,"FRAM",4);
         fheader.frameno=++frameno;
-        fheader.current_total=frames_total;
+        fheader.current_total = pdata->frames_total;
 
         fheader.Ynum=ynum;
         fheader.Unum=unum;
@@ -273,8 +274,12 @@ void *CacheImageBuffer(ProgData *pdata){
 
     }
 
-    fprintf(stderr,"Saved %d frames in a total of %d requests\n",
-                   frameno,frames_total);fflush(stderr);
+    fprintf(stderr,
+            "Saved %d frames in a total of %d requests\n",
+            frameno,
+            pdata->frames_total);
+    fflush(stderr);
+
     if(!pdata->args.zerocompression){
         gzflush(fp,Z_FINISH);
         gzclose(fp);