Ticket #2240: 2240-v1.patch

libs/libmythtv/channeleditor.cpp

@@ -19 +19 @@
 
 #include "scanwizard.h"
 
-ChannelWizard::ChannelWizard(int id)
+ChannelWizard::ChannelWizard(int id, int default_sourceid)
              : ConfigurationWizard() {
     setLabel(QObject::tr("Channel Options"));
 
     // Must be first.
     addChild(cid = new ChannelID());
     cid->setValue(id);
-        
-    ChannelOptionsCommon* common = new ChannelOptionsCommon(*cid);
+
+    ChannelOptionsCommon *common =
+        new ChannelOptionsCommon(*cid, default_sourceid);
     addChild(common);
 
     int cardtypes = countCardtypes();
@@ -336 +337 @@
 void ChannelEditor::edit()
 {
     id = list->getValue().toInt();
-    ChannelWizard cw(id);
+    ChannelWizard cw(id, source->getValue().toUInt());
     cw.exec();
 
     list->fillSelections();

libs/libmythtv/channeleditor.h

@@ -38 +38 @@
 class ChannelWizard: public ConfigurationWizard {
     Q_OBJECT
 public:
-    ChannelWizard(int id);
+    ChannelWizard(int id, int default_sourceid);
     QString getCardtype();
     bool cardTypesInclude(const QString& cardtype); 
     int countCardtypes();

libs/libmythtv/channelsettings.cpp

@@ -42 +42 @@
     };
 };
 
-class Source: public ComboBoxSetting, public CSetting {
-public:
-    Source(const ChannelID& id):
-        ComboBoxSetting(), CSetting(id, "sourceid") {
+class Source: public ComboBoxSetting, public CSetting
+{
+  public:
+    Source(const ChannelID &id, uint _default_sourceid) :
+        ComboBoxSetting(), CSetting(id, "sourceid"),
+        default_sourceid(_default_sourceid)
+    {
         setLabel(QObject::tr("Video Source"));
     };
 
-    void load() {
+    void load(void)
+    {
         fillSelections();
         CSetting::load();
+
+        if (default_sourceid && !getValue().toUInt())
+        {
+            uint which = sourceid_to_index[default_sourceid];
+            if (which)
+                setValue(which);
+        }
     };
 
-    void fillSelections() 
+    void fillSelections(void)
     {
         addSelection(QObject::tr("[Not Selected]"), "0");
 
         MSqlQuery query(MSqlQuery::InitCon());
-        query.prepare("SELECT name, sourceid FROM videosource");
+        query.prepare("SELECT name, sourceid "
+                      "FROM videosource "
+                      "ORDER BY sourceid");
         
-        if (query.exec() && query.isActive() && query.size() > 0)
-            while(query.next())
+        if (!query.exec() || !query.isActive())
+        {
+            MythContext::DBError("Source::fillSelections", query);
+        }
+        else
+        {
+            for (uint i = 1; query.next(); i++)
+            {
+                sourceid_to_index[query.value(1).toUInt()] = i;
                 addSelection(query.value(0).toString(),
                              query.value(1).toString());
+            }
+        }
+
+        sourceid_to_index[0] = 0; // Not selected entry.
     };
+
+  private:
+    uint            default_sourceid;
+    QMap<uint,uint> sourceid_to_index;
 };
 
 class Callsign: public LineEditSetting, public CSetting {
@@ -265 +293 @@
     };
 };
 
-ChannelOptionsCommon::ChannelOptionsCommon(const ChannelID& id) :
-    ConfigurationGroup(false, true, false, false),
+ChannelOptionsCommon::ChannelOptionsCommon(const ChannelID &id,
+                                           uint default_sourceid) :
+    ConfigurationGroup(        false, true, false, false),
     VerticalConfigurationGroup(false, true, false, false)
 {
     setLabel(QObject::tr("Channel Options - Common"));
@@ -274 +303 @@
 
     addChild(new Name(id));
 
-    Source *source;
+    Source *source = new Source(id, default_sourceid);
 
-    HorizontalConfigurationGroup* group1 = new HorizontalConfigurationGroup(false,true);
+    HorizontalConfigurationGroup *group1 =
+        new HorizontalConfigurationGroup(false, true);
+    HorizontalConfigurationGroup *lefthoz =
+        new HorizontalConfigurationGroup(false, true);
+    HorizontalConfigurationGroup *bottomhoz =
+        new HorizontalConfigurationGroup(false, true);
+    VerticalConfigurationGroup *left =
+        new VerticalConfigurationGroup(false, true);
+    VerticalConfigurationGroup *right =
+        new VerticalConfigurationGroup(false, true);
 
-    VerticalConfigurationGroup* left = new VerticalConfigurationGroup(false,true);
+    lefthoz->addChild(new Visible(id));
+    lefthoz->addChild(new CommFree(id));
+
     left->addChild(new Channum(id));
     left->addChild(new Callsign(id));
-
-    HorizontalConfigurationGroup *lefthoz = new HorizontalConfigurationGroup(false,true);
-
-    lefthoz->addChild(new Visible(id));
-    lefthoz->addChild(new CommFree(id));
     left->addChild(lefthoz);
-    group1->addChild(left);
 
-    VerticalConfigurationGroup* right = new VerticalConfigurationGroup(false, true);
-    right->addChild(source = new Source(id));
+    right->addChild(source);
     right->addChild(new ChannelTVFormat(id));
     right->addChild(new Priority(id));
+
+    group1->addChild(left);
     group1->addChild(right);
 
+    bottomhoz->addChild(onairguide = new OnAirGuide(id));
+    bottomhoz->addChild(xmltvID = new XmltvID(id));
+    bottomhoz->addChild(new TimeOffset(id));
+
     addChild(group1);
-
     addChild(new Icon(id));
     addChild(new VideoFilters(id));
     addChild(new OutputFilters(id));
-
-    HorizontalConfigurationGroup *bottomhoz =
-        new HorizontalConfigurationGroup(false, true);
-
-    bottomhoz->addChild(onairguide = new OnAirGuide(id));
-    bottomhoz->addChild(xmltvID = new XmltvID(id));
-    bottomhoz->addChild(new TimeOffset(id));
     addChild(bottomhoz);
 
     connect(onairguide, SIGNAL(valueChanged(     bool)),

libs/libmythtv/channelsettings.h

@@ -106 +106 @@
 class OnAirGuide;
 class XmltvID;
 
-class ChannelOptionsCommon: public VerticalConfigurationGroup {
+class ChannelOptionsCommon: public VerticalConfigurationGroup
+{
     Q_OBJECT
-public:
-    ChannelOptionsCommon(const ChannelID& id);
-    void load();
-public slots:
+
+  public:
+    ChannelOptionsCommon(const ChannelID &id, uint default_sourceid);
+    void load(void);
+
+  public slots:
     void onAirGuideChanged(bool);
     void sourceChanged(const QString&);
 
-protected:
+  protected:
     OnAirGuide *onairguide;
     XmltvID    *xmltvID;
 };