Give rectinsert.c a header file and include this header file in

RectInsert() clients.

src/Makefile.am
src/rectinsert.h: Added rectinsert.h.

src/get_frame.c
src/rectinsert.c
src/poll_events.c: Include rectinsert.h

include/rmdfunc.h: Removed RectInsert() declaration, it's in
rectinsert.h now.


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

6 files changed, 56 insertions, 14 deletions

diff --git a/recordmydesktop/include/rmdfunc.h b/recordmydesktop/include/rmdfunc.h
index 3b979c7..01a1c92 100644
--- a/recordmydesktop/include/rmdfunc.h
+++ b/recordmydesktop/include/rmdfunc.h
@@ -89,20 +89,6 @@ void *FlushToOgg(ProgData *pdata);
 void ClearList(RectArea **root);
 
 /**
-* Insert a new rectangle on the list, making sure it doesn't overlap
-* with the existing ones
-* \param root Root entry of the list
-*
-* \param wgeom New area to be inserted
-*
-* \returns Number of insertions during operation
-*
-* \note This function is reentrant and recursive. The number
-* of insertions takes this into account.
-*/
-int RectInsert(RectArea **root,WGeometry *wgeom);
-
-/**
 * Set up all callbacks and signal handlers
 * \param pdata ProgData struct containing all program data
 */
diff --git a/recordmydesktop/src/Makefile.am b/recordmydesktop/src/Makefile.am
index eb91423..3072956 100644
--- a/recordmydesktop/src/Makefile.am
+++ b/recordmydesktop/src/Makefile.am
@@ -21,6 +21,7 @@ recordmydesktop_SOURCES = \
 	queryextensions.c	\
 	recordmydesktop.c	\
 	rectinsert.c		\
+	rectinsert.h		\
 	register_callbacks.c	\
 	rmd_cache.c		\
 	rmd_error.c		\
diff --git a/recordmydesktop/src/get_frame.c b/recordmydesktop/src/get_frame.c
index fd4eda8..7274d7f 100644
--- a/recordmydesktop/src/get_frame.c
+++ b/recordmydesktop/src/get_frame.c
@@ -27,6 +27,8 @@
 
 #include <recordmydesktop.h>
 
+#include "rectinsert.h"
+
 
 #define CLIP_DUMMY_POINTER_AREA(dummy_p_area,brwin,wgeom){\
     (wgeom)->x=((((dummy_p_area).x+\
diff --git a/recordmydesktop/src/poll_events.c b/recordmydesktop/src/poll_events.c
index 7168a5a..ee281e6 100644
--- a/recordmydesktop/src/poll_events.c
+++ b/recordmydesktop/src/poll_events.c
@@ -38,6 +38,7 @@
 #include <rmdfunc.h>
 #include <rmdtypes.h>
 #include <rmdmacro.h>
+#include "rectinsert.h"
 
 
 #define CLIP_EVENT_AREA(e,brwin,wgeom){\
diff --git a/recordmydesktop/src/rectinsert.c b/recordmydesktop/src/rectinsert.c
index 8685fbb..c293b44 100644
--- a/recordmydesktop/src/rectinsert.c
+++ b/recordmydesktop/src/rectinsert.c
@@ -27,6 +27,9 @@
 
 #include <recordmydesktop.h>
 
+#include "rectinsert.h"
+
+
 /**
 * Collide two rectangles and dictate most sane action for insertion,
 * as well as provide the updated rectangle(s)
diff --git a/recordmydesktop/src/rectinsert.h b/recordmydesktop/src/rectinsert.h
new file mode 100644
index 0000000..013eb12
--- /dev/null
+++ b/recordmydesktop/src/rectinsert.h
@@ -0,0 +1,49 @@
+/******************************************************************************
+*                            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            *
+******************************************************************************/
+
+#ifndef RECTINSERT_H
+#define RECTINSERT_H 1
+
+
+#include "rmdtypes.h"
+
+
+/**
+* Insert a new rectangle on the list, making sure it doesn't overlap
+* with the existing ones
+* \param root Root entry of the list
+*
+* \param wgeom New area to be inserted
+*
+* \returns Number of insertions during operation
+*
+* \note This function is reentrant and recursive. The number
+* of insertions takes this into account.
+*/
+int RectInsert(RectArea **root, WGeometry *wgeom);
+
+
+#endif