Merge pull request #10 from pbiering/master

v0.9.6

Author: pbiering

HISTORY

@@ -1,5 +1,52 @@
 VDR Plugin 'mcli' Revision History
 ----------------------------------
+2021-06-12 0.9.6
+- pbiering several log extensions
+
+2021-04-03 0.9.6pre8
+- pbiering fix idle priority handling
+
+2021-03-30
+- pbiering add additional option '-n' to netcvupdate to use 'lftp' as FTP client
+
+2021-03-21 0.9.6pre7
+- extend with (currently hardcoded timings) interface watcher
+
+2021-03-16 0.9.6pre6
+- pbiering apply adjusted fixes from https://www.vdr-portal.de/forum/index.php?thread/134181-mcli-error-video-data-stream-broken/&postID=1337872#post1337872
+
+2021-03-16 0.9.6pre5
+- pbiering add error/debug log for PreInit related to network device
+
+2021-03-13 0.9.6pre4
+- pbiering in case of --cam-disable option is active, do not enable triggerCam
+
+2021-03-12 0.9.6pre3
+- pbiering apply vdr-plugin-mcli-0.9.6n_05-FixSetChannelDeviceCamAlloc.patch from https://www.vdr-portal.de/forum/index.php?thread/134181-mcli-error-video-data-stream-broken/&postID=1337625#post1337625
+
+2021-03-12 0.9.6pre2
+- pbiering apply vdr-plugin-mcli-0.9.6m_02-DeviceReadyWithCi.patch from https://www.vdr-portal.de/forum/index.php?thread/134181-mcli-error-video-data-stream-broken/&postID=1337593#post1337593
+- pbiering apply vdr-plugin-mcli-0.9.6m_01-TriggerCamAllPids.patch from https://www.vdr-portal.de/forum/index.php?thread/134181-mcli-error-video-data-stream-broken/&postID=1337593#post1337593
+
+2021-03-11 0.9.6pre1
+- pbiering introduce PreInit and PostExit to avoid crashes in case of other plugins have fatal issues and VDR has to stop instantly
+
+2021-02-25
+- pbiering add triggerCam patch from https://www.vdr-portal.de/forum/index.php?thread/134181-mcli-error-video-data-stream-broken/&postID=1336731#post1336731
+
+2021-02-08
+- pbiering fix spec file for rpmbuild -ta
+
+2021-02-07
+- pbiering add more header include fixes based on contribution from HelmutB
+
+2021-02-06
+- pbiering add additional special debug masks (see README), align/fix log prefix to "mcli::"
+
+2021-02-05
+- pbiering add log skip mask option (--logskipmask) (see logging.h)
+- pbiering improve debugging enhancement based on contribution from HelmutB
+
 2021-02-02
 - pbiering include not covered patches from https://www.minidvblinux.de/forum/index.php?topic=9526.0
 
@@ -14,7 +61,7 @@ VDR Plugin 'mcli' Revision History
 - pbiering honor cam-disable earlier in cMcliDevice::SetChannelDevice
 
 2021-01-24
-- pbiering add debug mask option (--debug-mask) (see mcli.h)
+- pbiering add debug mask option (--debugmask) (see mcli.h)
 - pbiering fix a bunch of debug messages and turn them to be controllable by --debug-mask
 - pbiering add cam-disable mode which avoid tuning to channel which requires CAM in case CAMs are generally not in use in the system (--cam-disable)
 

Makefile

@@ -75,14 +75,14 @@ plugin: i18n
 	$(MAKE) XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" libvdr-$(PLUGIN).so
 
 tools: lib
-	 $(MAKE) XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" -C mcast/client/ mcli
+	 $(MAKE) PLUGIN_NAME="$(PLUGIN)" XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" -C mcast/client/ mcli
 	 $(MAKE) XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" -C mcast/tool/ all
 
 lib:
-	$(MAKE) XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" libmcli.so
+	$(MAKE) PLUGIN_NAME="$(PLUGIN)" XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" libmcli.so
 
 libmcli.a libmcli.so:
-	$(MAKE) XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" -C mcast/client/ libmcli
+	$(MAKE) PLUGIN_NAME="$(PLUGIN)" XML_INC="$(XML_INC)" XML_LIB="$(XML_LIB)" -C mcast/client/ libmcli
 
 ### Implicit rules:
 

README

@@ -113,7 +113,7 @@ END
 	limit maximum number of tuners to <num>
 		avoid that LCARS skin shows 8 tuners in a 3 tuner system
 
---debugmask <mask> (NEW since 0.9.5)
+--debugmask <mask> (NEW since 0.9.5, see logging.h)
 	<mask> can be hexadecimal (0x..) or decimal
 	conditionally enable debug messages
 		PIDS          0x01
@@ -125,6 +125,13 @@ END
 		FILTER        0x80
 
 
