Ticket #3639: trunkmp3fs.diff

programs/mythbackend/mythxml.cpp

@@ -1314 +1314 @@
         // ------------------------------------------------------------------
 
         MSqlQuery query(MSqlQuery::InitCon());
-
+        QString filename = QString("");
         if (query.isConnected())
         {
             query.prepare("SELECT CONCAT_WS('/', music_directories.path, "
@@ -1329 +1329 @@
             if (query.isActive() && query.size() > 0)
             {
                 query.first();  
-                pRequest->m_sFileName = QString( "%1/%2" )
-                                           .arg( sBasePath )
-                                           .arg( query.value(0).toString() );
-            }
+                filename = query.value(0).toString() ;
+            }        }
+
+        // ------------------------------------------------------------------
+        // Check for diff format required if not
+        // ------------------------------------------------------------------
+        QString peerIP = pRequest->GetPeerAddress();
+        QString altHosts = gContext->GetSetting("UpnpAltMusicHosts", "");
+        bool isAltHost = altHosts.contains(peerIP) > 0;
+        QString regExtension = gContext->GetSetting("UpnpNormalMusicExtension",
+             "none");
+        VERBOSE(VB_UPNP,QString("HttpStatus::GetMusic : peerIP %1, altHosts" 
+         " %2, regExtension %3").arg(peerIP).arg(altHosts).arg(regExtension));
+        if(isAltHost && filename.endsWith(QString(".%1").arg(regExtension))) {
+            sBasePath = gContext->GetSetting("UpnpAltMusicLocation", sBasePath);
+            int index = filename.length() -5;
+            QString it = filename.replace(index, 4, QString(".mp3"));
+            it = it.left(filename.length() -1);
+            VERBOSE(VB_UPNP,QString("HttpStatus::GetMusic : m_sFileName ends"
+                " in .flac, replace with %1").arg(it));
+            filename = it;
+
         }
 
+        pRequest->m_sFileName = QString ("%1/%2")
+                                .arg( sBasePath)
+                                .arg( filename) ;
+        VERBOSE(VB_UPNP,QString("HttpStatus::GetMusic : m_sFileName: %1")
+            .arg(pRequest->m_sFileName));
+
         // ------------------------------------------------------------------
         // Store information in WorkerThread Storage for next request (cache)
         // ------------------------------------------------------------------