From ba009b32fecf6f9651ab29bf7b980a972f0e2a1b Mon Sep 17 00:00:00 2001
From: enselic <enselic@f606c939-3180-4ac9-a4b8-4b8779d57d0a>
Date: Sat, 13 Sep 2008 14:41:31 +0000
Subject: include/rmdfunc.h: Get rid of InitializeData().

include/rmdmacro.h: Get rid of the DEFAULT_ARGS() macro.

src/initialize_data.[ch]: Completely move InitializeData() here and
also put the new DEFAULT_ARGS() replacement, the SetupDefaultArgs()
function, here.

src/Makefile.am
src/rmd_rescue.c
src/recordmydesktop.c: Adapt.


git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@534 f606c939-3180-4ac9-a4b8-4b8779d57d0a
---
 recordmydesktop/include/rmdfunc.h  | 16 ------------
 recordmydesktop/include/rmdmacro.h | 51 --------------------------------------
 2 files changed, 67 deletions(-)

(limited to 'recordmydesktop/include')

diff --git a/recordmydesktop/include/rmdfunc.h b/recordmydesktop/include/rmdfunc.h
index 1df1e61..ac982cc 100644
--- a/recordmydesktop/include/rmdfunc.h
+++ b/recordmydesktop/include/rmdfunc.h
@@ -455,22 +455,6 @@ void EncodeCache(ProgData *pdata);
 */
 void rmdThreads(ProgData *pdata);
 
-/**
-* initialize lists,mutexes,image buffers, take first screenshot,
-* and anything else needed before launching the capture threads.
-*
-* \param pdata ProgData struct containing all program data
-*
-* \param enc_data reference to enc_data structure
-*
-* \param cache_data reference to cache_data structure
-*
-* \returns 0 on success, other values must cause the program to exit
-*/
-int InitializeData(ProgData *pdata,
-                   EncData *enc_data,
-                   CacheData *cache_data);
-
 #ifdef HAVE_JACK_H
 
 size_t (*jack_ringbuffer_read_p)(jack_ringbuffer_t *rb,
diff --git a/recordmydesktop/include/rmdmacro.h b/recordmydesktop/include/rmdmacro.h
index ee43cdf..db5300d 100644
--- a/recordmydesktop/include/rmdmacro.h
+++ b/recordmydesktop/include/rmdmacro.h
@@ -94,57 +94,6 @@
 #endif
 
 
-
-#define DEFAULT_ARGS(args){\
-    (args)->delay=0;\
-    if(getenv("DISPLAY")!=NULL){\
-        (args)->display=(char *)malloc(strlen(getenv("DISPLAY"))+1);\
-        strcpy((args)->display,getenv("DISPLAY"));\
-    }\
-    else\
-        (args)->display=NULL;\
-    (args)->windowid=\
-    (args)->x=\
-    (args)->y=\
-    (args)->width=\
-    (args)->height=\
-    (args)->nosound=\
-    (args)->full_shots=\
-    (args)->follow_mouse=\
-    (args)->encOnTheFly=\
-    (args)->nowmcheck=\
-    (args)->overwrite=\
-    (args)->use_jack=\
-    (args)->noshared=\
-    (args)->no_encode=\
-    (args)->noframe=\
-    (args)->jack_nports=0;\
-    (args)->jack_ringbuffer_secs=3.0;\
-    (args)->jack_port_names=NULL;\
-    (args)->zerocompression=\
-    (args)->no_quick_subsample=1;\
-    (args)->filename=(char *)malloc(8);\
-    strcpy((args)->filename,"out.ogv");\
-    (args)->cursor_color=1;\
-    (args)->have_dummy_cursor=0;\
-    (args)->xfixes_cursor=1;\
-    (args)->device=(char *)malloc(strlen(DEFAULT_AUDIO_DEVICE)+1);\
-    strcpy((args)->device,DEFAULT_AUDIO_DEVICE);\
-    (args)->fps=15;\
-    (args)->channels=1;\
-    (args)->frequency=22050;\
-    (args)->buffsize=4096;\
-    (args)->v_bitrate=45000;\
-    (args)->v_quality=63;\
-    (args)->s_quality=10;\
-    (args)->workdir=(char *)malloc(5);\
-    strcpy((args)->workdir,"/tmp");\
-    (args)->pause_shortcut=(char *)malloc(15);\
-    strcpy((args)->pause_shortcut,"Control+Mod1+p");\
-    (args)->stop_shortcut=(char *)malloc(15);\
-    strcpy((args)->stop_shortcut,"Control+Mod1+s");\
-}
-
 #define AVG_4_PIXELS(data_array,width_img,k_tm,i_tm,offset)\
     ((data_array[(k_tm*width_img+i_tm)*RMD_ULONG_SIZE_T+offset]+\
     data_array[((k_tm-1)*width_img+i_tm)*RMD_ULONG_SIZE_T+offset]+\
-- 
cgit v1.2.3