From bb24f32b8183020be92deb9a87da470047519813 Mon Sep 17 00:00:00 2001 From: methodus Date: Fri, 26 Oct 2012 22:28:36 +0200 Subject: Temporarily removed search from the CDS service as this causes WMP to fail opening the server. --- httptnt/cds_scpd.ecpp | 327 ++++++++++++++++++----------------------- httptnt/cms_scpd.ecpp | 2 +- httptnt/deviceDescription.ecpp | 2 +- media/mediaManager.cpp | 2 +- server/webserver.cpp | 2 +- 5 files changed, 143 insertions(+), 192 deletions(-) diff --git a/httptnt/cds_scpd.ecpp b/httptnt/cds_scpd.ecpp index 97b3b45..78bb4f2 100644 --- a/httptnt/cds_scpd.ecpp +++ b/httptnt/cds_scpd.ecpp @@ -6,70 +6,70 @@ This is the Connection Manager Service Description File It contains the service description for the connection manager of the media server. #> -<{ reply.setContentType("application/xml"); }> +<{ reply.setContentType("text/xml"); }> 1 0 - - Browse - - - ObjectID - in - A_ARG_TYPE_ObjectID - - - BrowseFlag - in - A_ARG_TYPE_BrowseFlag - - - Filter - in - A_ARG_TYPE_Filter - - - StartingIndex - in - A_ARG_TYPE_Index - - - RequestedCount - in - A_ARG_TYPE_Count - - - SortCriteria - in - A_ARG_TYPE_SortCriteria - - - Result - out - A_ARG_TYPE_Result - - - NumberReturned - out - A_ARG_TYPE_Count - - - TotalMatches - out - A_ARG_TYPE_Count - - - UpdateID - out - A_ARG_TYPE_UpdateID - - - - GetSearchCapabilities + Browse + + + ObjectID + in + A_ARG_TYPE_ObjectID + + + BrowseFlag + in + A_ARG_TYPE_BrowseFlag + + + Filter + in + A_ARG_TYPE_Filter + + + StartingIndex + in + A_ARG_TYPE_Index + + + RequestedCount + in + A_ARG_TYPE_Count + + + SortCriteria + in + A_ARG_TYPE_SortCriteria + + + Result + out + A_ARG_TYPE_Result + + + NumberReturned + out + A_ARG_TYPE_Count + + + TotalMatches + out + A_ARG_TYPE_Count + + + UpdateID + out + A_ARG_TYPE_UpdateID + + + + + GetSearchCapabilities SearchCaps @@ -79,26 +79,28 @@ It contains the service description for the connection manager of the media serv - GetSortCapabilities - - - SortCaps - out - SortCapabilities - - - - - GetSystemUpdateID - - - Id - out - SystemUpdateID - - - - + GetSortCapabilities + + + SortCaps + out + SortCapabilities + + + + + GetSystemUpdateID + + + + Id + out + SystemUpdateID + + + +<# + Search @@ -153,117 +155,66 @@ It contains the service description for the connection manager of the media serv - - - - TransferIDs - yes - string - - - A_ARG_TYPE_ObjectID - no - string - - - A_ARG_TYPE_Result - no - string - - - A_ARG_TYPE_SearchCriteria - no - string - - - A_ARG_TYPE_BrowseFlag - no - string - +#> + + + + A_ARG_TYPE_BrowseFlag + string + BrowseMetadata BrowseDirectChildren - - - A_ARG_TYPE_Filter - no - string - - - A_ARG_TYPE_SortCriteria - no - string - - - A_ARG_TYPE_Index - no - ui4 - - - A_ARG_TYPE_Count - no - ui4 - - - A_ARG_TYPE_UpdateID - no - ui4 - - - A_ARG_TYPE_TransferID - no - ui4 - - - A_ARG_TYPE_TransferStatus - no - string - - COMPLETED - ERROR - IN_PROGRESS - STOPPED - - - - A_ARG_TYPE_TransferLength - no - string - - - A_ARG_TYPE_TransferTotal - no - string - - - A_ARG_TYPE_TagValueList - no - string - - - A_ARG_TYPE_URI - no - uri - - - SearchCapabilities - no - string - - - SortCapabilities - no - string - - - SystemUpdateID - yes - ui4 - - - ContainerUpdateIDs - yes - string - - - + + + SystemUpdateID + ui4 + + + ContainerUpdateIDs + string + + + A_ARG_TYPE_Count + ui4 + + + A_ARG_TYPE_SortCriteria + string + + + SortCapabilities + string + + + A_ARG_TYPE_Index + ui4 + + + A_ARG_TYPE_ObjectID + string + + + A_ARG_TYPE_UpdateID + ui4 + + + A_ARG_TYPE_Result + string + + + SearchCapabilities + string + + + A_ARG_TYPE_Filter + string + +<# + + A_ARG_TYPE_SearchCriteria + string + +#> + + \ No newline at end of file diff --git a/httptnt/cms_scpd.ecpp b/httptnt/cms_scpd.ecpp index 766e0a6..bda3cfd 100644 --- a/httptnt/cms_scpd.ecpp +++ b/httptnt/cms_scpd.ecpp @@ -6,7 +6,7 @@ This is the Connection Manager Service Description File It contains the service description for the connection manager of the media server. #> -<{ reply.setContentType("application/xml"); }> +<{ reply.setContentType("text/xml"); }> 1 diff --git a/httptnt/deviceDescription.ecpp b/httptnt/deviceDescription.ecpp index 832df86..9a0833a 100644 --- a/httptnt/deviceDescription.ecpp +++ b/httptnt/deviceDescription.ecpp @@ -29,7 +29,7 @@ using namespace upnp; std::string serviceUrl = webserver.GetServiceUrl(); std::string controlUrl = webserver.GetControlUrl(); - reply.setContentType("application/xml"); + reply.setContentType("text/xml"); diff --git a/media/mediaManager.cpp b/media/mediaManager.cpp index 820c0c2..9649cdc 100644 --- a/media/mediaManager.cpp +++ b/media/mediaManager.cpp @@ -656,7 +656,7 @@ cResourceStreamer* cMediaManager::GetResourceStreamer(const string& objectID, in resourceSQL << "SELECT * FROM " << db::Resources << " WHERE " << "`" << property::object::KEY_OBJECTID << "` = " << ":objectID" - << " ORDER BY resourceID ASC LIMIT " << resourceID << ",1"; + << " ORDER BY ROWID ASC LIMIT " << resourceID << ",1"; tntdb::Statement select = connection.prepare(resourceSQL.str()); diff --git a/server/webserver.cpp b/server/webserver.cpp index b4b0183..dcbec3b 100644 --- a/server/webserver.cpp +++ b/server/webserver.cpp @@ -128,7 +128,7 @@ const std::string cWebserver::GetServiceUrl() const { const std::string cWebserver::GetControlUrl() const { stringstream s; - s << "http://" << UpnpGetServerIpAddress() << ":" << UpnpGetServerPort() << "/" << "services/"; + s << "http://" << UpnpGetServerIpAddress() << ":" << UpnpGetServerPort() << "/services/"; return s.str(); } -- cgit v1.2.3