1.1 --- a/gmyth/src/gmyth_uri.c	Thu May 10 22:08:17 2007 +0100
     1.2 +++ b/gmyth/src/gmyth_uri.c	Thu May 10 22:09:33 2007 +0100
     1.3 @@ -411,16 +411,26 @@
     1.4  gmyth_uri_is_livetv( GMythURI* uri )
     1.5  {
     1.6  	gboolean ret = FALSE;
     1.7 +    
     1.8 +	g_return_val_if_fail (uri != NULL, FALSE);
     1.9 +	g_return_val_if_fail (uri->uri != NULL, FALSE);
    1.10 +    g_return_val_if_fail (uri->uri->str != NULL, FALSE);
    1.11 +   
    1.12 +    g_debug ("verify [%s]", uri->uri->str);
    1.13 +    
    1.14 +    if ((strstr (uri->uri->str, "channel") == NULL) ||
    1.15 +        (strstr (uri->uri->str, "livetv") == NULL)) 
    1.16 +        ret = FALSE;
    1.17 +
    1.18 +    g_debug ("AAAAAAAAAAAAAAAAAAAAA");
    1.19  	
    1.20 -	g_return_val_if_fail( uri != NULL && uri->uri != NULL && uri->uri->str != NULL, FALSE );
    1.21 -	
    1.22 -	ret = ( g_strstr_len( uri->uri->str, strlen( uri->uri->str ), "/?" ) != NULL ) ||
    1.23 -				( g_strstr_len( uri->uri->str, strlen( uri->uri->str ), "livetv" ) != NULL );
    1.24 -	
    1.25 -	if ( ret )
    1.26 +	if (ret)
    1.27  		gmyth_debug( "This URI is a LiveTV recording..." );
    1.28      else
    1.29          gmyth_debug( "This URI is a stored remote recording." );
    1.30 +
    1.31 +
    1.32 +    g_debug ("BBBBBBBBBBBBBBBBBBBBBBBBBBBBBBBB");
    1.33      
    1.34  	return ret;
    1.35  	

     2.1 --- a/gmyth/src/gmyth_uri.h	Thu May 10 22:08:17 2007 +0100
     2.2 +++ b/gmyth/src/gmyth_uri.h	Thu May 10 22:09:33 2007 +0100
     2.3 @@ -109,10 +109,7 @@
     2.4  gboolean	gmyth_uri_is_livetv ( GMythURI* uri );
     2.5  gint		gmyth_uri_get_channel_num( GMythURI* uri );
     2.6  gchar*		gmyth_uri_get_channel_name( GMythURI* uri );
     2.7 -
     2.8 -char* gmyth_uri_to_string (const GMythURI* uri);
     2.9 -	
    2.10 -
    2.11 +char*       gmyth_uri_to_string (const GMythURI* uri);
    2.12  gboolean    gmyth_uri_is_local_file( const GMythURI* uri );
    2.13  
    2.14  #define 	gmyth_uri_get_host(urip) 			( urip->host != NULL ? urip->host->str : "" )