jeans/LibreELEC.tv
jeans/LibreELEC.tv
1
0
Fork 0
mirror of https://github.com/LibreELEC/LibreELEC.tv.git synced 2025-07-24 11:16:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:OpenELEC/OpenELEC.tv

Browse Source
This commit is contained in:
Stephan Raue 2013-03-21 18:33:01 +01:00
commit 27bf55215b
3 changed files with 144 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
packages/addons/service/multimedia/tvheadend/patches/tvheadend-0001-cwc-syslog-move-some-log-messages-to-debug.patch Normal file
View File

@ -0,0 +1,48 @@
From 30517cb122d0991f0ba51155c9afff6bdc2d8899 Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Wed, 13 Mar 2013 21:30:55 +0200
Subject: [PATCH] cwc: syslog: move some log messages to debug
---
src/capmt.c | 4 ++--
src/cwc.c | 2 +-
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/capmt.c b/src/capmt.c
index ac507bd..9e12e86 100644
--- a/src/capmt.c
+++ b/src/capmt.c
@@ -547,7 +547,7 @@ handle_ca0(capmt_t* capmt) {
#endif
if(ct->ct_keystate != CT_RESOLVED)
- tvhlog(LOG_INFO, "capmt", "Obtained key for service \"%s\"",t->s_svcname);
+ tvhlog(LOG_DEBUG, "capmt", "Obtained key for service \"%s\"",t->s_svcname);
ct->ct_keystate = CT_RESOLVED;
}
@@ -851,7 +851,7 @@ capmt_table_input(struct th_descrambler *td, struct service *t,
cce->cce_ecmsize = len;
if(ct->ct_keystate != CT_RESOLVED)
- tvhlog(LOG_INFO, "capmt",
+ tvhlog(LOG_DEBUG, "capmt",
"Trying to obtain key for service \"%s\"",t->s_svcname);
buf[9] = pmtversion;
diff --git a/src/cwc.c b/src/cwc.c
index ebafd4f..904213f 100644
--- a/src/cwc.c
+++ b/src/cwc.c
@@ -873,7 +873,7 @@ forbid:
}
if(ct->cs_keystate != CS_RESOLVED)
- tvhlog(LOG_INFO, "cwc",
+ tvhlog(LOG_DEBUG, "cwc",
"Obtained key for service \"%s\" in %"PRId64" ms, from %s:%i",
t->s_svcname, delay, ct->cs_cwc->cwc_hostname,
ct->cs_cwc->cwc_port);
--
1.7.10.4

94
packages/addons/service/multimedia/tvheadend/patches/tvheadend-0002-dvb-stop-constant-updating-of-dvb-muxc-onfig.patch Normal file
View File

@ -0,0 +1,94 @@
From 07cdfdaf6af06ae08a779ccc9082a517757c6fd3 Mon Sep 17 00:00:00 2001
From: Adam Sutton <dev@adamsutton.me.uk>
Date: Tue, 12 Mar 2013 15:35:21 +0000
Subject: [PATCH] Fix #1660 - dvb: stop constant updating of dvb mux
configuration files
---
src/dvb/dvb_multiplex.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/src/dvb/dvb_multiplex.c b/src/dvb/dvb_multiplex.c
index ff61558..692ebf1 100644
--- a/src/dvb/dvb_multiplex.c
+++ b/src/dvb/dvb_multiplex.c
@@ -58,9 +58,6 @@
{ "OK", TDMI_FE_OK },
};
-static void tdmi_set_enable(th_dvb_mux_instance_t *tdmi, int enabled);
-
-
/**
*
*/
@@ -856,6 +853,9 @@ int dvb_mux_str2hier(const char *str)
if (!networkname || !*networkname)
return;
+ if (!strcmp(tdmi->tdmi_network ?: "", networkname))
+ return;
+
free(tdmi->tdmi_network);
tdmi->tdmi_network = strdup(networkname);
dvb_mux_save(tdmi);
@@ -879,8 +879,9 @@ int dvb_mux_str2hier(const char *str)
if (tdmi->tdmi_transport_stream_id != 0xFFFF || tsid == 0xFFFF)
return;
- tdmi->tdmi_transport_stream_id = tsid;
-
+ if (tdmi->tdmi_transport_stream_id == tsid)
+ return;
+
dvb_mux_save(tdmi);
m = htsmsg_create_map();
@@ -900,6 +901,9 @@ int dvb_mux_str2hier(const char *str)
if (force)
if (tdmi->tdmi_network_id != 0 || onid == 0)
return;
+
+ if (tdmi->tdmi_network_id == onid)
+ return;
tdmi->tdmi_network_id = onid;
@@ -915,13 +919,13 @@ int dvb_mux_str2hier(const char *str)
/**
*
*/
-static void
+static int
tdmi_set_enable(th_dvb_mux_instance_t *tdmi, int enabled)
{
th_dvb_adapter_t *tda = tdmi->tdmi_adapter;
if(tdmi->tdmi_enabled == enabled)
- return;
+ return 0;
if(tdmi->tdmi_enabled) {
@@ -940,6 +944,7 @@ int dvb_mux_str2hier(const char *str)
mux_link_initial(tda, tdmi);
subscription_reschedule();
+ return 1;
}
/**
@@ -948,8 +953,8 @@ int dvb_mux_str2hier(const char *str)
void
dvb_mux_set_enable(th_dvb_mux_instance_t *tdmi, int enabled)
{
- tdmi_set_enable(tdmi, enabled);
- dvb_mux_save(tdmi);
+ if (tdmi_set_enable(tdmi, enabled))
+ dvb_mux_save(tdmi);
}
--
1.7.10

4
packages/addons/service/multimedia/tvheadend/source/bin/tvheadend.start
View File

@ -95,9 +95,9 @@ if [ ! -f "$TIMESHIFT_SETTINGS_FILE" ]; then
fi
if [ "$DEBUG" = "yes" ]; then
ADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
TVHEADEND_ARG="-C -s -u root -g video -c $ADDON_HOME"
else
ADEND_ARG="-C -u root -g video -c $ADDON_HOME"
TVHEADEND_ARG="-C -u root -g video -c $ADDON_HOME"
fi
mkdir -p /var/config