New file: encode_cache.c.

Moved some of the code on cache encoding, from main to a new fuction(EncodeCache).
Added EncodeCache declaration in rmdfunc.h


git-svn-id: https://recordmydesktop.svn.sourceforge.net/svnroot/recordmydesktop/trunk@257 f606c939-3180-4ac9-a4b8-4b8779d57d0a

4 files changed, 74 insertions, 30 deletions

diff --git a/recordmydesktop/include/rmdfunc.h b/recordmydesktop/include/rmdfunc.h
index ebec84f..ec74105 100644
--- a/recordmydesktop/include/rmdfunc.h
+++ b/recordmydesktop/include/rmdfunc.h
@@ -442,5 +442,12 @@ int SwapCacheFilesRead(char *name,int n,gzFile **fp,FILE **ucfp);
 */
 int PurgeCache(CacheData *cache_data_t,int sound);
 
+/**
+* Encode cache into an
+* ogg stream.
+* \param pdata ProgData struct containing all program data
+*/
+void EncodeCache(ProgData *pdata);
+
 #endif
 
diff --git a/recordmydesktop/src/Makefile.am b/recordmydesktop/src/Makefile.am
index d5fa847..dbf7f68 100644
--- a/recordmydesktop/src/Makefile.am
+++ b/recordmydesktop/src/Makefile.am
@@ -24,7 +24,8 @@ recordmydesktop_SOURCES=	recordmydesktop.c\
 							cache_audio.c\
 							rmd_cache.c\
 							load_cache.c\
-							wm_check.c
+							wm_check.c\
+							encode_cache.c
 
 INCLUDES= $(all_includes) -I../include
 
diff --git a/recordmydesktop/src/encode_cache.c b/recordmydesktop/src/encode_cache.c
new file mode 100644
index 0000000..5063d74
--- /dev/null
+++ b/recordmydesktop/src/encode_cache.c
@@ -0,0 +1,62 @@
+/*********************************************************************************
+*                             recordMyDesktop                                    *
+**********************************************************************************
+*                                                                                *
+*             Copyright (C) 2006  John Varouhakis                                *
+*                                                                                *
+*                                                                                *
+*    This program is free software; you can redistribute it and/or modify        *
+*    it under the terms of the GNU General Public License as published by        *
+*    the Free Software Foundation; either version 2 of the License, or           *
+*    (at your option) any later version.                                         *
+*                                                                                *
+*    This program is distributed in the hope that it will be useful,             *
+*    but WITHOUT ANY WARRANTY; without even the implied warranty of              *
+*    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the               *
+*    GNU General Public License for more details.                                *
+*                                                                                *
+*    You should have received a copy of the GNU General Public License           *
+*    along with this program; if not, write to the Free Software                 *
+*    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA   *
+*                                                                                *
+*                                                                                *
+*                                                                                *
+*    For further information contact me at johnvarouhakis@gmail.com              *
+**********************************************************************************/
+
+
+#include <recordmydesktop.h>
+
+
+void EncodeCache(ProgData *pdata){
+    pthread_t   flush_to_ogg_t,
+                load_cache_t;
+
+    fprintf(stderr,"Encoding started!\nThis may take several minutes.\n"
+    "Pressing Ctrl-C will cancel the procedure (resuming will not be possible, but\n"
+    "any portion of the video, which is already encoded won't be deleted).\n"
+    "Please wait...\n");
+    pdata->running=1;
+    InitEncoder(pdata,pdata->enc_data,1);
+    //load encoding and flushing threads
+    if(!pdata->args.nosound){
+        //before we start loading again
+        //we need to free any left-overs
+        while(pdata->sound_buffer!=NULL){
+            free(pdata->sound_buffer->data);
+            pdata->sound_buffer=pdata->sound_buffer->next;
+        }
+    }
+    pthread_create(&flush_to_ogg_t,NULL,(void *)FlushToOgg,(void *)pdata);
+
+    //start loading image and audio
+    pthread_create(&load_cache_t,NULL,(void *)LoadCache,(void *)pdata);
+
+    //join and finish
+    pthread_join(load_cache_t,NULL);
+    fprintf(stderr,"Encoding finished!\nWait a moment please...\n");
+    pthread_join(flush_to_ogg_t,NULL);
+
+}
+
+
diff --git a/recordmydesktop/src/recordmydesktop.c b/recordmydesktop/src/recordmydesktop.c
index b2923a5..7fd1ebb 100644
--- a/recordmydesktop/src/recordmydesktop.c
+++ b/recordmydesktop/src/recordmydesktop.c
@@ -59,8 +59,7 @@ int main(int argc,char **argv){
                     sound_capture_t,
                     sound_encode_t,
                     sound_cache_t,
-                    flush_to_ogg_t,
-                    load_cache_t;
+                    flush_to_ogg_t;
         XShmSegmentInfo shminfo;
         int i;
 
@@ -294,41 +293,16 @@ int main(int argc,char **argv){
         //Now that we are done with recording we cancel the timer
         CancelTimer();
 
-/**               Encoding                          */
+        //encode and then cleanup cache
         if(!pdata.args.encOnTheFly){
             if(!Aborted){
-                fprintf(stderr,"Encoding started!\nThis may take several minutes.\n"
-                "Pressing Ctrl-C will cancel the procedure (resuming will not be possible, but\n"
-                "any portion of the video, which is already encoded won't be deleted).\n"
-                "Please wait...\n");
-                pdata.running=1;
-                InitEncoder(&pdata,&enc_data,1);
-                //load encoding and flushing threads
-                if(!pdata.args.nosound){
-                    //before we start loading again
-                    //we need to free any left-overs
-                    while(pdata.sound_buffer!=NULL){
-                        free(pdata.sound_buffer->data);
-                        pdata.sound_buffer=pdata.sound_buffer->next;
-                    }
-                }
-                pthread_create(&flush_to_ogg_t,NULL,(void *)FlushToOgg,(void *)&pdata);
-
-
-                //start loading image and audio
-                pthread_create(&load_cache_t,NULL,(void *)LoadCache,(void *)&pdata);
-
-                //join and finish
-                pthread_join(load_cache_t,NULL);
-                fprintf(stderr,"Encoding finished!\nWait a moment please...\n");
-                pthread_join(flush_to_ogg_t,NULL);
+                EncodeCache(&pdata);
             }
             fprintf(stderr,"Cleanning up cache...\n");
             if(PurgeCache(pdata.cache_data,!pdata.args.nosound))
                 fprintf(stderr,"Some error occured while cleaning up cache!\n");
             fprintf(stderr,"Done!!!\n");
         }
-/**@_______________________________________________@*/
 
         //This can happen earlier, but in some cases it might get stuck.
         //So we must make sure the recording is not wasted.