diff options
| -rw-r--r-- | httptnt/cds_scpd.ecpp | 327 | ||||
| -rw-r--r-- | httptnt/cms_scpd.ecpp | 2 | ||||
| -rw-r--r-- | httptnt/deviceDescription.ecpp | 2 | ||||
| -rw-r--r-- | media/mediaManager.cpp | 2 | ||||
| -rw-r--r-- | 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"); }> <scpd xmlns="urn:schemas-upnp-org:service-1-0"> <specVersion> <major>1</major> <minor>0</minor> </specVersion> <actionList> -<action> - <name>Browse</name> - <argumentList> - <argument> - <name>ObjectID</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable> - </argument> - <argument> - <name>BrowseFlag</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_BrowseFlag</relatedStateVariable> - </argument> - <argument> - <name>Filter</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_Filter</relatedStateVariable> - </argument> - <argument> - <name>StartingIndex</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_Index</relatedStateVariable> - </argument> - <argument> - <name>RequestedCount</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> - </argument> - <argument> - <name>SortCriteria</name> - <direction>in</direction> - <relatedStateVariable>A_ARG_TYPE_SortCriteria</relatedStateVariable> - </argument> - <argument> - <name>Result</name> - <direction>out</direction> - <relatedStateVariable>A_ARG_TYPE_Result</relatedStateVariable> - </argument> - <argument> - <name>NumberReturned</name> - <direction>out</direction> - <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> - </argument> - <argument> - <name>TotalMatches</name> - <direction>out</direction> - <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> - </argument> - <argument> - <name>UpdateID</name> - <direction>out</direction> - <relatedStateVariable>A_ARG_TYPE_UpdateID</relatedStateVariable> - </argument> - </argumentList> - </action> <action> - <name>GetSearchCapabilities</name> + <name>Browse</name> + <argumentList> + <argument> + <name>ObjectID</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_ObjectID</relatedStateVariable> + </argument> + <argument> + <name>BrowseFlag</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_BrowseFlag</relatedStateVariable> + </argument> + <argument> + <name>Filter</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_Filter</relatedStateVariable> + </argument> + <argument> + <name>StartingIndex</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_Index</relatedStateVariable> + </argument> + <argument> + <name>RequestedCount</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> + </argument> + <argument> + <name>SortCriteria</name> + <direction>in</direction> + <relatedStateVariable>A_ARG_TYPE_SortCriteria</relatedStateVariable> + </argument> + <argument> + <name>Result</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_Result</relatedStateVariable> + </argument> + <argument> + <name>NumberReturned</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> + </argument> + <argument> + <name>TotalMatches</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_Count</relatedStateVariable> + </argument> + <argument> + <name>UpdateID</name> + <direction>out</direction> + <relatedStateVariable>A_ARG_TYPE_UpdateID</relatedStateVariable> + </argument> + </argumentList> + </action> + <action> + <name>GetSearchCapabilities</name> <argumentList> <argument> <name>SearchCaps</name> @@ -79,26 +79,28 @@ It contains the service description for the connection manager of the media serv </argumentList> </action> <action> - <name>GetSortCapabilities</name> - <argumentList> - <argument> - <name>SortCaps</name> - <direction>out</direction> - <relatedStateVariable>SortCapabilities</relatedStateVariable> - </argument> - </argumentList> - </action> - <action> - <name>GetSystemUpdateID</name> - <argumentList> - <argument> - <name>Id</name> - <direction>out</direction> - <relatedStateVariable>SystemUpdateID</relatedStateVariable> - </argument> - </argumentList> - </action> - <action> + <name>GetSortCapabilities</name> + <argumentList> + <argument> + <name>SortCaps</name> + <direction>out</direction> + <relatedStateVariable>SortCapabilities</relatedStateVariable> + </argument> + </argumentList> + </action> + <action> + <name>GetSystemUpdateID</name> + + <argumentList> + <argument> + <name>Id</name> + <direction>out</direction> + <relatedStateVariable>SystemUpdateID</relatedStateVariable> + </argument> + </argumentList> + </action> +<# + <action> <name>Search</name> <argumentList> <argument> @@ -153,117 +155,66 @@ It contains the service description for the connection manager of the media serv </argument> </argumentList> </action> - </actionList> - <serviceStateTable> - <stateVariable> - <name>TransferIDs</name> - <sendEventsAttribute>yes</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_ObjectID</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_Result</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_SearchCriteria</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_BrowseFlag</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - <allowedValueList> +#> + </actionList> + <serviceStateTable> + <stateVariable sendEvents="no"> + <name>A_ARG_TYPE_BrowseFlag</name> + <dataType>string</dataType> + <allowedValueList> <allowedValue>BrowseMetadata</allowedValue> <allowedValue>BrowseDirectChildren</allowedValue> </allowedValueList> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_Filter</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_SortCriteria</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_Index</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_Count</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_UpdateID</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_TransferID</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_TransferStatus</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - <allowedValueList> - <allowedValue>COMPLETED</allowedValue> - <allowedValue>ERROR</allowedValue> - <allowedValue>IN_PROGRESS</allowedValue> - <allowedValue>STOPPED</allowedValue> - </allowedValueList> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_TransferLength</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_TransferTotal</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_TagValueList</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>A_ARG_TYPE_URI</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>uri</dataType> - </stateVariable> - <stateVariable> - <name>SearchCapabilities</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>SortCapabilities</name> - <sendEventsAttribute>no</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - <stateVariable> - <name>SystemUpdateID</name> - <sendEventsAttribute>yes</sendEventsAttribute> - <dataType>ui4</dataType> - </stateVariable> - <stateVariable> - <name>ContainerUpdateIDs</name> - <sendEventsAttribute>yes</sendEventsAttribute> - <dataType>string</dataType> - </stateVariable> - </serviceStateTable> -</scpd> + </stateVariable> + <stateVariable sendEvents="yes"> + <name>SystemUpdateID</name> + <dataType>ui4</dataType> + </stateVariable> + <stateVariable sendEvents="yes"> + <name>ContainerUpdateIDs</name> + <dataType>string</dataType> + </stateVariable> + <stateVariable sendEvents="no"> + <name>A_ARG_TYPE_Count</name> + <dataType>ui4</dataType> + </stateVariable> + <stateVariable sendEvents="no"> + <name>A_ARG_TYPE_SortCriteria</name> + <dataType>string</dataType> + </stateVariable> + <stateVariable sendEvents="no"> + <name>SortCapabilities</name> + <dataType>string</dataType> + </stateVariable> + <stateVariable sendEvents="no"> + <name>A_ARG_TYPE_Index</name> + <dataType>ui4</dataType> + </stateVariable> + <stateVariable sendEvents="no"> + <name>A_ARG_TYPE_ObjectID</name> + <dataType>string</dataType> + </stateVariable> + <stateVariable sendEvents="no"> + <name>A_ARG_TYPE_UpdateID</name> + <dataType>ui4</dataType> + </stateVariable> + <stateVariable sendEvents="no"> + <name>A_ARG_TYPE_Result</name> + <dataType>string</dataType> + </stateVariable> + <stateVariable sendEvents="no"> + <name>SearchCapabilities</name> + <dataType>string</dataType> + </stateVariable> + <stateVariable sendEvents="no"> + <name>A_ARG_TYPE_Filter</name> + <dataType>string</dataType> + </stateVariable> +<# + <stateVariable sendEvents="no"> + <name>A_ARG_TYPE_SearchCriteria</name> + <dataType>string</dataType> + </stateVariable> +#> + </serviceStateTable> +</scpd>
\ 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"); }> <scpd xmlns="urn:schemas-upnp-org:service-1-0"> <specVersion> <major>1</major> 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"); </%cpp> <root xmlns="urn:schemas-upnp-org:device-1-0" xmlns:dlna="urn:schemas-dlna-org:device-1-0"> 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(); } |