Ticket #6240: 6240-v1.patch

libs/libmythtv/xine_demux_sputext.cpp

@@ -32 +32 @@
 #include "config.h"
 #endif
 
+#include <ctype.h>
 #include <stdlib.h>
 #include <stdio.h>
 #include <unistd.h>
@@ -97 +98 @@
   off_t nread = 0;
   char *s;
   int linelen;
-  
-  if ((len - demuxstr->buflen) > 512) {
-    if((nread = fread(
-            &demuxstr->buf[demuxstr->buflen], 1, 
-            len - demuxstr->buflen, demuxstr->file_ptr)) < 0) {
+
+  // Since our RemoteFile code sleeps 200ms whenever we get back less data
+  // than requested, but this code just keeps trying to read until it gets
+  // an error back, we check for empty reads so that we can stop reading
+  // when there is no more data to read
+  if (demuxstr->emptyReads == 0 && (len - demuxstr->buflen) > 512) {
+    nread = demuxstr->rbuffer->Read(
+        &demuxstr->buf[demuxstr->buflen], len - demuxstr->buflen);
+    if (nread < 0) {
       printf("read failed.\n");
       return NULL;
     }
   }
-  
+ 
+  if (!nread)
+    demuxstr->emptyReads++;
+
   demuxstr->buflen += nread;
   demuxstr->buf[demuxstr->buflen] = '\0';
 
@@ -1099 +1107 @@
   };
 
   /* Rewind (sub_autodetect() needs to read input from the beginning) */
-  if(fseek(demuxstr->file_ptr, 0, SEEK_SET) == -1) {
+  if(demuxstr->rbuffer->Seek(0, SEEK_SET) == -1) {
     printf("seek failed.\n");
     return NULL;
   }
   demuxstr->buflen = 0;
+  demuxstr->emptyReads = 0;
 
   demuxstr->format=sub_autodetect (demuxstr);
   if (demuxstr->format==FORMAT_UNKNOWN) {
@@ -1113 +1122 @@
   /*printf("Detected subtitle file format: %d\n", demuxstr->format);*/
     
   /* Rewind */
-  if(fseek(demuxstr->file_ptr, 0, SEEK_SET) == -1) {
+  if(demuxstr->rbuffer->Seek(0, SEEK_SET) == -1) {
     printf("seek failed.\n");
     return NULL;
   }
   demuxstr->buflen = 0;
+  demuxstr->emptyReads = 0;
 
   demuxstr->num=0;n_max=32;
   first = (subtitle_t *) malloc(n_max*sizeof(subtitle_t));

libs/libmythtv/playercontext.cpp

@@ -477 +477 @@
         _nvp->SetNoAudio();
     else
     {
-// FIXME: This causes startup to take *forever*
-//        _nvp->LoadExternalSubtitles(buffer->GetFilename());
+        QString subfn = ComputeExternalSubtitleFileName(buffer->GetFilename());
+        if (!subfn.isEmpty())
+            _nvp->LoadExternalSubtitles(subfn);
     }
 
     if ((embedwinid > 0) && embedbounds)
@@ -550 +551 @@
     return StartDecoderThread(maxWait);
 }
 
+#include <QDir>
+#include "storagegroup.h"
+QString PlayerContext::ComputeExternalSubtitleFileName(
+    const QString &videoFile) const
+{
+    if (videoFile.isEmpty())
+        return QString::null;
+
+    QString fileName = videoFile;
+    QString dirName  = ".";
+
+    int dirPos = videoFile.lastIndexOf(QChar('/'));
+    if (dirPos > 0)
+    {
+        fileName = videoFile.mid(dirPos + 1);
+        dirName = videoFile.left(dirPos);
+    }
+
+    QString baseName = fileName;
+    int suffixPos = fileName.lastIndexOf(QChar('.'));
+    if (suffixPos > 0)
+        baseName = fileName.left(suffixPos);
+
+    // Try to find files with the same base name, but ending with
+    // '.srt', '.sub', or '.txt'
+    QStringList ext;
+    ext += ".srt";
+    ext += ".sub";
+    ext += ".txt";
+
+    if (dirName.startsWith("myth://"))
+    {
+        QString sgroup = "";
+        if (dirName.indexOf('@') > -1)
+            sgroup = dirName.mid(7, dirName.indexOf('@', 7) - 7);
+
+        StorageGroup sg(sgroup);
+        QStringList::const_iterator it = ext.begin();
+        for (; it != ext.end(); ++it)
+        {
+            if (sg.FileExists(baseName + *it))
+                return dirName + "/" + baseName + *it;
+        }
+
+        return QString::null;
+    }
+
+    QStringList el;
+    {
+        // The dir listing does not work if the filename has the
+        // following chars "[]()" so we convert them to the wildcard '?'
+        const QString findBaseName = baseName
+            .replace("[", "?")
+            .replace("]", "?")
+            .replace("(", "?")
+            .replace(")", "?");
+
+        QStringList::const_iterator eit = ext.begin();
+        for (; eit != ext.end(); eit++)
+            el += findBaseName + *eit;
+    }
+
+    // Some Qt versions do not accept paths in the search string of
+    // entryList() so we have to set the dir first
+    QDir dir;
+    dir.setPath(dirName);
+
+    const QStringList candidates = dir.entryList(el);
+
+    QStringList::const_iterator cit = candidates.begin();
+    QStringList::const_iterator eit = ext.begin();
+    for (; (cit != candidates.end()) && (eit != ext.end()); ++cit, ++eit)
+    {
+        QFileInfo fi(dirName + "/" + *cit);
+        if (fi.exists() && (fi.size() > 0))
+            return dirName + "/" + baseName + *eit;
+    }
+
+    return QString::null;
+}
+
 /** \fn PlayerContext::StartDecoderThread(int)
  *  \brief Starts player, must be called after StartRecorder().
  *  \param maxWait How long to wait for NuppelVideoPlayer to start playing.

libs/libmythtv/xine_demux_sputext.h

@@ -1 +1 @@
 #ifndef XINE_DEMUX_SPUTEXT_H
 #define XINE_DEMUX_SPUTEXT_H
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+#include "RingBuffer.h"
 
-#include <ctype.h>
-#include <stdio.h>
-
 #define SUB_BUFSIZE   1024
 #define SUB_MAX_TEXT  5
 #define MAX_TIMEOUT 4
@@ -26 +21 @@
 
 typedef struct {
 
-  FILE*              file_ptr;
+  RingBuffer*        rbuffer;
 
   int                status;
 
   char               buf[SUB_BUFSIZE];
   off_t              buflen;
+  off_t              emptyReads;
 
   float              mpsub_position;  
 
@@ -48 +44 @@
 
 subtitle_t *sub_read_file (demux_sputext_t*);
 
-#ifdef __cplusplus
-}
 #endif
-
-#endif

libs/libmythtv/playercontext.h

@@ -134 +134 @@
     bool IsValidLiveTV(void) const
         { return nvp && tvchain && recorder && buffer; }
 
+  private:
+    QString ComputeExternalSubtitleFileName(const QString &videoFile) const;
+
   public:
     QString             recUsage;
     NuppelVideoPlayer  *nvp;

libs/libmythtv/textsubtitleparser.cpp

@@ -11 +11 @@
 #include <qtextcodec.h>
 
 #include "mythcontext.h"
+#include "RingBuffer.h"
 
 using std::lower_bound;
 
@@ -110 +111 @@
 bool TextSubtitleParser::LoadSubtitles(QString fileName, TextSubtitles &target)
 {
     demux_sputext_t sub_data;
-    sub_data.file_ptr = fopen(fileName.toLocal8Bit().constData(), "r");
+    sub_data.rbuffer = new RingBuffer(fileName, 0, false);
     
-    if (!sub_data.file_ptr)
+    if (!sub_data.rbuffer)
         return false;
     
     subtitle_t *loaded_subs = sub_read_file(&sub_data);
     if (!loaded_subs)
     {
-        fclose(sub_data.file_ptr);
+                delete sub_data.rbuffer;
         return false;
     }
 
@@ -131 +132 @@
     if (!textCodec)
         textCodec = QTextCodec::codecForName("utf-8");
     if (!textCodec)
+        {
+        delete sub_data.rbuffer;
         return false;
+    }
 
     QTextDecoder *dec = textCodec->makeDecoder();
 
@@ -162 +166 @@
     // textCodec object is managed by Qt, do not delete...
 
     free(loaded_subs);
-    fclose(sub_data.file_ptr);
 
+    delete sub_data.rbuffer;
     return true;
 }