# HG changeset patch
# User leo_sobral
# Date 1165619775 0
# Node ID 631f2cf13501c3c53cfc197b85db8df26085a7a4
# Parent  49ba93ca4586935a8223ba0bb1e208fc3daa36a4
[svn r214] HAVE_CONFIG added

diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/Makefile.am
--- a/gmyth/src/Makefile.am	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/Makefile.am	Fri Dec 08 23:16:15 2006 +0000
@@ -6,7 +6,7 @@
 	gmyth_marshal.c 			\
 	gmyth_marshal.h
 
-libgmyth_la_SOURCES = 				\
+libgmyth_la_SOURCES = 			\
 	gmyth_common.c				\
 	gmyth_debug.c				\
 	gmyth_epg.c 				\
@@ -18,12 +18,12 @@
 	gmyth_query.c				\
 	gmyth_socket.c				\
 	gmyth_stringlist.c			\
-	gmyth_monitor_handler.c			\
-	gmyth_file_transfer.c			\
+	gmyth_monitor_handler.c		\
+	gmyth_file_transfer.c		\
 	gmyth_livetv.c				\
 	gmyth_backendinfo.c			\
 	gmyth_programinfo.c			\
-	gmyth_uri.c				\
+	gmyth_uri.c					\
 	$(BUILT_SOURCES)
 
 EXTRA_libgmyth_la_SOURCES = gmyth_marshal.list
@@ -38,27 +38,27 @@
 	glib-genmarshal --body --prefix=gmyth_marshal $(srcdir)/gmyth_marshal.list >> gmyth_marshal.c.tmp
 	mv gmyth_marshal.c.tmp gmyth_marshal.c
 
-libgmyth_la_CFLAGS = 				\
-	-DDATADIR=\"$(pkgdatadir)\" 		\
+libgmyth_la_CFLAGS = 			\
+	-DDATADIR=\"$(pkgdatadir)\" \
 	$(GLIB_CFLAGS) 				\
 	$(GOBJECT_CFLAGS)			\
 	$(GST_CFLAGS) 				\
 	$(GSTBASE_CFLAGS)			\
-	$(GSTPLUGINSBASE_CFLAGS)		\
+	$(GSTPLUGINSBASE_CFLAGS)	\
 	$(MYSQL_CFLAGS)
 
-libgmyth_la_LDFLAGS = 				\
+libgmyth_la_LDFLAGS = 			\
 	-export-dynamic 			\
 	$(MYSQL_LIBS) 				\
 	$(GST_LIBS) 				\
 	$(GSTBASE_LIBS)				\
 	$(GSTPLUGINS_LIBS)
 
-libgmyth_includedir = 				\
+libgmyth_includedir = 			\
 	$(pkgincludedir)
 
-libgmyth_include_HEADERS =    			\
-	gmyth.h					\
+libgmyth_include_HEADERS =    	\
+	gmyth.h						\
 	gmyth_common.h	 			\
 	gmyth_debug.h				\
 	gmyth_epg.h 				\
@@ -70,8 +70,8 @@
 	gmyth_socket.h 				\
 	gmyth_remote_util.h			\
 	gmyth_stringlist.h 			\
-	gmyth_monitor_handler.h			\
-	gmyth_file_transfer.h			\
+	gmyth_monitor_handler.h		\
+	gmyth_file_transfer.h		\
 	gmyth_livetv.h				\
 	gmyth_backendinfo.h			\
 	gmyth_programinfo.h			\
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth.h
--- a/gmyth/src/gmyth.h	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth.h	Fri Dec 08 23:16:15 2006 +0000
@@ -35,6 +35,7 @@
 #include <gmyth_epg.h>
 #include <gmyth_file_transfer.h>
 #include <gmyth_livetv.h>
