Source: mediatomb
Followup-For: Bug #805599
It turns out this is a lack of a default in
mark-played-items/mark/content, despite this being documented as
optional
A quick workaround is to add
<mark-played-items enabled="yes" suppress-cds-updates="yes">
<string mode="prepend">*</string>
<mark>
<content>video</content>
</mark>
</mark-played-items>
to the config file. I believe the following patch should add the
default values if none are set.
-- System Information:
Debian Release: stretch/sid
APT prefers testing
APT policy: (650, 'testing'), (600, 'unstable'), (1, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386
Kernel: Linux 4.2.0-1-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_AU.UTF-8, LC_CTYPE=en_AU.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash
Init: systemd (via /run/systemd/system)
>From 086f951bdb2c156a1bff3e320009d147901a8a27 Mon Sep 17 00:00:00 2001
From: Ian Wienand <i...@wienand.org>
Date: Fri, 20 Nov 2015 13:04:58 +1100
Subject: [PATCH 1/1] Add defaults for mark-played-items / content parameter
<mark-played-items><mark> is documented as an optional config option,
but if it is not set, no default is set for
CFG_SERVER_EXTOPTS_MARK_PLAYED_ITEMS_CONTENT_LIST and we will end up
segfaulting when we try to mark it played in src/play_hook.cc
This adds the defaults when the option is not set
---
src/config_manager.cc | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/src/config_manager.cc b/src/config_manager.cc
index 2d069c7..b3d1dd5 100644
--- a/src/config_manager.cc
+++ b/src/config_manager.cc
@@ -1949,6 +1949,13 @@ void ConfigManager::validate(String serverhome)
NEW_STRARR_OPTION(mark_content_list);
SET_STRARR_OPTION(CFG_SERVER_EXTOPTS_MARK_PLAYED_ITEMS_CONTENT_LIST);
}
+ } else {
+ // add default content types if <mark-played-items><mark><content>... not specified
+ mark_content_list->append(_(DEFAULT_MARK_PLAYED_CONTENT_VIDEO));
+ mark_content_list->append(_(DEFAULT_MARK_PLAYED_CONTENT_AUDIO));
+ mark_content_list->append(_(DEFAULT_MARK_PLAYED_CONTENT_IMAGE));
+ NEW_STRARR_OPTION(mark_content_list);
+ SET_STRARR_OPTION(CFG_SERVER_EXTOPTS_MARK_PLAYED_ITEMS_CONTENT_LIST);
}
}
--
2.6.2
