1.1 --- a/gmyth/src/gmyth_livetv.c	Tue Apr 17 21:13:22 2007 +0100
     1.2 +++ b/gmyth/src/gmyth_livetv.c	Tue Apr 17 21:33:01 2007 +0100
     1.3 @@ -401,10 +401,7 @@
     1.4  	} 
     1.5  	
     1.6  	if ( gmyth_remote_util_get_free_recorder_count (livetv->socket) <= 0 ) {
     1.7 -		
     1.8 -#ifdef GMYTH_USE_DEBUG
     1.9  		gmyth_debug ("No free remote encoder available.");
    1.10 -#endif
    1.11  		res = FALSE;
    1.12  		goto error;
    1.13  	}
    1.14 @@ -507,17 +504,13 @@
    1.15  	} /* if - Program Info */
    1.16  	
    1.17  	/* prints program info data text */ 
    1.18 -#ifdef GMYTH_USE_DEBUG	
    1.19  	gmyth_debug( "New ProgramInfo...\n" );
    1.20  	gmyth_program_info_print( prog_info );
    1.21 -#endif	
    1.22  
    1.23  	/* check if the program chain could be obtained from the MythTV protocol message */
    1.24  	if ( prog_info != NULL )
    1.25  	{
    1.26 -#ifdef GMYTH_USE_DEBUG
    1.27  		gmyth_debug( "Program Info: %s\n", gmyth_program_info_to_string( prog_info ) );
    1.28 -#endif
    1.29  		livetv->proginfo = prog_info;
    1.30  		/* testing change channel */
    1.31  		//gmyth_recorder_spawntv_no_tvchain( livetv->recorder );
    1.32 @@ -696,9 +689,7 @@
    1.33  		livetv->proginfo = prog_info;		
    1.34  	}
    1.35  	/* prints program info data text */ 
    1.36 -#ifdef GMYTH_USE_DEBUG
    1.37  	gmyth_program_info_print( prog_info );
    1.38 -#endif
    1.39  
    1.40  	if ( prog_info != NULL ) {		
    1.41  		res = TRUE;
    1.42 @@ -761,12 +752,10 @@
    1.43  		goto done;
    1.44  	}
    1.45  	
    1.46 -#ifdef GMYTH_USE_DEBUG
    1.47  	if ( livetv->proginfo != NULL )
    1.48    	gmyth_debug( "URI path (from program info) = %s.\n", livetv->proginfo->pathname->str );
    1.49    else
    1.50    	gmyth_debug( "URI path (from URI) = %s.\n", livetv->uri->uri->str );
    1.51 -#endif
    1.52    
    1.53      g_mutex_lock( livetv->mutex );
    1.54    
    1.55 @@ -779,16 +768,11 @@
    1.56  
    1.57      if ( livetv->uri != NULL )  
    1.58      {
    1.59 -
    1.60 -        #ifdef GMYTH_USE_DEBUG
    1.61          gmyth_debug( "URI is not NULL, creating from the ProgramInfo pathname... (%s)", livetv->proginfo->pathname->str );
    1.62 -        #endif
    1.63          livetv->uri->path = g_string_erase(livetv->uri->path, 0, -1);
    1.64          livetv->uri->path = g_string_new( g_strrstr( livetv->proginfo->pathname->str, "/" ) );
    1.65      } else {
    1.66 -        #ifdef GMYTH_USE_DEBUG
    1.67          gmyth_debug( "URI is NULL, creating from the ProgramInfo pathname... (%s)", livetv->proginfo->pathname->str );
    1.68 -        #endif
    1.69        	livetv->uri = gmyth_uri_new_with_value( livetv->proginfo->pathname->str );
    1.70      }
    1.71