+--logskipmask <mask> (NEW since 0.9.6, see logging.h)
+	<mask> can be hexadecimal (0x..) or decimal
+	conditionally disable log messages
+		recv_ts_func/Data PIDs	0x01    // skip log of issues with Data pids (0 or 16-18) like Mcli::recv_ts_func: Discontinuity on receiver 0x559f735c7e00 for pid 18: 5->7 at pos 0/7
+		SetChannelDevice/Reject	0x02    // skip log of Mcli::SetChannelDevice: Reject tuning on DVB (interesting if cam-disable is active)
+
+
 == RPM Build Support included ==
 
 # specify version:

cam_menu.c

@@ -62,7 +62,7 @@ class cCamInfo : public cOsdItem {
 			m_slot = slot;
 		}; // cCamInfo
 		int CamMenuOpen (char *iface) {
-			isyslog("Opening CAM Menu at NetCeiver %s Slot %d info %s\n", m_uuid, m_slot, m_info);
+			isyslog("mcli::%s: Opening CAM Menu at NetCeiver %s Slot %d info %s", __FUNCTION__, m_uuid, m_slot, m_info);
 			int mmi_session = 0;
 			if(m_slot != -1 && strlen(m_info)) {
 				mmi_session = mmi_open_menu_session (m_uuid, iface, 0, m_slot);

contrib/vdr-mcli.conf

@@ -16,6 +16,7 @@
 #        (avoid that LCARS skin shows 8 tuners in a 3 tuner system)
 #
 # --debugmask <mask>
+# --logskipmask <mask>
 #
 # in case of "Cannot get a packet socket"
 # Create/edit: /etc/systemd/system/vdr.service.d/override.conf

contrib/vdr-mcli.spec

@@ -8,7 +8,7 @@
 #global gitshortcommit #(c=#{gitcommit}; echo ${c:0:7})
 #global gitdate 20210123
 
-%define rel	2
+%define rel	4
 
 Name:           vdr-%{pname}
 Version:        0.9.5
@@ -31,11 +31,12 @@ Source0:        https://github.com/%{fork_account}/vdr-plugin-mcli/archive/%{for
 %if 0%{?gitcommit:1}
 Source0:        https://github.com/vdr-projects/vdr-plugin-mcli/archive/%{gitcommit}/%{name}-%{gitshortcommit}.tar.gz
 %else
-Source0:        https://github.com/vdr-projects/vdr-plugin-mcli/archive/v%{version}/%{name}-%{version}.tar.gz
+Source0:        https://github.com/vdr-projects/vdr-plugin-mcli/archive/v%{version}/vdr-plugin-%{pname}-%{version}.tar.gz
 %endif
 %endif
-Source1:        %{name}.conf
-Source2:	systemd-vdr.service.d-override.conf
+
+%define		file_plugin_config		%{name}.conf
+%define		file_systemd_override_config	systemd-vdr.service.d-override.conf
 
 BuildRequires:  gcc-c++
 BuildRequires:  vdr-devel >= 2.3.9
@@ -101,32 +102,11 @@ mkdir -p $RPM_BUILD_ROOT/usr/sbin/
 popd
 
 # plugin cofig file
-if [ -e %{SOURCE1} ]; then
-	# use from SOURCES / local directory
-	echo "NOTICE: take default config file from SOURCES"
-	install -Dpm 644 %{SOURCE1} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-elif [ -e contrib/$(basename "%{SOURCE1}") ]; then
-	# use from inside tgz (rpmbuild -tb build)
-	echo "NOTICE: take default config file from package"
-	install -Dpm 644 contrib/$(basename "%{SOURCE1}") $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
-else
-	echo "ERROR: can't find default config file %{SOURCE1}"
-	exit 1
-fi
+install -Dpm 644 contrib/%{file_plugin_config} $RPM_BUILD_ROOT%{_sysconfdir}/sysconfig/vdr-plugins.d/%{pname}.conf
 
 # vdr/systemd/override.conf
-if [ -e %{SOURCE2} ]; then
-	# use from SOURCES / local directory
-	echo "NOTICE: take vdr/systemd/override.conf from SOURCES"
-	install -Dpm 644 %{SOURCE2} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/vdr.service.d/override.conf
-elif [ -e contrib/$(basename "%{SOURCE2}") ]; then
-	# use from inside tgz (rpmbuild -tb build)
-	echo "NOTICE: take vdr/systemd/override.conf from package"
-	install -Dpm 644 contrib/$(basename "%{SOURCE2}") $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/vdr.service.d/override.conf
-else
-	echo "ERROR: can't find vdr/systemd/override.conf %{SOURCE2}"
-	exit 1
-fi
+install -Dpm 644 contrib/%{file_systemd_override_config} $RPM_BUILD_ROOT%{_sysconfdir}/systemd/system/vdr.service.d/vdr-mcli.conf
+
 
 %find_lang %{name} --all-name --with-man
 
@@ -151,6 +131,9 @@ systemctl daemon-reload
 
 
 %changelog
+* Mon Feb 08 2021 Peter Bieringer <[email protected]> - 0.9.5-4
+- Use only plugin/systemd config from contrib subdirectory
+
 * Sun Jan 31 2021 Peter Bieringer <[email protected]> - 0.9.5-3
 - Change name to systemd/system/vdr.service.d/vdr-mcli.conf
 - Add on %post systemctl daemon-reload