# HG changeset patch
# User melunko
# Date 1169153519 0
# Node ID d2192075f563a5810a8f012572853924d648c8c6
# Parent  99d209c4b53d6a379bf17337fd6f99128ff1aff5
[svn r276] Removed all references to upnp. Only application needs to take care of upnp services. It should find the mythtv server address via upnp by itself

diff -r 99d209c4b53d -r d2192075f563 gmyth/configure.ac
--- a/gmyth/configure.ac	Thu Jan 18 20:48:09 2007 +0000
+++ b/gmyth/configure.ac	Thu Jan 18 20:51:59 2007 +0000
@@ -87,16 +87,6 @@
     CFLAGS="$CFLAGS -O2 -DG_DISABLE_CHECKS"
 fi          
 
-dnl Test if --disable-upnp / --enable-upnp given
-AC_ARG_ENABLE(upnp,
-        AC_HELP_STRING([--disable-upnp], [disable/enable UPnP discovery/search functions]))
-
-if test x"$enable_upnp" != xno; then
-  AC_DEFINE(WITH_GMYTH_UPNP, 1, [Enable UPnP discovery/search functions.])
-fi
-
-AM_CONDITIONAL(WITH_GMYTH_UPNP, test x"$enable_upnp" != xno )
-
 # Check for pkgconfig
 AC_CHECK_PROG(HAVE_PKGCONFIG, pkg-config, yes, no)
 # Give error and exit if we don't have pkgconfig
@@ -231,22 +221,6 @@
 fi
 AC_SUBST(MYSQL_LIBS)
 
-if test x"$enable_upnp" != xno; then
-	PKG_CHECK_MODULES(GMYTH_UPNP, gmyth-upnp, HAVE_GMYTH_UPNP=yes, HAVE_GMYTH_UPNP=no)
-
-	# Shows a warning message if we don't have gmyth-upnp libraries
-	if test x"$HAVE_GMYTH_UPNP" != xno; then
-	  AC_MSG_WARN([GMyth UPnP development packages found!])
-
-	  AC_SUBST(GMYTH_UPNP_CFLAGS)
-	  AC_SUBST(GMYTH_UPNP_LIBS)
-	else
-	  AC_MSG_WARN([Couldn't find the GMyth UPnP development packages installed. UPnP discovery functions cannot run.])
-	fi
-
-fi
-
-AM_CONDITIONAL(WITH_GMYTH_UPNP, test x"$HAVE_GMYTH_UPNP" != xno )
 #dnl Enable gtk-doc
 #GTK_DOC_CHECK(1.4)
 
diff -r 99d209c4b53d -r d2192075f563 gmyth/src/Makefile.am
--- a/gmyth/src/Makefile.am	Thu Jan 18 20:48:09 2007 +0000
+++ b/gmyth/src/Makefile.am	Thu Jan 18 20:51:59 2007 +0000
@@ -49,11 +49,6 @@
 	$(GSTPLUGINSBASE_CFLAGS)	\
 	$(MYSQL_CFLAGS)
 
-if WITH_GMYTH_UPNP
-libgmyth_la_CFLAGS += 			\
-	$(GMYTH_UPNP_CFLAGS)
-endif
-
 libgmyth_la_LDFLAGS = 			\
 	-export-dynamic 			\
 	$(MYSQL_LIBS) 				\
@@ -61,11 +56,6 @@
 	$(GSTBASE_LIBS)				\
 	$(GSTPLUGINS_LIBS)
 
-if WITH_GMYTH_UPNP
-libgmyth_la_LIBS = 			\
-	$(GMYTH_UPNP_LIBS)
-endif
-
 libgmyth_includedir = 			\
 	$(pkgincludedir)
 
diff -r 99d209c4b53d -r d2192075f563 gmyth/src/gmyth_backendinfo.c
--- a/gmyth/src/gmyth_backendinfo.c	Thu Jan 18 20:48:09 2007 +0000
+++ b/gmyth/src/gmyth_backendinfo.c	Thu Jan 18 20:51:59 2007 +0000
@@ -32,10 +32,6 @@
 #include "gmyth_uri.h"
 #include "gmyth_debug.h"
 
-#ifdef WITH_GMYTH_UPNP
-#include <gmyth-upnp/gmyth_upnp.h>
-#endif
-
 static void gmyth_backend_info_class_init  (GMythBackendInfoClass *klass);
 static void gmyth_backend_info_init        (GMythBackendInfo *object);
 
@@ -146,15 +142,8 @@
     
     if ( NULL == hostname || strlen(hostname) <= 0 )
     { 
-    #ifdef WITH_GMYTH_UPNP
-	    GMythUPnP *gmyth_upnp = gmyth_upnp_new( backend_info );
-	    /* backend_info = gmyth_upnp_get_backend_info( gmyth_upnp ); */
-	    backend_info->hostname = g_strdup ( gmyth_upnp_get_host( gmyth_upnp ) );
-	    g_object_unref( gmyth_upnp );
-    #else
-	  	gmyth_debug ( "Error trying to set a hostname equals to NULL (it doesn't using UPnP)." );
+	  	gmyth_debug ( "Error trying to set a hostname equals to NULL." );
   		return NULL;
-    #endif
     } else {    	
     	backend_info->hostname = g_strdup (hostname);
     }
@@ -191,15 +180,8 @@
 
     if ( port <= 0 )
     { 
-    #ifdef WITH_GMYTH_UPNP
-	    GMythUPnP *gmyth_upnp = gmyth_upnp_new( backend_info );
-	    backend_info = gmyth_upnp_get_backend_info( gmyth_upnp );
-	    backend_info->port = gmyth_upnp_get_port( gmyth_upnp );
-	    g_object_unref( gmyth_upnp );
-    #else
 	  	gmyth_debug ( "Error trying to set a hostname equals to NULL (it doesn't using UPnP)." );
   		return NULL;
-    #endif
     } else {    	
     	backend_info->port = port;
     }