Ticket #2708: preferMythProto.patch

libs/libmythtv/jobqueue.cpp

@@ -1776 +1776 @@
         ChangeJobStatus(jobID, JOB_STARTING);
         program_info->SetTranscoded(TRANSCODING_RUNNING);
 
-        QString filename = program_info->GetPlaybackURL();
+        // I need to get the filesize, 
+        // // so we need to use the file (RW=true)
+        QString filename = program_info->GetPlaybackURL(true);
 
         origfilesize = 0;
         filesize = 0;
@@ -1839 +1841 @@
                 // Clear the pathname to force rechecking the DB in case 
                 // mythtranscode renamed the file.
                 program_info->pathname = "";
-                filename = program_info->GetPlaybackURL();
+                // I need to get the filesize, 
+                // so we need to use the file (RW=true)
+                filename = program_info->GetPlaybackURL(true);
 
                 if (stat(filename.ascii(), &st) == 0)
                 {

libs/libmythtv/previewgenerator.cpp

@@ -69 +69 @@
     if (!QFileInfo(localFN).exists())
     {
         // GetPlaybackURL tries to return a local filename if one exists
-        localFN = programInfo.GetPlaybackURL();
+        localFN = programInfo.GetPlaybackURL(true);
         if (!(localFN.left(1) == "/" && QFileInfo(localFN).exists()))
             return; // didn't find file locally, must use remote backend
     }

libs/libmythtv/RingBuffer.cpp

@@ -168 +168 @@
     if ((filename.left(7) == "myth://") &&
         (filename.length() > 7 ))
     {
-        QString local_pathname = gContext->GetSetting("RecordFilePrefix");
-        int hostlen = filename.find(QRegExp("/"), 7);
-
-        if (hostlen != -1)
+        //If we don't prefer the myth proto, check to see if the file is 
+        //availible locally
+        if (!gContext->GetSetting("PreferMythProto") )
         {
-            local_pathname += filename.right(filename.length() - hostlen);
+            QString local_pathname = gContext->GetSetting("RecordFilePrefix");
+            int hostlen = filename.find(QRegExp("/"), 7);
 
-            QFile checkFile(local_pathname);
-            if (checkFile.exists())
+            if (hostlen != -1)
             {
-                is_local = true;
-                filename = local_pathname;
+                local_pathname += filename.right(filename.length() - hostlen);
+
+                QFile checkFile(local_pathname);
+                if (checkFile.exists())
+                {
+                    is_local = true;
+                    filename = local_pathname;
+                }
             }
         }
+
     }
 #ifdef USING_FRONTEND
     else if (filename.left(4) == "dvd:")

libs/libmythtv/programinfo.h

@@ -160 +160 @@
     bool SetRecordBasename(QString basename);
     QString GetRecordBasename(bool fromDB = false) const;
     QString GetRecordFilename(const QString &prefix, bool fromDB = false) const;
-    QString GetPlaybackURL(QString playbackHost = "") const;
+    QString GetPlaybackURL(bool needRW = false) const;
     QString MakeUniqueKey(void) const;
     int CalculateLength(void) const;
     int SecsTillStart() const;

libs/libmythtv/programinfo.cpp

@@ -1467 +1467 @@
     return QString("%1/%2").arg(prefix).arg(GetRecordBasename(fromDB));
 }               
 
-/** \fn ProgramInfo::GetPlaybackURL(QString) const
+/** \fn ProgramInfo::GetPlaybackURL(bool) const
  *  \brief Returns URL to where %MythTV would stream the
  *         this program from, were it to be streamed.
+ *  \param needRW boolean to request that file needs to be
+ *         writeable or otherwise not a mythstream (default =
+ *         false)
  */
-QString ProgramInfo::GetPlaybackURL(QString playbackHost) const
+QString ProgramInfo::GetPlaybackURL(bool needRW) const
 {
     QString tmpURL;
     QString m_hostname = gContext->GetHostName();
 
-    if (playbackHost == "")
-        playbackHost = m_hostname;
-
     tmpURL = GetRecordFilename(gContext->GetSettingOnHost("RecordFilePrefix",
                                                           hostname));
+    bool preferMythProto = gContext->GetSettingOnHost("PreferMythProtocol",
+                                                          m_hostname);
 
-    if (playbackHost == hostname)
+    //If this is local, use the file path
+    if (m_hostname == hostname)
         return tmpURL;
 
-    if (playbackHost == m_hostname)
+    // I'd rather not use the mythproto, or I need to Read & Write
+    // Check my local recording dir, see if this recording is there
+    if (!preferMythProto || needRW)
     {
         QFile checkFile(tmpURL);
 
@@ -1500 +1505 @@
             return tmpURL;
     }
 
+    //Otherwise I prefer the myth protocol, or the file is not avail locally
+    //so stream the file
     tmpURL = QString("myth://") +
              gContext->GetSettingOnHost("BackendServerIP", hostname) + ":" +
              gContext->GetSettingOnHost("BackendServerPort", hostname) + "/" +

programs/mythtranscode/main.cpp

@@ -395 +395 @@
             return TRANSCODE_EXIT_NO_RECORDING_DATA;
         }
 
-        infile = pginfo->GetPlaybackURL();
+        // We can't transcode if we can't write
+        infile = pginfo->GetPlaybackURL(true);
     }
     else
     {
@@ -584 +585 @@
         return;
     }
 
-    QString filename = pginfo->GetPlaybackURL();
+    // We need to write the new file, so we need RW
+    QString filename = pginfo->GetPlaybackURL(true);
 
     if (status == JOB_STOPPING)
     {