include/rmdfunc.h: Removed CleanUp() declaration from here.

src/initialize_data.[ch]: Host CleanUp() here instead. Long-term there
should be much more code shared between rmd_rescue.c and
initialize_data.c.

src/cleanup.c: Removed.

src/Makefile.am: Removed cleanup.c.


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

4 files changed, 15 insertions, 42 deletions

diff --git a/recordmydesktop/src/Makefile.am b/recordmydesktop/src/Makefile.am
index a939fe8..55f7566 100644
--- a/recordmydesktop/src/Makefile.am
+++ b/recordmydesktop/src/Makefile.am
@@ -4,7 +4,6 @@ recordmydesktop_SOURCES = \
 	cache_audio.c		\
 	cache_frame.c		\
 	capture_sound.c		\
-	cleanup.c		\
 	encode_cache.c		\
 	encode_image_buffer.c	\
 	encode_sound_buffer.c	\
diff --git a/recordmydesktop/src/cleanup.c b/recordmydesktop/src/cleanup.c
deleted file mode 100644
index 26b6e1f..0000000
--- a/recordmydesktop/src/cleanup.c
+++ /dev/null
@@ -1,41 +0,0 @@
-/******************************************************************************
-*                            recordMyDesktop                                  *
-*******************************************************************************
-*                                                                             *
-*            Copyright (C) 2006,2007,2008 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 CleanUp(void){
-
-    free(yblocks);
-    free(ublocks);
-    free(vblocks);
-
-}
-
-
-
-
-
-
diff --git a/recordmydesktop/src/initialize_data.c b/recordmydesktop/src/initialize_data.c
index 811f6fe..2b2bb6e 100644
--- a/recordmydesktop/src/initialize_data.c
+++ b/recordmydesktop/src/initialize_data.c
@@ -233,3 +233,11 @@ void SetupDefaultArgs(ProgArgs *args) {
     args->filename = (char *) malloc(8);
     strcpy(args->filename, "out.ogv");
 }
+
+void CleanUp(void){
+
+    free(yblocks);
+    free(ublocks);
+    free(vblocks);
+
+}
diff --git a/recordmydesktop/src/initialize_data.h b/recordmydesktop/src/initialize_data.h
index dee0ae7..3ffc244 100644
--- a/recordmydesktop/src/initialize_data.h
+++ b/recordmydesktop/src/initialize_data.h
@@ -51,5 +51,12 @@ int InitializeData(ProgData *pdata,
 */
 void SetupDefaultArgs(ProgArgs *args);
 
+/**
+*   Currently only frees some memory
+*   (y,u,v blocks)
+*
+*/
+void CleanUp(void);
+
 
 #endif