[Redbutton-devel] SF.net SVN: redbutton: [197] redbutton-download/trunk

[<ski...@us...>]

Revision: 197
          http://svn.sourceforge.net/redbutton/?rev=197&view=rev
Author:   skilvington
Date:     2007-01-26 08:33:59 -0800 (Fri, 26 Jan 2007)

Log Message:
-----------
not a fatal error if you have no channels.conf file - you just can't retune

Modified Paths:
--------------
    redbutton-download/trunk/channels.c
    redbutton-download/trunk/listen.c
    redbutton-download/trunk/rb-download.c

Modified: redbutton-download/trunk/channels.c
===================================================================
--- redbutton-download/trunk/channels.c	2007-01-24 20:16:21 UTC (rev 196)
+++ redbutton-download/trunk/channels.c	2007-01-26 16:33:59 UTC (rev 197)
@@ -189,6 +189,12 @@
 	unsigned int id;
 	int len;
 
+	if(_channels == NULL)
+	{
+		verbose("No channels.conf file available");
+		return NULL;
+	}
+
 	bzero(&_params, sizeof(_params));
 
 	verbose("Searching channels.conf for service_id %u", service_id);
@@ -262,7 +268,10 @@
 
 	/* find the tuning params for the service */
 	if((needed_params = get_tune_params(service_id)) == NULL)
-		fatal("service_id %u not found in channels.conf file", service_id);
+	{
+		error("service_id %u not found in channels.conf file", service_id);
+		return false;
+	}
 
 /* TODO */
 	/* if no-one was using the frontend when we open it

Modified: redbutton-download/trunk/listen.c
===================================================================
--- redbutton-download/trunk/listen.c	2007-01-24 20:16:21 UTC (rev 196)
+++ redbutton-download/trunk/listen.c	2007-01-26 16:33:59 UTC (rev 197)
@@ -279,7 +279,8 @@
 	pid_t child;
 
 	/* retune if needed */
-	tune_service_id(adapter, timeout, service_id);
+	if(!tune_service_id(adapter, timeout, service_id))
+		error("Unable to retune; let's hope you're already tuned to the right frequency...");
 	
 	/* find the MHEG PIDs */
 	car = find_mheg(adapter, timeout, service_id, carousel_id);

Modified: redbutton-download/trunk/rb-download.c
===================================================================
--- redbutton-download/trunk/rb-download.c	2007-01-24 20:16:21 UTC (rev 196)
+++ redbutton-download/trunk/rb-download.c	2007-01-26 16:33:59 UTC (rev 197)
@@ -148,7 +148,7 @@
 
 	/* initialise channels.conf */
 	if(!init_channels_conf(channels_file))
-		fatal("Unable to parse channels.conf file");
+		error("Unable to open channels.conf file");
 
 	/* do we need to change the base directory */
 	if(base_dir != NULL


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.