diff options
| author | Ludovic Ferrandis <ludovic.ferrandis@intel.com> | 2013-03-27 15:11:29 +0100 |
|---|---|---|
| committer | Mark Ryan <mark.d.ryan@intel.com> | 2013-05-16 11:58:59 +0200 |
| commit | 298825a42dae60fc5e2514c9318db648ec8c550f (patch) | |
| tree | 8c6e5666881249c2e5e64c21a9ddcc0564c9a440 | |
| parent | 1f8ffe357f4a3f50fa824a6933372d197a2f8b61 (diff) | |
| download | dleyna-server-298825a42dae60fc5e2514c9318db648ec8c550f.tar.gz | |
[Property] Add support for object.container.storageFolder
- Add object class object.container.storageFolder
- Add MediaServer2Spec definition "storage" for it
Signed-off-by: Ludovic Ferrandis <ludovic.ferrandis@intel.com>
| -rw-r--r-- | doc/server/dbus/API.txt | 2 | ||||
| -rw-r--r-- | libdleyna/server/props.c | 9 |
2 files changed, 10 insertions, 1 deletions
diff --git a/doc/server/dbus/API.txt b/doc/server/dbus/API.txt index f8db1eb..9635fb1 100644 --- a/doc/server/dbus/API.txt +++ b/doc/server/dbus/API.txt @@ -450,7 +450,7 @@ and in case of Containers: 'album', 'album.music', 'album.photo' 'person', 'person.musicartist' 'genre', 'genre.music', 'genre.movie' - 'playlist' + 'playlist', 'storage' Additional Properties: ---------------------- diff --git a/libdleyna/server/props.c b/libdleyna/server/props.c index 15a404d..7e1eb65 100644 --- a/libdleyna/server/props.c +++ b/libdleyna/server/props.c @@ -37,6 +37,7 @@ static const gchar gUPnPAlbum[] = "object.container.album"; static const gchar gUPnPPerson[] = "object.container.person"; static const gchar gUPnPGenre[] = "object.container.genre"; static const gchar gUPnPPlaylist[] = "object.container.playlistContainer"; +static const gchar gUPnPStorage[] = "object.container.storageFolder"; static const gchar gUPnPAudioItem[] = "object.item.audioItem"; static const gchar gUPnPVideoItem[] = "object.item.videoItem"; static const gchar gUPnPImageItem[] = "object.item.imageItem"; @@ -53,6 +54,8 @@ static const unsigned int gUPnPGenreLen = (sizeof(gUPnPGenre) / sizeof(gchar)) - 1; static const unsigned int gUPnPPlaylistLen = (sizeof(gUPnPPlaylist) / sizeof(gchar)) - 1; +static const unsigned int gUPnPStorageLen = + (sizeof(gUPnPStorage) / sizeof(gchar)) - 1; static const unsigned int gUPnPAudioItemLen = (sizeof(gUPnPAudioItem) / sizeof(gchar)) - 1; static const unsigned int gUPnPVideoItemLen = @@ -102,6 +105,7 @@ static const gchar gMediaSpec2ImagePhoto[] = "image.photo"; static const gchar gMediaSpec2Playlist[] = "playlist"; static const gchar gMediaSpec2PlaylistItem[] = "item.playlist"; static const gchar gMediaSpec2Item[] = "item"; +static const gchar gMediaSpec2Storage[] = "storage"; typedef struct dls_prop_dlna_t_ dls_prop_dlna_t; struct dls_prop_dlna_t_ { @@ -1205,6 +1209,8 @@ const gchar *dls_props_media_spec_to_upnp_class(const gchar *m2spec_class) retval = gUPnPPlaylistItem; else if (!strcmp(m2spec_class, gMediaSpec2Item)) retval = gUPnPItem; + else if (!strcmp(m2spec_class, gMediaSpec2Storage)) + retval = gUPnPStorage; on_error: @@ -1281,6 +1287,9 @@ const gchar *dls_props_upnp_class_to_media_spec(const gchar *upnp_class) ptr = upnp_class + gUPnPItemLen; if (!*ptr || *ptr == '.') retval = gMediaSpec2Item; + } else if (!strncmp(upnp_class, gUPnPStorage, + gUPnPStorageLen)) { + retval = gMediaSpec2Storage; } on_error: |