Ticket #9632: xbox360upnp.diff

mythtv/libs/libmythupnp/upnpcds.cpp

@@ -531 +531 @@
     // ----------------------------------------------------------------------
     // -=>TODO: Need to process all expressions in searchCriteria... for now,
     //          Just focus on the "upnp:class derivedfrom" expression
+    //          and the "upnp:class =" expression
     // ----------------------------------------------------------------------
 
     for ( QStringList::Iterator it  = request.m_sSearchList.begin();
                                 it != request.m_sSearchList.end();
                               ++it )
     {
-        if ((*it).contains("upnp:class derivedfrom", Qt::CaseInsensitive))
+        if ((*it).contains("upnp:class derivedfrom", Qt::CaseInsensitive) ||
+            (*it).contains("upnp:class =", Qt::CaseInsensitive))
         {
             QStringList sParts = (*it).split(' ', QString::SkipEmptyParts);
 
@@ -545 +547 @@
             {
                 request.m_sSearchClass = sParts[2].trimmed();
                 request.m_sSearchClass.remove( '"' );
+                request.m_sSearchClass.remove( ')' );
 
                 break;
             }
@@ -822 +825 @@
 
     UPnpCDSExtensionResults *pResults = new UPnpCDSExtensionResults();
 
-    CreateItems( pRequest, pResults, 0, "", false );
+    QString sKey = "";
+    if (IsOurContainerPrefix(pRequest->m_sContainerID)) 
+    {
+        sKey = RemoveContainerPrefix(pRequest->m_sContainerID);
+    }
+    CreateItems( pRequest, pResults, 0, sKey, false );
 
     return pResults;
 }
@@ -1324 +1332 @@
     pResults->m_nTotalMatches = 0;
     pResults->m_nUpdateID     = 1;
 
-    UPnpCDSRootInfo *pInfo = GetRootInfo( nNodeIdx );
+    UPnpCDSRootInfo *pInfo = GetRootInfo( nNodeIdx, pRequest->m_sContainerID );
 
     if (pInfo == NULL)
         return;

mythtv/libs/libmythupnp/upnpcds.h

@@ -167 +167 @@
 
     protected:
 
+        virtual bool IsOurContainerPrefix(QString sContainerID) { return false; };
+        virtual QString RemoveContainerPrefix(QString sContainerID) { return sContainerID; };
         QString RemoveToken ( const QString &sToken, const QString &sStr, int num );
 
         virtual UPnpCDSExtensionResults *ProcessRoot     ( UPnpCDSRequest          *pRequest, 
@@ -202 +204 @@
 
         // ------------------------------------------------------------------
 
-        virtual UPnpCDSRootInfo *GetRootInfo   ( int nIdx) = 0;
+        virtual UPnpCDSRootInfo *GetRootInfo   ( int nIdx, QString sContainerId = "" ) = 0;
         virtual int              GetRootCount  ( )         = 0;
         virtual QString          GetTableName  ( QString sColumn      ) = 0;
         virtual QString          GetItemListSQL( QString sColumn = "" ) = 0;

mythtv/programs/mythbackend/mediaserver.cpp

@@ -16 +16 @@
 #include "upnpcdstv.h"
 #include "upnpcdsmusic.h"
 #include "upnpcdsvideo.h"
+#include "upnpcdsmusicalbum.h"
 
 #include <QScriptEngine>
 
@@ -229 +230 @@
                 "MediaServer::Registering UPnpCDSVideo Extension");
 
             RegisterExtension(new UPnpCDSVideo());
+
+            LOG(VB_UPNP, LOG_INFO,
+                "MediaServer::Registering UPnpCDSMusicAlbum Extension");
+
+            RegisterExtension(new UPnpCDSMusicAlbum());
         }
 
 #if 0

mythtv/programs/mythbackend/mythbackend.pro

@@ -23 +23 @@
 HEADERS += upnpcdstv.h upnpcdsmusic.h upnpcdsvideo.h mediaserver.h
 HEADERS += internetContent.h main_helpers.h backendcontext.h
 HEADERS += httpconfig.h mythsettings.h commandlineparser.h
