Ticket #6240: patch_external_subtitles.diff

libs/libmythtv/playercontext.cpp

@@ -1 +1 @@
 #include <math.h>
 #include <qtimer.h>
 #include <qpainter.h>
+#include <QDir>
 
 #include "playercontext.h"
 #include "NuppelVideoPlayer.h"
@@ -455 +456 @@
         _nvp->SetNoAudio();
     else
     {
-        _nvp->LoadExternalSubtitles(buffer->GetFilename());
+        //_nvp->LoadExternalSubtitles(buffer->GetFilename());
+        LoadExternalSubtitles(_nvp, buffer->GetFilename());
     }
 
     if ((embedwinid > 0) && embedbounds)
@@ -527 +529 @@
     return StartDecoderThread(maxWait);
 }
 
+bool PlayerContext::LoadExternalSubtitles(NuppelVideoPlayer *nvp,
+                               const QString &videoFile)
+{
+    if (videoFile.isEmpty())
+        return false;
+
+    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);
+
+    // The dir listing does not work if the filename has the following chars,
+    // so we convert them to the wildcard '?'
+    baseName = baseName.replace("[", "?").replace("]", "?");
+    baseName = baseName.replace("(", "?").replace(")", "?");
+
+    // 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);
+
+    // Try to find files with the same base name, but ending with
+    // '.srt', '.sub', or '.txt'
+    QStringList el;
+    el += baseName + "*.srt";
+    el += baseName + "*.sub";
+    el += baseName + "*.txt";
+    QStringList candidates = dir.entryList(el);
+
+    bool found = false;
+    QString candidate = "";
+    QStringList::const_iterator it = candidates.begin();
+    for (; (it != candidates.end()) && !found; ++it)
+    {
+        candidate = dirName + "/" + *it;
+        if (nvp->LoadExternalSubtitles(candidate))
+            found = true;
+    }
+
+    if (found)
+    {
+        VERBOSE(VB_PLAYBACK, LOC +
+                QString("Loaded text subtitles from '%1'.").arg(candidate));
+    }
+
+    return found;
+}
+
 /** \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/playercontext.h

@@ -47 +47 @@
     bool CreateNVP(TV *tv, QWidget *widget,
                    TVState desiredState,
                    WId embedwinid, const QRect *embedBounds);
+    bool LoadExternalSubtitles(NuppelVideoPlayer *nvp,
+                                              const QString &videoFile);
     void TeardownPlayer(void);
     bool StartDecoderThread(int maxWait = -1);
     bool StartOSD(TV *tv);