+#include <gmyth_monitor_handler.h>
 #include <gmyth_programinfo.h>
 #include <gmyth_query.h>
 #include <gmyth_recorder.h>
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_backendinfo.c
--- a/gmyth/src/gmyth_backendinfo.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_backendinfo.c	Fri Dec 08 23:16:15 2006 +0000
@@ -23,6 +23,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gmyth_backendinfo.h"
 #include "gmyth_uri.h"
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_common.c
--- a/gmyth/src/gmyth_common.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_common.c	Fri Dec 08 23:16:15 2006 +0000
@@ -25,6 +25,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
 #include "gmyth_common.h"
 #include "gmyth_debug.h"
 
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_debug.c
--- a/gmyth/src/gmyth_debug.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_debug.c	Fri Dec 08 23:16:15 2006 +0000
@@ -23,6 +23,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gmyth_debug.h"
 
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_epg.c
--- a/gmyth/src/gmyth_epg.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_epg.c	Fri Dec 08 23:16:15 2006 +0000
@@ -25,6 +25,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <mysql.h>
 #include <stdlib.h>
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_file_transfer.c
--- a/gmyth/src/gmyth_file_transfer.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_file_transfer.c	Fri Dec 08 23:16:15 2006 +0000
@@ -1,4 +1,3 @@
-/* vim: set sw=2: -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2; c-indent-level: 2-*- */
 /**
  * GMyth Library
  *
@@ -31,14 +30,13 @@
  * - path (qurl - remote file to be opened)
  * - port number *   
  */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gmyth_file_transfer.h"
-#include "gmyth_livetv.h"
-#include "gmyth_util.h"
-#include "gmyth_socket.h"
-#include "gmyth_stringlist.h"
-#include "gmyth_debug.h"
-
+ 
 #include <unistd.h>
 #include <glib.h>
 
@@ -50,6 +48,12 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "gmyth_livetv.h"
+#include "gmyth_util.h"
+#include "gmyth_socket.h"
+#include "gmyth_stringlist.h"
+#include "gmyth_debug.h"
+
 #define GMYTHTV_QUERY_HEADER		"QUERY_FILETRANSFER "
 
 /* default values to the file transfer parameters */
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_file_transfer.h
--- a/gmyth/src/gmyth_file_transfer.h	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_file_transfer.h	Fri Dec 08 23:16:15 2006 +0000
@@ -45,7 +45,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_FILE_TRANSFER_TYPE               (gmyth_file_transfer_get_type ())
 #define GMYTH_FILE_TRANSFER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_FILE_TRANSFER_TYPE, GMythFileTransfer))
@@ -103,6 +103,6 @@
 gboolean            gmyth_file_transfer_settimeout      (GMythFileTransfer *transfer, gboolean fast);
 guint64             gmyth_file_transfer_get_filesize    (GMythFileTransfer *transfer);
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /* __GMYTH_FILE_TRANSFER_H__ */
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_livetv.c
--- a/gmyth/src/gmyth_livetv.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_livetv.c	Fri Dec 08 23:16:15 2006 +0000
@@ -24,13 +24,18 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+  
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gmyth_livetv.h"
  
 #include "gmyth_remote_util.h"
 #include "gmyth_tvchain.h"
 #include "gmyth_socket.h"
 #include "gmyth_debug.h"
 
-#include "gmyth_livetv.h"
 #include "gmyth_file_transfer.h"
 
 static void gmyth_livetv_class_init          (GMythLiveTVClass *klass);
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_livetv.h
--- a/gmyth/src/gmyth_livetv.h	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_livetv.h	Fri Dec 08 23:16:15 2006 +0000
@@ -28,17 +28,12 @@
 #ifndef GMYTH_LIVETV_H_
 #define GMYTH_LIVETV_H_
 
+#include <glib.h>
 #include <glib-object.h>
 
-#include "gmyth_recorder.h"
-#include "gmyth_tvchain.h"
-#include "gmyth_common.h"
-#include "gmyth_backendinfo.h"
-#include "gmyth_monitor_handler.h"
+#include "gmyth.h"
 
