Ticket #4115: 4115-fixes-v1.patch

libs/libmythtv/tv_play.cpp

@@ -53 +53 @@
 const int TV::kInputModeTimeout=5000;
 
 #define DEBUG_CHANNEL_PREFIX 0 /**< set to 1 to channel prefixing */
-#define DEBUG_ACTIONS 0 /**< set to 1 to debug actions */
+#define DEBUG_ACTIONS 1 /**< set to 1 to debug actions */
 #define LOC QString("TV: ")
+#define LOC_WARN QString("TV Warning: ")
 #define LOC_ERR QString("TV Error: ")
 
 void TV::InitKeys(void)
@@ -1480 +1481 @@
 void TV::RunTV(void)
 { 
     paused = false;
-    QKeyEvent *keypressed;
-    QString netCmd;
 
     doing_ff_rew = 0;
     ff_rew_index = kInitFFRWSpeed;
@@ -1570 +1569 @@
             getRecorderPlaybackInfo = false;
         }
 
-        if (nvp && (keyList.count() > 0))
-        { 
+        bool had_key = false;
+        if (nvp)
+        {
+            QKeyEvent *keypressed = NULL;
+
             keyListLock.lock();
-            keypressed = keyList.first();
-            keyList.removeFirst();
+            if (keyList.count() > 0)
+            {
+                keypressed = keyList.first();
+                keyList.removeFirst();
+            }
             keyListLock.unlock();
 
-            ProcessKeypress(keypressed);
-            delete keypressed;
+            if (keypressed)
+            {
+                had_key = true;
+                ProcessKeypress(keypressed);
+                delete keypressed;
+            }
         }
 
-        netCmd = "";
-        ncLock.lock();
-        if (networkControlCommands.size())
+        if (nvp && !had_key && !ignoreKeys)
         {
-            netCmd = networkControlCommands.front();
-            networkControlCommands.pop_front();
+            QString netCmd = QString::null;
+            ncLock.lock();
+            if (networkControlCommands.size())
+            {
+                netCmd = networkControlCommands.front();
+                networkControlCommands.pop_front();
+            }
+            ncLock.unlock();
+
+            if (!netCmd.isEmpty())
+                processNetworkControlCommand(netCmd);
         }
-        ncLock.unlock();
 
-        if (netCmd != "")
-            processNetworkControlCommand(netCmd);
-
         if ((recorder && recorder->GetErrorStatus()) ||
             (nvp && nvp->IsErrored()) || IsErrored())
         {
@@ -2767 +2779 @@
 
 void TV::processNetworkControlCommand(QString command)
 {
+#ifdef DEBUG_ACTIONS
+    VERBOSE(VB_IMPORTANT, LOC + "ProcessNetworkControlCommand(" +
+            QString("%1)").arg(command));
+#endif
+
     QStringList tokens = QStringList::split(" ", command);
+    if (tokens.size() < 2)
+    {
+        VERBOSE(VB_IMPORTANT, LOC_ERR + "Not enough tokens"
+                "in network control command" + "\n\t\t\t" +
+                QString("'%1'").arg(command));
+        return;
+    }
 
+    if (!dialogname.isEmpty())
+    {
+        VERBOSE(VB_IMPORTANT, LOC_WARN + "Ignoring network "
+                "control command\n\t\t\t" +
+                QString("because dialog '%1'").arg(dialogname) +
+                "is waiting for a response");
+        return;
+    }
+
     if (tokens[1] != "QUERY")
         ClearOSD();
 
     if (tokens.size() == 3 && tokens[1] == "CHANID")
     {
-        ChangeChannel(tokens[2].toUInt(), "");
+        queuedChanID = tokens[2].toUInt();
+        queuedChanNum = QString::null;
+        CommitQueuedInput();
     }
     else if (tokens.size() == 3 && tokens[1] == "CHANNEL")
     {
-        if (tokens[2] == "UP")
-            ChangeChannel(CHANNEL_DIRECTION_UP);
-        else if (tokens[2] == "DOWN")
-            ChangeChannel(CHANNEL_DIRECTION_DOWN);
-        else if (tokens[2].contains(QRegExp("^[-\\.\\d_#]+$")))
-            ChangeChannel(0, tokens[2]);
+        uint aindx = (activenvp == nvp) ? 0 : 1;
+        if (StateIsLiveTV(GetState()) && !pseudoLiveTVState[aindx])
+        {
+            if (tokens[2] == "UP")
+                ChangeChannel(CHANNEL_DIRECTION_UP);
+            else if (tokens[2] == "DOWN")
+                ChangeChannel(CHANNEL_DIRECTION_DOWN);
+            else if (tokens[2].contains(QRegExp("^[-\\.\\d_#]+$")))
+                ChangeChannel(0, tokens[2]);
+        }
     }
     else if (tokens.size() == 3 && tokens[1] == "SPEED")
     {
@@ -2865 +2904 @@
         }
         else if (tokens[2].contains(QRegExp("^\\d+\\/\\d+x$")))
         {
+            if (activerbuffer->InDVDMenuOrStillFrame())
+                return;
+
             if (paused)
                 DoPause();
 
@@ -2904 +2946 @@
     }
     else if (tokens.size() >= 3 && tokens[1] == "SEEK" && activenvp)
     {
+        if (activerbuffer->InDVDMenuOrStillFrame())
+            return;
+
         if (tokens[2] == "BEGINNING")
             DoSeek(-activenvp->GetFramesPlayed(), tr("Jump to Beginning"));
         else if (tokens[2] == "FORWARD")
@@ -5198 +5243 @@
             if ((tokens[1] != "ANSWER") && (tokens[1] != "RESPONSE"))
             {
                 ncLock.lock();
-                networkControlCommands.push_back(message);
+                networkControlCommands.push_back(QDeepCopy<QString>(message));
                 ncLock.unlock();
             }
         }

programs/mythfrontend/networkcontrol.cpp

@@ -192 +192 @@
     if (result != "")
     {
         nrLock.lock();
-        networkControlReplies.push_back(result);
+        networkControlReplies.push_back(QDeepCopy<QString>(result));
         nrLock.unlock();
 
         notifyDataAvailable();
@@ -227 +227 @@
     client = s;
     cs = os;
 
+    ncLock.lock();
     networkControlCommands.clear();
+    ncLock.unlock();
+
+    nrLock.lock();
     networkControlReplies.clear();
+    nrLock.unlock();
 
     welcomeStr = "MythFrontend Network Control\r\n";
     if (closedOldConn)
@@ -263 +268 @@
         lineIn.replace(QRegExp("[\r\n]"), "");
         lineIn.replace(QRegExp("^\\s"), "");
 
+        if (lineIn.isEmpty())
+            continue;
+
         tokens = QStringList::split(" ", lineIn);
-        if (tokens[0].lower() != "key")
+        if (tokens.size() && (tokens[0].lower() != "key"))
             lineIn = lineIn.lower();
 
         ncLock.lock();
-        networkControlCommands.push_back(lineIn);
+        networkControlCommands.push_back(QDeepCopy<QString>(lineIn));
         ncLock.unlock();
     }
 }
@@ -723 +731 @@
             for (unsigned int i = 3; i < tokens.size(); i++)
                 response += QString(" ") + tokens[i];
             nrLock.lock();
-            networkControlReplies.push_back(response);
+            networkControlReplies.push_back(QDeepCopy<QString>(response));
             nrLock.unlock();
 
             notifyDataAvailable();