diff options
| author | methodus <methodus@web.de> | 2012-11-04 18:42:38 +0100 |
|---|---|---|
| committer | methodus <methodus@web.de> | 2012-11-04 18:42:38 +0100 |
| commit | 266201f398e98fec9a65b99da43bfb01ad03e791 (patch) | |
| tree | dd94e879630bf745fbab6d4b776509ab4b7d8447 /media | |
| parent | 1892c79addd9a5588cb8216c91d07d6ad9557a29 (diff) | |
| download | vdr-plugin-upnp-266201f398e98fec9a65b99da43bfb01ad03e791.tar.gz vdr-plugin-upnp-266201f398e98fec9a65b99da43bfb01ad03e791.tar.bz2 | |
Reverted xmlSpecialChars for title, creator, description and longDescription. Seems to cause some issues.
Diffstat (limited to 'media')
| -rw-r--r-- | media/mediaManager.cpp | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/media/mediaManager.cpp b/media/mediaManager.cpp index 3768ae4..b18c1de 100644 --- a/media/mediaManager.cpp +++ b/media/mediaManager.cpp @@ -305,9 +305,7 @@ int cMediaManager::CreateResponse(MediaRequest& request, const string& select, c ixml::IxmlAddProperty(DIDLDoc, object, property::object::KEY_OBJECTID, objectID); ixml::IxmlAddProperty(DIDLDoc, object, property::object::KEY_PARENTID, row.getString(property::object::KEY_PARENTID)); ixml::IxmlAddProperty(DIDLDoc, object, property::object::KEY_RESTRICTED, row.getString(property::object::KEY_RESTRICTED)); - - string title = row.getString(property::object::KEY_TITLE).substr(0, MAX_METADATA_LENGTH_S); - ixml::IxmlAddProperty(DIDLDoc, object, property::object::KEY_TITLE, ixml::XmlEscapeSpecialChars(title)); + ixml::IxmlAddProperty(DIDLDoc, object, property::object::KEY_TITLE, row.getString(property::object::KEY_TITLE).substr(0, MAX_METADATA_LENGTH_S)); ixml::IxmlAddProperty(DIDLDoc, object, property::object::KEY_CLASS, row.getString(property::object::KEY_CLASS).substr(0, MAX_METADATA_LENGTH_S)); if(isContainer){ @@ -321,12 +319,9 @@ int cMediaManager::CreateResponse(MediaRequest& request, const string& select, c ixml::IxmlAddFilteredProperty(filterList, DIDLDoc, object, property::object::KEY_SCHEDULED_END, row.getString(property::object::KEY_SCHEDULED_END)); } - string creator = row.getString(property::object::KEY_CREATOR); - string description = row.getString(property::object::KEY_DESCRIPTION); - string longDescription = row.getString(property::object::KEY_LONG_DESCRIPTION); - ixml::IxmlAddFilteredProperty(filterList, DIDLDoc, object, property::object::KEY_CREATOR, ixml::XmlEscapeSpecialChars(creator)); - ixml::IxmlAddFilteredProperty(filterList, DIDLDoc, object, property::object::KEY_DESCRIPTION, ixml::XmlEscapeSpecialChars(description)); - ixml::IxmlAddFilteredProperty(filterList, DIDLDoc, object, property::object::KEY_LONG_DESCRIPTION, ixml::XmlEscapeSpecialChars(longDescription)); + ixml::IxmlAddFilteredProperty(filterList, DIDLDoc, object, property::object::KEY_CREATOR, row.getString(property::object::KEY_CREATOR)); + ixml::IxmlAddFilteredProperty(filterList, DIDLDoc, object, property::object::KEY_DESCRIPTION, row.getString(property::object::KEY_DESCRIPTION)); + ixml::IxmlAddFilteredProperty(filterList, DIDLDoc, object, property::object::KEY_LONG_DESCRIPTION, row.getString(property::object::KEY_LONG_DESCRIPTION)); ixml::IxmlAddFilteredProperty(filterList, DIDLDoc, object, property::object::KEY_DATE, row.getString(property::object::KEY_DATE)); ixml::IxmlAddFilteredProperty(filterList, DIDLDoc, object, property::object::KEY_LANGUAGE, row.getString(property::object::KEY_LANGUAGE)); |