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

upnpsoap: Only return sec:dcmInfo with a bookmark

Browse Source 
There's no point in returning bookmark info without a bookmark.  It also
has been reported that certain Samsung models may have issues with
subtitles if we send dcmInfo data.  So we'll only return it if we have a
bookmark set.

[minidlna:support-requests] #52 External srt subtitles for Samsung UA48JU7800
This commit is contained in:
Justin Maggard 2018-01-16 17:38:37 -08:00
parent 9bb6cf5051
commit 4c4485d225
1 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
upnpsoap.c
View File

@ -99,8 +99,9 @@
* 800-899 TBD Action-specific errors for non-standard actions. * 800-899 TBD Action-specific errors for non-standard actions.
* Defined by UPnP vendor. * Defined by UPnP vendor.
*/ */
#define SoapError(x,y,z) _SoapError(x,y,z,__func__)
static void static void
SoapError(struct upnphttp * h, int errCode, const char * errDesc) _SoapError(struct upnphttp * h, int errCode, const char * errDesc, const char *func)
{ {
static const char resp[] = static const char resp[] =
"<s:Envelope " "<s:Envelope "
@ -123,7 +124,7 @@ SoapError(struct upnphttp * h, int errCode, const char * errDesc)
char body[2048]; char body[2048];
int bodylen; int bodylen;
DPRINTF(E_WARN, L_HTTP, "Returning UPnPError %d: %s\n", errCode, errDesc); DPRINTF(E_WARN, L_HTTP, "%s Returning UPnPError %d: %s\n", func, errCode, errDesc);
bodylen = snprintf(body, sizeof(body), resp, errCode, errDesc); bodylen = snprintf(body, sizeof(body), resp, errCode, errDesc);
BuildResp2_upnphttp(h, 500, "Internal Server Error", body, bodylen); BuildResp2_upnphttp(h, 500, "Internal Server Error", body, bodylen);
SendResp_upnphttp(h); SendResp_upnphttp(h);
@ -1017,17 +1018,18 @@ callback(void *args, int argc, char **argv, char **azColName)
if( (passed_args->filter & FILTER_BOOKMARK_MASK) ) { if( (passed_args->filter & FILTER_BOOKMARK_MASK) ) {
/* Get bookmark */ /* Get bookmark */
int sec = sql_get_int_field(db, "SELECT SEC from BOOKMARKS where ID = '%s'", detailID); int sec = sql_get_int_field(db, "SELECT SEC from BOOKMARKS where ID = '%s'", detailID);
if( sec > 0 && (passed_args->filter & FILTER_UPNP_LASTPLAYBACKPOSITION) ) { if( sec > 0 ) {
/* This format is wrong according to the UPnP/AV spec. It should be in duration format, /* This format is wrong according to the UPnP/AV spec. It should be in duration format,
** so HH:MM:SS. But Kodi seems to be the only user of this tag, and it only works with a ** so HH:MM:SS. But Kodi seems to be the only user of this tag, and it only works with a
** raw seconds value. ** raw seconds value.
** If Kodi gets fixed, we can use duration_str(sec * 1000) here */ ** If Kodi gets fixed, we can use duration_str(sec * 1000) here */
ret = strcatf(str, "&lt;upnp:lastPlaybackPosition&gt;%d&lt;/upnp:lastPlaybackPosition&gt;", if( passed_args->filter & FILTER_UPNP_LASTPLAYBACKPOSITION )
sec); ret = strcatf(str, "&lt;upnp:lastPlaybackPosition&gt;%d&lt;/upnp:lastPlaybackPosition&gt;",
sec);
if( passed_args->filter & FILTER_SEC_DCM_INFO )
ret = strcatf(str, "&lt;sec:dcmInfo&gt;CREATIONDATE=0,FOLDER=%s,BM=%d&lt;/sec:dcmInfo&gt;",
title, sec);
} }
if( passed_args->filter & FILTER_SEC_DCM_INFO )
ret = strcatf(str, "&lt;sec:dcmInfo&gt;CREATIONDATE=0,FOLDER=%s,BM=%d&lt;/sec:dcmInfo&gt;",
title, sec);
if( passed_args->filter & FILTER_UPNP_PLAYBACKCOUNT ) { if( passed_args->filter & FILTER_UPNP_PLAYBACKCOUNT ) {
ret = strcatf(str, "&lt;upnp:playbackCount&gt;%d&lt;/upnp:playbackCount&gt;", ret = strcatf(str, "&lt;upnp:playbackCount&gt;%d&lt;/upnp:playbackCount&gt;",
sql_get_int_field(db, "SELECT WATCH_COUNT from BOOKMARKS where ID = '%s'", detailID)); sql_get_int_field(db, "SELECT WATCH_COUNT from BOOKMARKS where ID = '%s'", detailID));