-#include "gmyth_file_transfer.h"
-
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_LIVETV_TYPE               (gmyth_livetv_get_type ())
 #define GMYTH_LIVETV(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_LIVETV_TYPE, GMythLiveTV))
@@ -89,6 +84,6 @@
 gboolean gmyth_livetv_setup (GMythLiveTV *livetv, GMythBackendInfo *backend_info);
 gboolean gmyth_livetv_next_program_chain ( GMythLiveTV *livetv );
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /*GMYTH_LIVETV_H_*/
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_monitor_handler.c
--- a/gmyth/src/gmyth_monitor_handler.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_monitor_handler.c	Fri Dec 08 23:16:15 2006 +0000
@@ -1,4 +1,3 @@
-/* vim: set sw=2: -*- Mode: C; tab-width: 2; indent-tabs-mode: t; c-basic-offset: 2; c-indent-level: 2-*- */
 /**
  * GMyth Library
  *
@@ -36,15 +35,6 @@
 #include "config.h"
 #endif
 
-#include "gmyth_uri.h"
-#include "gmyth_livetv.h"
-#include "gmyth_util.h"
-#include "gmyth_socket.h"
-#include "gmyth_stringlist.h"
-#include "gmyth_monitor_handler.h"
-#include "gmyth_debug.h"
-#include "gmyth_marshal.h"
-
 #include <unistd.h>
 #include <glib.h>
 
@@ -56,6 +46,16 @@
 #include <stdlib.h>
 #include <assert.h>
 
+#include "gmyth_uri.h"
+#include "gmyth_livetv.h"
+#include "gmyth_util.h"
+#include "gmyth_socket.h"
+#include "gmyth_stringlist.h"
+#include "gmyth_debug.h"
+#include "gmyth_marshal.h"
+// FIXME: this include cannot be in the first line
+#include "gmyth_monitor_handler.h"
+ 
 #define GMYTHTV_QUERY_HEADER		"QUERY_FILETRANSFER "
 
 #define GMYTHTV_VERSION							30
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_monitor_handler.h
--- a/gmyth/src/gmyth_monitor_handler.h	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_monitor_handler.h	Fri Dec 08 23:16:15 2006 +0000
@@ -32,19 +32,21 @@
 
 #include <glib-object.h>
 #include <glib.h>
+ 
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
 
+#include <netdb.h>
+#include <sys/socket.h>
+#include <unistd.h>
+ 
 #include "gmyth_socket.h"
 #include "gmyth_uri.h"
 #include "gmyth_livetv.h"
 
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <netdb.h>
-#include <sys/socket.h>
-#include <unistd.h>
 
-#define G_BEGIN_DECLS
+G_BEGIN_DECLS
 
 #define GMYTH_MONITOR_HANDLER_TYPE               (gmyth_monitor_handler_get_type ())
 #define GMYTH_MONITOR_HANDLER(obj)               (G_TYPE_CHECK_INSTANCE_CAST ((obj), GMYTH_MONITOR_HANDLER_TYPE, GMythMonitorHandler))
@@ -98,6 +100,6 @@
 
 void gmyth_monitor_handler_close (GMythMonitorHandler *monitor);
 
-#define G_END_DECLS
+G_END_DECLS
 
 #endif /* __GMYTH_MONITOR_HANDLER_H__ */
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_programinfo.c
--- a/gmyth/src/gmyth_programinfo.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_programinfo.c	Fri Dec 08 23:16:15 2006 +0000
@@ -1,3 +1,35 @@
+/**
+ * GMyth Library
+ *
+ * @file gmyth/gmyth_programinfo.c
+ * 
+ * @brief <p> GMythFileTransfer deals with the file streaming media remote/local
+ * transfering to the MythTV frontend.
+ *
+ * Copyright (C) 2006 INdT - Instituto Nokia de Tecnologia.
+ * @author Leonardo Sobral Cunha <leonardo.cunha@indt.org.br>
+ *
+ *//*
+ * 
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser 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 Lesser 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
+ *
+ */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gmyth_programinfo.h"
 
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_query.c
--- a/gmyth/src/gmyth_query.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_query.c	Fri Dec 08 23:16:15 2006 +0000
@@ -25,6 +25,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include <stdlib.h>
 #include <stdio.h>
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_recorder.c
--- a/gmyth/src/gmyth_recorder.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_recorder.c	Fri Dec 08 23:16:15 2006 +0000
@@ -26,6 +26,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gmyth_recorder.h"
 
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_remote_util.c
--- a/gmyth/src/gmyth_remote_util.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_remote_util.c	Fri Dec 08 23:16:15 2006 +0000
@@ -24,6 +24,10 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gmyth_remote_util.h"
  
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_scheduler.c
--- a/gmyth/src/gmyth_scheduler.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_scheduler.c	Fri Dec 08 23:16:15 2006 +0000
@@ -25,10 +25,14 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
-
-#include <assert.h>
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gmyth_scheduler.h"
+ 
+#include <assert.h>
 
 #include "gmyth_util.h"
 #include "gmyth_query.h"
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_socket.c
--- a/gmyth/src/gmyth_socket.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_socket.c	Fri Dec 08 23:16:15 2006 +0000
@@ -31,9 +31,11 @@
  */
 
 #ifdef HAVE_CONFIG_H
