# HG changeset patch
# User rosfran
# Date 1171494377 0
# Node ID 28c358053693b511b682e0660c01d07592ac2e40
# Parent  9b20a9775516f83078b385909ea13728920618cb
[svn r367] Itsn't mandatory to have database information in the GMyth URI.

diff -r 9b20a9775516 -r 28c358053693 gmyth/src/gmyth_livetv.c
--- a/gmyth/src/gmyth_livetv.c	Wed Feb 14 22:26:33 2007 +0000
+++ b/gmyth/src/gmyth_livetv.c	Wed Feb 14 23:06:17 2007 +0000
@@ -408,7 +408,7 @@
 	
 		} /* if - changes the channel number */
 		
-    sleep (4);                  /* FIXME: this is evil (tpm) */
+    sleep (6);                  /* FIXME: this is evil (tpm) */
   }
   
   /* DEBUG message */  
diff -r 9b20a9775516 -r 28c358053693 gmyth/src/gmyth_monitor_handler.c
--- a/gmyth/src/gmyth_monitor_handler.c	Wed Feb 14 22:26:33 2007 +0000
+++ b/gmyth/src/gmyth_monitor_handler.c	Wed Feb 14 23:06:17 2007 +0000
@@ -70,22 +70,11 @@
 #define GMYTHTV_ENABLE_DEBUG				1
 #endif
 
-//GThread *monitor_th = NULL;
-
-//static gboolean* myth_control_sock_listener( GIOChannel *io_channel );
 gboolean gmyth_monitor_handler_listener( GIOChannel *io_channel, 
 						GIOCondition io_cond, gpointer data );
 
-//gboolean* gmyth_monitor_handler_listener( GMythMonitorHandler *monitor );
-
-//void gmyth_monitor_handler_listener( GMythMonitorHandler *monitor, gpointer user_data );
-
 static void gmyth_monitor_handler_default_listener( GMythMonitorHandler *monitor, gint msg_code, gchar* message );
 
-/* static GStaticMutex			mutex 					 = G_STATIC_MUTEX_INIT; */
-
-//static GCond*					io_watcher_cond  = NULL;
-
 static void gmyth_monitor_handler_class_init          (GMythMonitorHandlerClass *klass);
 static void gmyth_monitor_handler_init                (GMythMonitorHandler *object);
 
@@ -499,7 +488,6 @@
   } /* main GThread while */
   
   if ( io_status == G_IO_STATUS_ERROR ) {
-    //gmyth_debug ("[%s] Error reading: %s\n", __FUNCTION__, error != NULL ? error->message : "" );
     gmyth_debug ("Error reading MONITOR event socket.\n");
    	*ret = FALSE;
    	goto clean_up;   	
diff -r 9b20a9775516 -r 28c358053693 gmyth/src/gmyth_uri.c
--- a/gmyth/src/gmyth_uri.c	Wed Feb 14 22:26:33 2007 +0000
+++ b/gmyth/src/gmyth_uri.c	Wed Feb 14 23:06:17 2007 +0000
@@ -311,17 +311,17 @@
 	}
 	
 	gmyth_debug( "uri value:  %s", value );
-	uri->query = g_string_new ( g_strstr_len( value, strlen(value), GMYTH_URI_E_DELIM ) );
+	uri->query = g_string_new ( g_strstr_len( value, strlen(value), GMYTH_URI_QUESTION_DELIM ) );
 	
-	eIdx = gmyth_strstr( value+currIdx, GMYTH_URI_E_DELIM );
+	eIdx = gmyth_strstr( value+currIdx, GMYTH_URI_QUESTION_DELIM );
 	
 	if ( 0 < eIdx ) {
-		uri->query = g_string_new ( g_strstr_len( value, strlen(value), GMYTH_URI_E_DELIM ) );
+		uri->query = g_string_new ( g_strstr_len( value, strlen(value), GMYTH_URI_QUESTION_DELIM ) );
 		gmyth_debug( "query = %s", uri->query->str );
 	}
 	
 	/**** Path (Query/Fragment) ****/
-	sharpIdx = gmyth_strstr(value+currIdx, GMYTH_URI_SHARP_DELIM);
+	sharpIdx = gmyth_strstr(value+currIdx, GMYTH_URI_E_DELIM);
 	if (0 < sharpIdx) {
 		uri->path = g_string_append_len( uri->path, value+currIdx, sharpIdx);
 		uri->fragment = g_string_new_len (value+currIdx+sharpIdx+1, uriLen-(currIdx+sharpIdx+1));
@@ -348,7 +348,8 @@
 	
 	g_return_val_if_fail( uri != NULL && uri->uri != NULL && uri->uri->str != NULL, FALSE );
 	
-	ret = ( g_strstr_len( uri->uri->str, strlen( uri->uri->str ), "/?" ) != NULL );
+	ret = ( g_strstr_len( uri->uri->str, strlen( uri->uri->str ), "/?" ) != NULL ) ||
+				( g_strstr_len( uri->uri->str, strlen( uri->uri->str ), "livetv" ) != NULL );
 	
 	if ( ret )
 		gmyth_debug( "This URI is a LiveTV recording..." );