summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrank Schmirler <vdr@schmirler.de>2010-12-10 16:38:54 +0100
committerFrank Schmirler <vdr@schmirler.de>2010-12-10 16:38:54 +0100
commit5aaf73310cfa44b5fda0679fea839f7d3eca6bb8 (patch)
tree29a5104637d6215a92c4749caf0d061ab2fc21f2
parent2ec54f75051001accc03c32b42df70cd4a19febd (diff)
downloadvdr-plugin-streamdev-5aaf73310cfa44b5fda0679fea839f7d3eca6bb8.tar.gz
vdr-plugin-streamdev-5aaf73310cfa44b5fda0679fea839f7d3eca6bb8.tar.bz2
fixed regression: no receiver created for ES/PS/PES
(reported by Gavin Hamill)
-rw-r--r--CONTRIBUTORS3
-rw-r--r--HISTORY2
-rw-r--r--server/livestreamer.c5
3 files changed, 8 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 7dc9960..d7f1e79 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -171,3 +171,6 @@ Timothy D. Lenz
Rainer Blickle
for reporting that channel switches may interrupt live TV on the server
+
+Gavin Hamill
+ for reporting that ES/PS/PES no longer works
diff --git a/HISTORY b/HISTORY
index 9cdc58d..35b892f 100644
--- a/HISTORY
+++ b/HISTORY
@@ -1,6 +1,8 @@
VDR Plugin 'streamdev' Revision History
---------------------------------------
+- fixed regression: no receiver created for ES/PS/PES (reported by Gavin
+ Hamill)
- VTP no longer uses a static priority value for its server-side receivers.
The server stores channel and priority requested with the PROV command and
re-uses these values in a subsequent TUNE for the same channel. The new
diff --git a/server/livestreamer.c b/server/livestreamer.c
index 1286abd..f17025d 100644
--- a/server/livestreamer.c
+++ b/server/livestreamer.c
@@ -442,12 +442,13 @@ void cStreamdevLiveStreamer::SetPriority(int Priority)
void cStreamdevLiveStreamer::StartReceiver(void)
{
- if (m_Device != NULL && m_NumPids > 0 && IsRunning()) {
+ if (m_NumPids > 0) {
Dprintf("Creating Receiver to respect changed pids\n");
cReceiver *current = m_Receiver;
m_Receiver = new cStreamdevLiveReceiver(this, m_Channel->GetChannelID(), m_Priority, m_Pids);
cThreadLock ThreadLock(m_Device);
- Attach();
+ if (IsRunning())
+ Attach();
delete current;
}
else