diff options
| author | Alasdair Campbell <alcoheca@gmail.com> | 2012-09-25 10:25:55 +0100 |
|---|---|---|
| committer | Alasdair Campbell <alcoheca@gmail.com> | 2012-10-11 02:26:28 +0100 |
| commit | aa93b7516cabe08eafe8b7c2ea15500c6bae128c (patch) | |
| tree | 33360ba881d66d17c7eef39fd3a9f5b5f0ab84dd /lib/libUPnP/Platinum | |
| parent | 6f3e6963f4bab18e229764f2e50074c32e3724ff (diff) | |
Platinum - allow sub classes of PltSyncMediaBrowser to specify property filter mask
[UPnP] when browsing a UPnP server, retrieve ALL metadata
Diffstat (limited to 'lib/libUPnP/Platinum')
| -rw-r--r-- | lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp | 6 | ||||
| -rw-r--r-- | lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp index 091ae00b83..ad810080dc 100644 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.cpp @@ -202,8 +202,8 @@ PLT_SyncMediaBrowser::BrowseSync(PLT_BrowseDataReference& browse_data, const char* object_id, NPT_Int32 index, NPT_Int32 count, - bool browse_metadata, const char* filter, + bool browse_metadata, const char* sort) { NPT_Result res; @@ -236,7 +236,8 @@ PLT_SyncMediaBrowser::BrowseSync(PLT_DeviceDataReference& device, PLT_MediaObjectListReference& list, bool metadata, /* = false */ NPT_Int32 start, /* = 0 */ - NPT_Cardinal max_results /* = 0 */) + NPT_Cardinal max_results, /* = 0 */ + const char* filter) { NPT_Result res = NPT_FAILURE; NPT_Int32 index = start; @@ -263,6 +264,7 @@ PLT_SyncMediaBrowser::BrowseSync(PLT_DeviceDataReference& device, (const char*)object_id, index, metadata?1:30, // DLNA recommendations for browsing children is no more than 30 at a time + filter, metadata); NPT_CHECK_LABEL_WARNING(res, done); diff --git a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h index e628af9f58..605ea311de 100644 --- a/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h +++ b/lib/libUPnP/Platinum/Source/Devices/MediaServer/PltSyncMediaBrowser.h @@ -106,7 +106,8 @@ public: PLT_MediaObjectListReference& list, bool metadata = false, NPT_Int32 start = 0, - NPT_Cardinal max_results = 0); // 0 means all + NPT_Cardinal max_results = 0, + const char* filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:album,upnp:artist,upnp:author,searchable,childCount"); // explicitely specify res otherwise WMP won't return a URL! const NPT_Lock<PLT_DeviceMap>& GetMediaServersMap() const { return m_MediaServers; } bool IsCached(const char* uuid, const char* object_id); @@ -117,8 +118,8 @@ protected: const char* object_id, NPT_Int32 index, NPT_Int32 count, + const char* filter, bool browse_metadata = false, - const char* filter = "dc:date,upnp:genre,res,res@duration,res@size,upnp:albumArtURI,upnp:album,upnp:artist,upnp:author,searchable,childCount", // explicitely specify res otherwise WMP won't return a URL! const char* sort = ""); private: NPT_Result Find(const char* ip, PLT_DeviceDataReference& device); |