diff options
| -rw-r--r-- | common/parser.cpp | 16 | ||||
| -rw-r--r-- | httptnt/resourceStreamer.ecpp | 1 | ||||
| -rw-r--r-- | tests/test_parser.cpp | 4 |
3 files changed, 13 insertions, 8 deletions
diff --git a/common/parser.cpp b/common/parser.cpp index 8c2533a..6c0831b 100644 --- a/common/parser.cpp +++ b/common/parser.cpp @@ -37,14 +37,14 @@ struct cProperties : sp::symbols<const char*> { //struct cProperties : symbols<> { cProperties(){ add - (property::object::KEY_TITLE, "title") - (property::object::KEY_CREATOR, "creator") - (property::object::KEY_DESCRIPTION, "description") - (property::object::KEY_LONG_DESCRIPTION, "longDescription") - (property::object::KEY_CLASS, "class") - (property::object::KEY_DATE, "date") - (property::object::KEY_LANGUAGE, "language") - (property::resource::KEY_PROTOCOL_INFO, "protocolInfo") + (property::object::KEY_TITLE, property::object::KEY_TITLE) + (property::object::KEY_CREATOR, property::object::KEY_CREATOR) + (property::object::KEY_DESCRIPTION, property::object::KEY_DESCRIPTION) + (property::object::KEY_LONG_DESCRIPTION, property::object::KEY_LONG_DESCRIPTION) + (property::object::KEY_CLASS, property::object::KEY_CLASS) + (property::object::KEY_DATE, property::object::KEY_DATE) + (property::object::KEY_LANGUAGE, property::object::KEY_LANGUAGE) + (property::resource::KEY_PROTOCOL_INFO, property::resource::KEY_PROTOCOL_INFO) ; } } Properties; diff --git a/httptnt/resourceStreamer.ecpp b/httptnt/resourceStreamer.ecpp index dc4614b..8b6c9f3 100644 --- a/httptnt/resourceStreamer.ecpp +++ b/httptnt/resourceStreamer.ecpp @@ -85,6 +85,7 @@ using namespace upnp; codeText = "Partial Content"; } + // DLNA requires KeepAlive timeout of 60s. reply.setKeepAliveTimeout(60000); reply.setDirectMode(code, codeText.c_str()); diff --git a/tests/test_parser.cpp b/tests/test_parser.cpp index 363a088..2b28c26 100644 --- a/tests/test_parser.cpp +++ b/tests/test_parser.cpp @@ -64,6 +64,8 @@ int main(){ checkFilter("@id,@parentID,@restricted,dc:title,upnp:class,res,dc:date,@childCount,sec:CaptionInfo,sec:CaptionInfoEx,sec:dcmInfo,sec:MetaFileInfo,res@resolution,res@size,upnp:genre,dc:date,upnp:album,res@duration,upnp:albumArtURI,res@bitrate,dc:creator"); + checkFilter("dc:title,av:mediaClass,dc:date,@childCount,res,upnp:rating,upnp:rating@type,upnp:class,res@resolution,res@av:mpfEntries,upnp:album,upnp:genre,upnp:albumArtURI,upnp:albumArtURI@dlna:profileID,dc:creator,res@size,res@duration,res@bitrate,res@protocolInfo"); + checkSort(""); checkSort("+dc:title,-dc:creator"); @@ -74,5 +76,7 @@ int main(){ checkSort("+@id"); + checkSort("-dc:date"); + return 0; } |