Ticket #1653: mythtv-frequency_table_comboboxes.patch

usr/local/src/mdean/Myth/src/mythtv/setup/backendsettings.cpp

@@ -1 +1 @@
 #include <cstdio>
 
 #include "backendsettings.h"
+#include "frequencies.h"
 #include "libmyth/mythcontext.h"
 #include "libmyth/settings.h"
 #include <unistd.h>
@@ -110 +111 @@
 {
     GlobalComboBox *gc = new GlobalComboBox("FreqTable");
     gc->setLabel(QObject::tr("Channel frequency table"));
-    gc->addSelection("us-cable");
-    gc->addSelection("us-bcast");
-    gc->addSelection("us-cable-hrc");
-    gc->addSelection("us-cable-irc");
-    gc->addSelection("japan-bcast");
-    gc->addSelection("japan-cable");
-    gc->addSelection("europe-west");
-    gc->addSelection("europe-east");
-    gc->addSelection("italy");
-    gc->addSelection("newzealand");
-    gc->addSelection("australia");
-    gc->addSelection("ireland");
-    gc->addSelection("france");
-    gc->addSelection("china-bcast");
-    gc->addSelection("southafrica");
-    gc->addSelection("argentina");
-    gc->addSelection("australia-optus");
+
+    int i = 0;
+    char *listname = NULL;
+    while ((listname = (char *)chanlists[i].name) != NULL)
+    {
+        gc->addSelection(listname);
+        i++;
+    }
+
     gc->setHelpText(QObject::tr("Select the appropriate frequency table for "
                     "your system.  If you have an antenna, use a \"-bcast\" "
                     "frequency."));

usr/local/src/mdean/Myth/src/mythtv/libs/libmythtv/videosource.cpp

@@ -29 +29 @@
 #include "scanwizard.h"
 #include "cardutil.h"
 #include "sourceutil.h"
+#include "frequencies.h"
 
 #ifdef USING_DVB
 #include <linux/dvb/frontend.h>
@@ -116 +117 @@
 {
     setLabel(QObject::tr("Channel frequency table"));
     addSelection("default");
-    addSelection("us-cable");
-    addSelection("us-bcast");
-    addSelection("us-cable-hrc");
-    addSelection("japan-bcast");
-    addSelection("japan-cable");
-    addSelection("europe-west");
-    addSelection("europe-east");
-    addSelection("italy");
-    addSelection("newzealand");
-    addSelection("australia");
-    addSelection("ireland");
-    addSelection("france");
-    addSelection("china-bcast");
-    addSelection("southafrica");
-    addSelection("argentina");
-    addSelection("australia-optus");
+
+    int i = 0;
+    char *listname = NULL;
+    while ((listname = (char *)chanlists[i].name) != NULL)
+    {
+        addSelection(listname);
+        i++;
+    }
+
     setHelpText(QObject::tr("Use default unless this source uses a "
                 "different frequency table than the system wide table "
                 "defined in the General settings."));