Ticket #5882: vdr_conf.diff

dtvconfparser.cpp

@@ -108 +108 @@
 
         str = list[3];
 
+        if ((strtoul(str.toLatin1(),NULL,10)>0) &&
+            ((str.right(1)=="E") || (str.right(1)=="W"))
+           )
+        {
+            str="S";
+        }
+
         if ((str == "T") || (str == "C") || (str == "S"))
         {
             if ((type == OFDM) && (str == "T"))
@@ -231 +238 @@
 
 // BBC ONE:754166:I999B8C34D34M16T2G32Y0:T:27500:600:601, 602:0:0:4168:0:0:0
 
-    PARSE_SKIP(unknown);
+    PARSE_STR(chan.name);
 
     PARSE_UINT_1000(mux.frequency);
 
@@ -243 +250 @@
     {
         QString ori = params;
         int s = (int) (params.toAscii().constData()[0]);
+        s=toupper(s);
         params = params.mid(1);
         switch (s)
         {
@@ -280 +288 @@
             case 'O':
                 mux.rolloff.ParseVDR(params);
                 break;
+            case '0':
+            case '1':
+            case '2':
+            case '3':
+            case '4':
+            case '5':
+            case '6':
+            case '7':
+            case '8':
+            case '9':
+                break;
             default:
-                return false;
+                VERBOSE(VB_IMPORTANT, "Warning: Unknown parameter in list:"<<(char)s);
+                //return false;
         }
     }
 
-    for (uint i = 0; i < 6; i++)
+    PARSE_SKIP(unknown);
+
+    PARSE_UINT_1000(mux.symbolrate);
+
+    for (uint i = 0; i < 4; i++)
         PARSE_SKIP(unknown);
 
     PARSE_UINT(chan.serviceid);