Ticket #12767: myth_29_patches.patch

mythtv/libs/libmythupnp/upnpcds.cpp

@@ -1069 +1069 @@
 
     // For metadata requests the request ID will be the ID of the result, so
     // we don't need to do anything
-    if (currentName == name.toLower() && !currentValue.isEmpty() &&
-        currentValue == value.toLower())
+    if (currentName.toLower() == name.toLower() && !currentValue.isEmpty() &&
+        currentValue.toLower() == value.toLower())
         return requestId;
     else if (currentName == name.toLower() && currentValue.isEmpty())
         return QString("%1=%2").arg(requestId).arg(value);

mythtv/libs/libmythupnp/upnpcdsobjects.cpp

@@ -305 +305 @@
      *      See UPnP MediaServer, ContentDirectory Service Section 2.3.18, 2013
      */
     bool    bFilter = true;
+    QString sTitle = m_sTitle;
 
     if (filter.contains("*"))
         bFilter = false;
@@ -346 +347 @@
                << "\" >" << endl;
 
             sEndTag = "</item>";
-
+            
+            // if this is a video item, we have filters, and no ProgramTitle filter is specified - ass the program title to sTitle
+            if( bFilter && m_sClass == "object.item.videoItem" && !filter.contains("programTitle"))
+               sTitle = m_sTitle + ":" + HTTPRequest::Encode(GetPropValue("programTitle"));
             break;
         }
         default: break;
     }
 
-    os << "<dc:title>"   << m_sTitle << "</dc:title>" << endl;
+    os << "<dc:title>"   <<  sTitle << "</dc:title>" << endl;
     os << "<upnp:class>" << m_sClass << "</upnp:class>" << endl;
 
     // ----------------------------------------------------------------------

mythtv/libs/libmythupnp/upnpdevice.cpp

@@ -543 +543 @@
     NameValues::iterator it;
     for (it = node.pAttributes->begin(); it != node.pAttributes->end(); ++it)
     {
-        sAttributes += QString(" %1='%2'").arg((*it).sName).arg((*it).sValue);
+        sAttributes += QString(" %1=\"%2\"").arg((*it).sName).arg((*it).sValue);
     }
     sStr = QString("<%1%2>%3</%1>\n").arg(node.sName).arg(sAttributes).arg(node.sValue);
 

mythtv/libs/libmythupnp/upnphelpers.cpp

@@ -120 +120 @@
     // information in the database for each file and can determine this
     // stuff 'properly'
     QString sCountryCode = gCoreContext->GetLocale()->GetCountryCode();
-    bool isNorthAmerica = (sCountryCode == "us" || sCountryCode == "ca" ||
+    bool isNorthAmerica = (sCountryCode.toLower() == "us" || sCountryCode == "ca" ||
                             sCountryCode == "mx"); // North America (NTSC/ATSC)
 
     if (container == "MPEG2-PS")
@@ -199 +199 @@
     }
     else if (mimeType == "audio/mpeg")
     {
-        sProfileName = "MP3X";
+        sProfileName = "MP3";
     }
     else if (mimeType == "audio/x-ms-wma")
     {
@@ -261 +261 @@
     //
     QString sProfileName = DLNAProfileName(mimeType, resolution, videoFrameRate,
                                            container, videoCodec, audioCodec);
-    if (!sProfileName.isEmpty())
-        sAdditionalInfoList << QString("DLNA.ORG_PN=%1").arg(sProfileName);
-
+    //Do not output DLNA Profile name - possible to add a DB parameter to enable/disable?
+    //if (!sProfileName.isEmpty())
+    //    sAdditionalInfoList << QString("DLNA.ORG_PN=%1").arg(sProfileName);
     //
     // OP-Param (Operation Parameters)
     //

mythtv/programs/mythbackend/upnpcdstv.cpp

@@ -563 +563 @@
         int nRecordingID = query.value(2).toInt();
         int nTitleCount = query.value(3).toInt();
 
-         if (nTitleCount > 1)
+         if (nTitleCount >= 1)
          {
             // TODO Album or plain old container?
             CDSObject* pContainer = CDSObject::CreateAlbum( CreateIDString(sRequestId, "Title", sTitle),
@@ -624 +624 @@
     MSqlQuery query(MSqlQuery::InitCon(MSqlQuery::kDedicatedConnection));
 
     QString sql = "SELECT SQL_CALC_FOUND_ROWS "
-                  "r.starttime, COUNT(r.recordedid) "
+                  "CONVERT_TZ(r.starttime, 'UTC', 'SYSTEM'), COUNT(r.recordedid) "
                   "FROM recorded r "
                   "LEFT JOIN recgroups g ON g.recgroup=r.recgroup "
                   "%1 " // WHERE clauses