Ticket #4328: channelChange.15174.patch

libs/libmythtv/channelbase.h

@@ -144 +144 @@
     virtual bool SwitchToInput(int newcapchannel, bool setstarting) = 0;
 
     virtual int GetCardID(void) const;
-    virtual bool ChangeExternalChannel(const QString &newchan);
+    virtual bool ChangeExternalChannel(const QString &channum);
+    virtual bool RotateAntenna(const QString &channum,
+                               const QString &channum,
+                               const QString &callsign);
     static void StoreInputChannels(const InputMap&);
     static void StoreDefaultInput(uint cardid, const QString &input);
 

libs/libmythtv/hdhrchannel.cpp

@@ -309 +309 @@
     bool isFrequency = ok && (frequency > 10000000);
 
     // Tune to proper frequency
-    if ((*it)->externalChanger.isEmpty())
+    if (isFrequency)
     {
-        if (isFrequency)
+        // Allow an antenna rotor to spin around
+        if (!(*it)->externalChanger.isEmpty())
         {
-            if (!Tune(frequency, inputName, modulation, si_std))
+            int chanid = ChannelUtil::GetChanID((*it)->sourceid, channum);
+            QString callsign = ChannelUtil::GetCallsign(chanid);
+            if (!RotateAntenna(freqid, channum, callsign))
                 return false;
         }
-        else
-        {
-            VERBOSE(VB_IMPORTANT, LOC_ERR +
-                    "dtv_multiplex data is required for tuning");
 
+        if (!Tune(frequency, inputName, modulation, si_std))
             return false;
-        }
     }
-    else if (!ChangeExternalChannel(freqid))
+    else
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR +
+                "dtv_multiplex data is required for tuning");
+
         return false;
+    }
 
     // Set the current channum to the new channel's channum
     curchannelname = QDeepCopy<QString>(channum);

libs/libmythtv/channelbase.cpp

@@ -223 +223 @@
     return GetChannels(inputid);
 }
 
-bool ChannelBase::ChangeExternalChannel(const QString &channum)
+bool ChannelBase::ChangeExternalChannel(const QString &freqId)
 {
+    QString empty;
+    RotateAntenna(freqId, empty, empty);
+}
+
+bool ChannelBase::RotateAntenna(const QString &freqId,
+                                const QString &channum,
+                                const QString &callsign)
+{
 #ifdef USING_MINGW
     VERBOSE(VB_IMPORTANT, LOC_WARN +
             QString("ChangeExternalChannel is not implemented in MinGW."));
@@ -236 +244 @@
     if (changer.isEmpty())
         return false;
 
-    QString command = QString("%1 %2").arg(changer).arg(channum);
+    QString command = QString("%1 %2 %3 %4").arg(changer).arg(freqId).arg(channum).arg(callsign);
 
     VERBOSE(VB_CHANNEL, QString("External channel change: %1").arg(command));
     pid_t child = fork();

libs/libmythtv/videosource.cpp

@@ -1644 +1644 @@
     };
 };
 
+class ExternalRotateCommand :
+    public LineEditSetting, public CardInputDBStorage
+{
+  public:
+    ExternalRotateCommand(const CardInput &parent) :
+        LineEditSetting(this),
+        CardInputDBStorage(this, parent, "externalcommand")
+    {
+        setLabel(QObject::tr("Antenna rotate command"));
+        setValue("");
+        setHelpText(QObject::tr("If specified, this command will be run "
+                    "before a channel change so that an antenna can be "
+                    "rotated into position. Three arguments are passed: "
+                    "frequency, MPEG program number and channel callsign."));
+    };
+};
+
 class PresetTuner : public LineEditSetting, public CardInputDBStorage
 {
   public:
@@ -1779 +1796 @@
         ConfigurationGroup *chgroup = 
             new VerticalConfigurationGroup(false, false, true, true);
         chgroup->addChild(new QuickTune(*this));
+        chgroup->addChild(new ExternalRotateCommand(*this));
         chgroup->addChild(new FreeToAir(*this));
         group->addChild(chgroup);
     }