storm/minidlna
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

* Add bookmark support for Samsung TVs.

Browse Source
This commit is contained in:
Justin Maggard
2011-08-05 20:36:54 +00:00
parent cdc93f680f
commit d5b77cbd46
7 changed files with 96 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
upnpsoap.c
View File

@ -344,6 +344,9 @@ mime_to_ext(const char * mime, char * buf)
#define FILTER_UPNP_GENRE 0x00040000
#define FILTER_UPNP_ORIGINALTRACKNUMBER 0x00080000
#define FILTER_UPNP_SEARCHCLASS 0x00100000
#define FILTER_SEC 0x00200000
#define FILTER_SEC_CAPTION_INFO 0x00400000
#define FILTER_SEC_CAPTION_INFO_EX 0x00800000
static u_int32_t
set_filter_flags(char * filter, struct upnphttp *h)
@ -467,6 +470,16 @@ set_filter_flags(char * filter, struct upnphttp *h)
flags |= FILTER_RES;
flags |= FILTER_RES_SIZE;
}
else if( strcmp(item, "sec:CaptionInfo") == 0)
{
flags |= FILTER_SEC;
flags |= FILTER_SEC_CAPTION_INFO;
}
else if( strcmp(item, "sec:CaptionInfoEx") == 0)
{
flags |= FILTER_SEC;
flags |= FILTER_SEC_CAPTION_INFO_EX;
}
item = strtok_r(NULL, ",", &saveptr);
}
@ -742,6 +755,11 @@ callback(void *args, int argc, char **argv, char **azColName)
if( date && (passed_args->filter & FILTER_DC_DATE) ) {
ret = strcatf(str, "<dc:date>%s</dc:date>", date);
}
if( passed_args->filter & FILTER_SEC_CAPTION_INFO_EX) {
/* Get bookmark */
ret = strcatf(str, "<sec:dcmInfo>CREATIONDATE=0,FOLDER=%s,BM=%d</sec:dcmInfo>",
title, sql_get_int_field(db, "SELECT SEC from BOOKMARKS where ID = '%s'", detailID));
}
if( artist ) {
if( (*mime == 'v') && (passed_args->filter & FILTER_UPNP_ACTOR) ) {
ret = strcatf(str, "<upnp:actor>%s</upnp:actor>", artist);
@ -1440,7 +1458,37 @@ SamsungGetFeatureList(struct upnphttp * h, const char * action)
"</Feature>"
"</FeatureList></u:X_GetFeatureListResponse>";
BuildSendAndCloseSoapResp(h, resp, sizeof(resp));
BuildSendAndCloseSoapResp(h, resp, sizeof(resp)-1);
}
static void
SamsungSetBookmark(struct upnphttp * h, const char * action)
{
static const char resp[] =
"<u:X_SetBookmarkResponse"
" xmlns:u=\"urn:schemas-upnp-org:service:ContentDirectory:1\">"
"</u:X_SetBookmarkResponse>";
struct NameValueParserData data;
char *ObjectID, *PosSecond;
int ret;
ParseNameValue(h->req_buf + h->req_contentoff, h->req_contentlen, &data);
ObjectID = GetValueFromNameValueList(&data, "ObjectID");
PosSecond = GetValueFromNameValueList(&data, "PosSecond");
if( ObjectID && PosSecond )
{
ret = sql_exec(db, "INSERT OR REPLACE into BOOKMARKS"
" VALUES "
"((select DETAIL_ID from OBJECTS where OBJECT_ID = '%s'), %s)", ObjectID, PosSecond);
if( ret != SQLITE_OK )
DPRINTF(E_WARN, L_METADATA, "Error setting bookmark %s on ObjectID='%s'\n", PosSecond, ObjectID);
BuildSendAndCloseSoapResp(h, resp, sizeof(resp)-1);
}
else
SoapError(h, 402, "Invalid Args");
ClearNameValueList(&data);
}
static const struct
@ -1462,6 +1510,7 @@ soapMethods[] =
{ "IsAuthorized", IsAuthorizedValidated},
{ "IsValidated", IsAuthorizedValidated},
{ "X_GetFeatureList", SamsungGetFeatureList},
{ "X_SetBookmark", SamsungSetBookmark},
{ 0, 0 }
};