+HEADERS += upnpcdsmusicalbum.h
 
 HEADERS += serviceHosts/mythServiceHost.h    serviceHosts/guideServiceHost.h
 HEADERS += serviceHosts/contentServiceHost.h serviceHosts/dvrServiceHost.h
@@ -37 +38 @@
 SOURCES += upnpcdstv.cpp upnpcdsmusic.cpp upnpcdsvideo.cpp mediaserver.cpp
 SOURCES += internetContent.cpp main_helpers.cpp backendcontext.cpp
 SOURCES += httpconfig.cpp mythsettings.cpp commandlineparser.cpp
+SOURCES += upnpcdsmusicalbum.cpp
 
 SOURCES += services/myth.cpp services/guide.cpp services/content.cpp 
 SOURCES += services/dvr.cpp services/channel.cpp services/video.cpp

mythtv/programs/mythbackend/upnpcdsmusic.cpp

@@ -109 +109 @@
 
 int UPnpCDSMusic::g_nRootCount = sizeof( g_RootNodes ) / sizeof( UPnpCDSRootInfo );
 
+UPnpCDSRootInfo UPnpCDSMusic::g_Containers[] = 
+{
+     {
+        "musicalbum",
+        "song.album_id",
+        "SELECT song_id as id, "
+        "name, "
+        "1 as children "
+        "FROM music_songs song "
+        "%1 "
+        "ORDER BY name",
+        "WHERE album_id = :KEY"
+     }
+};
+
+int UPnpCDSMusic::g_nContainersCount = sizeof( g_Containers ) / sizeof( UPnpCDSRootInfo );
+
 /////////////////////////////////////////////////////////////////////////////
 //
 /////////////////////////////////////////////////////////////////////////////
 
