Ticket #2878: perchancommflag.patch

libs/libmythtv/dbcheck.cpp

@@ -10 +10 @@
 #include "mythdbcon.h"
 
 /// This is the DB schema version expected by the running MythTV instance.
-const QString currentDatabaseVersion = "1175";
+const QString currentDatabaseVersion = "1176";
 
 static bool UpdateDBVersionNumber(const QString &newnumber);
 static bool performActualUpdate(const QString updates[], QString version,
@@ -258 +258 @@
 those on the BBC and CBC networks. On commercial free channels we
 do not need to run the commercial detector.
 
+'commmethod' tells us which commercial flagger to use on the channel, the
+default is to use the global setting
+
 'visible' tells us whether we should show this channel in the channel
 guide.
 
@@ -2803 +2806 @@
             return false;
     }
 
+    if (dbver == "1175")
+    {
+        const QString updates[] = {
+"ALTER TABLE channel ADD COLUMN commmethod INT NOT NULL default '-1';",
+""
+};
+        if (!performActualUpdate(updates, "1176", dbver))
+            return false;
+    }
+
 //"ALTER TABLE cardinput DROP COLUMN preference;" in 0.22
 //"ALTER TABLE channel DROP COLUMN atscsrcid;" in 0.22
 //"ALTER TABLE recordedmarkup DROP COLUMN offset;" in 0.22
@@ -2912 +2925 @@
 "  hue int(11) default '32768',"
 "  tvformat varchar(10) NOT NULL default 'Default',"
 "  commfree tinyint(4) NOT NULL default '0',"
+"  commmethod int(11) NOT NULL default '-1',"
 "  visible tinyint(1) NOT NULL default '1',"
 "  outputfilters varchar(255) NOT NULL default '',"
 "  useonairguide tinyint(1) default '0',"

libs/libmythtv/channelsettings.cpp

@@ -237 +237 @@
     }
 };
 
+class CommMethod : public ComboBoxSetting, public ChannelDBStorage
+{
+  public:
+    CommMethod(const ChannelID &id) :
+       ComboBoxSetting(this), ChannelDBStorage(this, id, "commmethod")
+    {
+        setLabel(QObject::tr("Commercial Flagging Method"));
+        setHelpText(QObject::tr("Changes the method of "
+               "commercial detection used for recordings on this channel"));
+        addSelection(QObject::tr("Use Global Setting"), "-1");
+
+        /* These settings should probably be consolodated with
+         * programs/mythfrontend/globalsettings.cpp:391
+         * however I don't know the appropiate way to do this to fit
+         * into mythtv frameworks.. so I have left for the experts :)
+         */
+        addSelection(QObject::tr("All Available Methods"), "255");
+        addSelection(QObject::tr("Blank Frame Detection"), "1");
+        addSelection(QObject::tr("Blank Frame + Scene Change Detection"), "3");
+        addSelection(QObject::tr("Scene Change Detection"), "2");
+        addSelection(QObject::tr("Logo Detection"), "4");
+        addSelection(QObject::tr("Experimental"), "511");
+
+    }
+};
+
 class Visible : public CheckBoxSetting, public ChannelDBStorage
 {
   public:
@@ -363 +389 @@
 
     left->addChild(new Channum(id));
     left->addChild(new Callsign(id));
+    left->addChild(new CommMethod(id));
     left->addChild(lefthoz);
   
     right->addChild(source);

programs/mythcommflag/main.cpp

@@ -454 +454 @@
 int FlagCommercials(QString chanid, QString starttime)
 {
     int breaksFound = 0;
+
     if (commDetectMethod == COMM_DETECT_UNINIT)
+    {
+            MSqlQuery method_query(MSqlQuery::InitCon());
+            method_query.prepare("SELECT commmethod FROM channel "
+                                        "WHERE chanid = :CHANID;");
+            method_query.bindValue(":CHANID", chanid);
+
+            if (method_query.exec() && method_query.isActive() 
+                                                && method_query.size() > 0)
+            {
+                    method_query.next();
+                    commDetectMethod = (enum SkipTypes)
+                                        method_query.value(0).toInt();
+                    VERBOSE(VB_COMMFLAG, 
+                        QString("Using method: %1 from chaneld %2")
+                        .arg(commDetectMethod).arg(chanid));
+            }
+
+    }
+        
+    if (commDetectMethod == COMM_DETECT_UNINIT)
         commDetectMethod = (enum SkipTypes)gContext->GetNumSetting(
                                     "CommercialSkipMethod", COMM_DETECT_ALL);
     QMap<long long, int> blanks;