From 8e504254516eab33d61ae904bf2bbb657cb97872 Mon Sep 17 00:00:00 2001 From: negan07 Date: Thu, 9 Jun 2022 19:03:56 +0200 Subject: [PATCH] minidlna += 1.3.1-011 (fixed live_browsing option config bitflag, fixed album_art patch, other minors) --- ...f-970-option_ignore_metadata_filename.diff | 4 ++-- ...369f-980-option_disable_thumb_artwork.diff | 11 +++++++++ ...55b68422369f-981-option_live_browsing.diff | 24 ++++++++++++++----- work/dirs.mak | 2 +- 4 files changed, 32 insertions(+), 9 deletions(-) diff --git a/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-970-option_ignore_metadata_filename.diff b/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-970-option_ignore_metadata_filename.diff index bf27ca87..52ad236f 100644 --- a/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-970-option_ignore_metadata_filename.diff +++ b/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-970-option_ignore_metadata_filename.diff @@ -29,7 +29,7 @@ strict_dlna=no +# extract video filenames only from file's metadata -+#only_file_names=no ++#only_filenames=yes + # default presentation url is http address on port 80 #presentation_url=http://www.mylan/index.php @@ -40,7 +40,7 @@ which may hurt JPEG serving performance on (at least) Sony DLNA products. .fi -+.IP "\fBonly_file_names\fP" ++.IP "\fBonly_filenames\fP" +Set to 'yes' to only consider file's filename when naming it in database. +By default, if file has a name in metadata, it's used instead of filename. + diff --git a/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-980-option_disable_thumb_artwork.diff b/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-980-option_disable_thumb_artwork.diff index 1200344e..9ddcd40e 100644 --- a/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-980-option_disable_thumb_artwork.diff +++ b/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-980-option_disable_thumb_artwork.diff @@ -108,3 +108,14 @@ sql_exec(db, "INSERT into OBJECTS" " (OBJECT_ID, PARENT_ID, DETAIL_ID, CLASS, NAME) " "VALUES" +--- work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/upnpsoap.c ++++ work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/upnpsoap.c +@@ -1203,6 +1203,8 @@ + } + } + } ++ if( *mime == 'v' && GETFLAG(THUMBS_ART_MASK) ) ++ album_art = 0; + if( NON_ZERO(album_art) ) + { + /* Video and audio album art is handled differently */ diff --git a/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-981-option_live_browsing.diff b/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-981-option_live_browsing.diff index 839144b3..ffc4880d 100644 --- a/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-981-option_live_browsing.diff +++ b/diffs/work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/D7000_V1.0.1.84_work_minidlna-git-66939d5ac4986020764c0518455f55b68422369f-981-option_live_browsing.diff @@ -11,6 +11,18 @@ case ENABLE_SUBTITLES: if (!strtobool(ary_options[i].value)) CLEARFLAG(SUBTITLES_MASK); +--- work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/minidlna.conf ++++ work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/minidlna.conf +@@ -45,6 +45,9 @@ + # enable sending thumbnails + #thumbnails=yes + ++# enable live browsing ++#live_browsing=yes ++ + # set this to yes to enable support for streaming .jpg and .mp3 files to a TiVo supporting HMO + enable_tivo=no + --- work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/minidlna.conf.5 +++ work/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/minidlna-git-66939d5ac4986020764c0518455f55b68422369f/minidlna.conf.5 @@ -130,6 +130,12 @@ @@ -210,7 +222,7 @@ #define FORCE_ALPHASORT_MASK 0x0800 #define NO_EXTRACT_NAMES_MASK 0x1000 #define THUMBS_ART_MASK 0x2000 -+#define LIVE_BROWSING_MASK 0x3000 ++#define LIVE_BROWSING_MASK 0x4000 #define SETFLAG(mask) runtime_flags |= mask #define GETFLAG(mask) (runtime_flags & mask) @@ -259,7 +271,7 @@ /* Make sure we have at least 8KB left of allocated memory to finish the response. */ if( str->off > (str->size - 8192) ) -@@ -1341,6 +1355,7 @@ +@@ -1343,6 +1357,7 @@ char *sql, *ptr; struct Response args; struct string_s str; @@ -267,7 +279,7 @@ int totalMatches = 0; int ret; const char *ObjectID, *BrowseFlag; -@@ -1356,6 +1371,7 @@ +@@ -1358,6 +1373,7 @@ memset(&args, 0, sizeof(args)); memset(&str, 0, sizeof(str)); @@ -275,7 +287,7 @@ ParseNameValue(h->req_buf + h->req_contentoff, h->req_contentlen, &data, 0); -@@ -1405,11 +1421,22 @@ +@@ -1407,11 +1423,22 @@ ret = strcatf(&str, SEC_NAMESPACE); strcatf(&str, ">\n"); @@ -298,7 +310,7 @@ DPRINTF(E_DEBUG, L_HTTP, "Browsing ContentDirectory:\n" " * ObjectID: %s\n" " * Count: %d\n" -@@ -1435,7 +1462,7 @@ +@@ -1437,7 +1464,7 @@ refid_sql = magic->refid_sql; } sql = sqlite3_mprintf("SELECT %s, %s, %s, " COLUMNS @@ -307,7 +319,7 @@ " where OBJECT_ID = '%q';", objectid_sql, parentid_sql, refid_sql, id); ret = sqlite3_exec(db, sql, callback, (void *) &args, &zErrMsg); -@@ -1551,8 +1578,14 @@ +@@ -1553,8 +1580,14 @@ args.returned, totalMatches, updateID); BuildSendAndCloseSoapResp(h, str.data, str.off); browse_error: diff --git a/work/dirs.mak b/work/dirs.mak index f45b5e34..d0c22778 100644 --- a/work/dirs.mak +++ b/work/dirs.mak @@ -756,7 +756,7 @@ MINIDLNA_NAME := minidlna VER_$(MINIDLNA_NAME) := 1.3.1 MINIDLNA := $(MINIDLNA_NAME)-git-66939d5ac4986020764c0518455f55b68422369f NAME_$(MINIDLNA) := $(MINIDLNA_NAME)$(DBG) -SUBVER_$(MINIDLNA) := +SUBVER_$(MINIDLNA) := -011 VER_$(MINIDLNA) := $(VER_$(MINIDLNA_NAME))$(SUBVER_$(MINIDLNA)) DL_$(MINIDLNA) := https://sourceforge.net/code-snapshots/git/m/mi/minidlna/git.git TAR_$(MINIDLNA) := minidlna-git-66939d5ac4986020764c0518455f55b68422369f.zip