[SCM] Mumudvb packaging branch, upstream, updated. 24c2efb080b56abb8e7be67bae30ba7fe457759e

[Brice DUBOST]

The following commit has been merged in the upstream branch:
commit 205e009498ae6fb073748079a0450a089a3a93cc
Author: Brice DUBOST <braice at braice.net>
Date:   Sat Nov 1 11:19:20 2008 +0100

    Mail update,
    We accept empty lines in the config file

diff --git a/README b/README
index 2bbc3fc..49cbab2 100644
--- a/README
+++ b/README
@@ -16,14 +16,17 @@ each channel to a different multicast IP.
 = Authors =
 
 Upstream author : 
-Brice DUBOST (mumudvb at braice.net)
+Brice DUBOST (mumudvb AT braice.net)
 
 Contributions :
-Manuel SABBAN (manu at crans.ens-cachan.fr) (getopt)
-Stephane GLONDU (glondu at crans.ens-cachan.fr) (makefile cleaning, man page)
+Manuel SABBAN (manu AT crans.ens-cachan.fr) (getopt)
+Stephane GLONDU (glondu AT crans.ens-cachan.fr) (makefile cleaning, man page)
 
 Special thanks to Dave CHAPMAN (dvbstream author)
 
+Mailing list : 
+"mumudvb-dev _AT_ lists DOT crans DOT org"
+
 = Contents and features =
 
 == Features overview ==
diff --git a/README-fr b/README-fr
index 5e165e7..d9ae829 100644
--- a/README-fr
+++ b/README-fr
@@ -13,15 +13,18 @@ Mumudvb permet de diffuser plusieurs chaines d'un transpondeur dvb sur diff
 = Auteurs =
 
 Auteur principal:
-Brice DUBOST (mumudvb at braice.net)
+Brice DUBOST (mumudvb AT braice.net)
 
 Contributeurs:
-Manuel SABBAN (manu at crans.ens-cachan.fr) (implémentation du getopt)
-Stephane GLONDU (glondu at crans.ens-cachan.fr) (page de man, nettoyage du Makefile)
+Manuel SABBAN (manu AT crans.ens-cachan.fr) (implémentation du getopt)
+Stephane GLONDU (glondu AT crans.ens-cachan.fr) (page de man, nettoyage du Makefile)
 
 Remerciements:
 Dave CHAPMAN pour avoir écrit dvbstream.
 
+Mailing-liste : 
+"mumudvb-dev _AT_ lists DOT crans DOT org"
+
 = Fonctionalités et contenu =
 
 == Fonctonalités principales =
diff --git a/doc/QUICKSTART b/doc/QUICKSTART
index 9ff9dba..1dbe438 100644
--- a/doc/QUICKSTART
+++ b/doc/QUICKSTART
@@ -43,6 +43,8 @@ srate=27500
  * That's all, you should get a list of the streamed channels with their IP
 adress
 
+ * The SAP (session announcement protocol) announces will be sent automatically
+
 = DVB-t =
 
  * It's the same way as DVB-s excepted that you need other informations for
@@ -61,11 +63,14 @@ If your bandwith is different from 8Mhz or if you experience tuning issues,
 look for the following parameters in README_CONF : bandwidth, qam, trans_mode,
 guardinterval, coderate
 
+ * The SAP (session announcement protocol) announces will be sent automatically
+
 = Troubleshooting =
 
  * Try adding -v to the mumudvb command line to have more detailled messages
  * If you experience tuning issues, try with other dvb software like scan or
 szap and check your parameters
  * If it still don't work, look at common issues in the README and you can
-write a mail at mumudvb _AT_ braice _DOT_ net
+write a mail at mumudvb _AT_ braice _DOT_ net or 
+"mumudvb-dev _AT_ lists DOT crans DOT org"
 
diff --git a/src/mumudvb.c b/src/mumudvb.c
index fee3d21..19290c5 100644
--- a/src/mumudvb.c
+++ b/src/mumudvb.c
@@ -330,14 +330,13 @@ main (int argc, char **argv)
   curr_channel=0;
   // we scan config file
   // see doc/README-conf for further information
-  while (fgets (current_line, CONF_LINELEN, conf_file)
-	 && strlen (current_line) > 1)
+  while (fgets (current_line, CONF_LINELEN, conf_file))
     {
       substring = strtok (current_line, delimiteurs);
       //commentary
       if (substring[0] == '#')
 	continue; 
-      
+
       if (!strcmp (substring, "timeout_accord"))
 	{
 	  substring = strtok (NULL, delimiteurs);	// on extrait la sous chaine
@@ -729,8 +728,9 @@ main (int argc, char **argv)
 	}
       else
 	{
-	  log_message( MSG_INFO,
-		       "Config issue : unknow symbol : %s\n\n", substring);
+	  if(strlen (current_line) > 1)
+	    log_message( MSG_INFO,
+			 "Config issue : unknow symbol : %s\n\n", substring);
 	  continue;
 	}
     }

-- 
Mumudvb packaging