-#  include "config.h"
+#include "config.h"
 #endif
 
+#include "gmyth_socket.h"
+
 #include <glib.h> 
 #include <glib/gprintf.h>
 
@@ -56,7 +58,6 @@
 	#include <sys/ioctl.h>
 #endif
 
-#include "gmyth_socket.h"
 #include "gmyth_stringlist.h"
 #include "gmyth_uri.h"
 #include "gmyth_debug.h"
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_stringlist.c
--- a/gmyth/src/gmyth_stringlist.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_stringlist.c	Fri Dec 08 23:16:15 2006 +0000
@@ -25,8 +25,13 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
 
 #include "gmyth_stringlist.h"
+ 
 #include "gmyth_debug.h"
 
 static void gmyth_string_list_class_init          (GMythStringListClass *klass);
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_tvchain.c
--- a/gmyth/src/gmyth_tvchain.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_tvchain.c	Fri Dec 08 23:16:15 2006 +0000
@@ -25,6 +25,12 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gmyth_tvchain.h"
 
 #include <glib.h>
 #include <time.h>
@@ -33,7 +39,6 @@
 #include <assert.h>
 
 #include "gmyth_epg.h"
-#include "gmyth_tvchain.h"
 #include "gmyth_util.h"
 #include "gmyth_query.h"
 #include "gmyth_scheduler.h"
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_uri.c
--- a/gmyth/src/gmyth_uri.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_uri.c	Fri Dec 08 23:16:15 2006 +0000
@@ -26,12 +26,17 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gmyth_uri.h"
 
 #include <glib.h>
 #include <string.h>
 #include <stdlib.h>
 
-#include "gmyth_uri.h"
 #include "gmyth_debug.h"
 
 static void gmyth_string_list_class_init          (GMythURIClass *klass);
diff -r 49ba93ca4586 -r 631f2cf13501 gmyth/src/gmyth_util.c
--- a/gmyth/src/gmyth_util.c	Thu Dec 07 18:39:41 2006 +0000
+++ b/gmyth/src/gmyth_util.c	Fri Dec 08 23:16:15 2006 +0000
@@ -24,12 +24,16 @@
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
+ 
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif
+
+#include "gmyth_util.h"
 
 #include <glib.h>
 #include <glib/gprintf.h>
 
-#include "gmyth_util.h"
-
 #include "gmyth_backendinfo.h"
 #include "gmyth_socket.h"
 #include "gmyth_programinfo.h"