-UPnpCDSRootInfo *UPnpCDSMusic::GetRootInfo( int nIdx )
+UPnpCDSRootInfo *UPnpCDSMusic::GetRootInfo( int nIdx, QString sContainerId )
 {
+    for(int i=0; i<g_nContainersCount; i++) 
+    {
+        if (sContainerId.startsWith(g_Containers[ i ].title))
+        {
+            return &(g_Containers[ i ]); 
+        }
+    }
+        
     if ((nIdx >=0 ) && ( nIdx < g_nRootCount ))
         return &(g_RootNodes[ nIdx ]);
 
@@ -175 +200 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
+bool UPnpCDSMusic::IsOurContainerPrefix(QString sContainerId)
+{
+    for(int i=0; i<g_nContainersCount; i++) 
+    {
+        if (sContainerId.startsWith(g_Containers[ i ].title)) 
+        {
+            return true; 
+        }
+    }
+    return false;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
+QString UPnpCDSMusic::RemoveContainerPrefix(QString sContainerId)
+{
+    for(int i=0; i<g_nContainersCount; i++) 
+    {
+        if (sContainerId.startsWith(g_Containers[ i ].title)) 
+        {
+            return sContainerId.right(sContainerId.length() - strlen(g_Containers[ i ].title));
+        }
+    }
+    return sContainerId;
+}
+
+/////////////////////////////////////////////////////////////////////////////
+//
+/////////////////////////////////////////////////////////////////////////////
+
 bool UPnpCDSMusic::IsBrowseRequestForUs( UPnpCDSRequest *pRequest )
 {
     // ----------------------------------------------------------------------
@@ -182 +239 @@
     // ----------------------------------------------------------------------
 
     // Xbox360 compatibility code.
-
+    /*
     if (pRequest->m_eClient == CDS_ClientXBox && 
         pRequest->m_sContainerID == "7")
     {
@@ -193 +250 @@
 
         return true;
     }
-
+    */
     if ((pRequest->m_sObjectId.isEmpty()) && 
         (!pRequest->m_sContainerID.isEmpty()))
         pRequest->m_sObjectId = pRequest->m_sContainerID;
@@ -215 +272 @@
     // ----------------------------------------------------------------------
 
     // XBox 360 compatibility code
-
+    /*
     if (pRequest->m_eClient == CDS_ClientXBox && 
         pRequest->m_sContainerID == "7")
     {
@@ -227 +284 @@
 
         return true;
     }
-
+    */
     if (pRequest->m_sContainerID == "4")
     {
         pRequest->m_sObjectId       = "Music";
@@ -308 +365 @@
                             .arg( sServerIp )
                             .arg( sPort     );
 
-    QString sURIParams = QString( "?Id=%1" )
+    QString sURIParams = QString( "\%3FId\%3D%1" )
                             .arg( nId );
 
 
@@ -366 +423 @@
                                                 .arg( sURIParams );
 
     Resource *pRes = pItem->AddResource( sProtocol, sURI );
-
-    nLength /= 1000;
-
     QString sDur;
 
-    sDur.sprintf("%02d:%02d:%02d",
-                  (nLength / 3600) % 24,
-                  (nLength / 60) % 60,
-                  nLength % 60);
+    sDur.sprintf("%02d:%02d:%02d.%03d",
+                  (nLength / 3600000) % 24,
+                  (nLength / 60000) % 60,
+                  (nLength / 1000) % 60,
+                  nLength % 1000
+                );
 
     pRes->AddAttribute( "duration"  , sDur      );
 }

mythtv/programs/mythbackend/upnpcdsmusic.h

@@ -24 +24 @@
     private:
 
         static UPnpCDSRootInfo g_RootNodes[];
+        static UPnpCDSRootInfo g_Containers[];
         static int             g_nRootCount;
+        static int             g_nContainersCount;
 
     protected:
 
+        virtual bool             IsOurContainerPrefix ( QString sContainerId );
+        virtual QString          RemoveContainerPrefix ( QString sContainerId );
         virtual bool             IsBrowseRequestForUs( UPnpCDSRequest *pRequest );
         virtual bool             IsSearchRequestForUs( UPnpCDSRequest *pRequest );
 
-        virtual UPnpCDSRootInfo *GetRootInfo   (int nIdx);
+        virtual UPnpCDSRootInfo *GetRootInfo   ( int nIdx, QString sContainerId = "" );
         virtual int              GetRootCount  ( );
         virtual QString          GetTableName  ( QString sColumn );
         virtual QString          GetItemListSQL( QString sColumn = "" );

mythtv/programs/mythbackend/upnpcdstv.cpp

@@ -111 +111 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-UPnpCDSRootInfo *UPnpCDSTv::GetRootInfo( int nIdx )
+UPnpCDSRootInfo *UPnpCDSTv::GetRootInfo( int nIdx, QString sContainerId )
 {
     if ((nIdx >=0 ) && ( nIdx < g_nRootCount ))
         return &(g_RootNodes[ nIdx ]);

mythtv/programs/mythbackend/upnpcdstv.h

@@ -32 +32 @@
         virtual bool             IsBrowseRequestForUs( UPnpCDSRequest *pRequest );
         virtual bool             IsSearchRequestForUs( UPnpCDSRequest *pRequest );
 
-        virtual UPnpCDSRootInfo *GetRootInfo   (int nIdx);
+        virtual UPnpCDSRootInfo *GetRootInfo   ( int nIdx, QString sContainerId = "" );
         virtual int              GetRootCount  ( );
         virtual QString          GetTableName  ( QString sColumn );
         virtual QString          GetItemListSQL( QString sColumn = "" );

mythtv/programs/mythbackend/upnpcdsvideo.cpp

@@ -44 +44 @@
 //
 /////////////////////////////////////////////////////////////////////////////
 
-UPnpCDSRootInfo *UPnpCDSVideo::GetRootInfo( int nIdx )
+UPnpCDSRootInfo *UPnpCDSVideo::GetRootInfo( int nIdx, QString sContainerId )
 {
     if ((nIdx >=0 ) && ( nIdx < g_nRootCount ))
         return &(g_RootNodes[ nIdx ]); 

mythtv/programs/mythbackend/upnpcdsvideo.h

@@ -37 +37 @@
 
         virtual int              GetDistinctCount( UPnpCDSRootInfo *pInfo );
 
-        virtual UPnpCDSRootInfo *GetRootInfo   (int nIdx);
+        virtual UPnpCDSRootInfo *GetRootInfo   ( int nIdx, QString sContainerId = "" );
         virtual int              GetRootCount  ( );
         virtual QString          GetTableName  ( QString sColumn );
         virtual QString          GetItemListSQL( QString sColumn = "");