frodovdr/vdr-plugin-streamdev
1
0
Fork 0
mirror of https://projects.vdr-developer.org/git/vdr-plugin-streamdev.git synced 2023-10-10 19:16:51 +02:00
Code Issues Releases Wiki Activity

switching away live TV failed even when "always suspended"

Browse Source 
The vdr main loop usually switches back to the previous channel at
"Make sure we have a visible programme in case device usage has changed"
(#472)
This commit is contained in:
Frank Schmirler 2010-12-10 17:03:04 +01:00
parent 0c07109974
commit a35675490d
3 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
CONTRIBUTORS
View File

@ -174,3 +174,6 @@ Rainer Blickle
Gavin Hamill Gavin Hamill
for reporting that ES/PS/PES no longer works for reporting that ES/PS/PES no longer works
Michal Novotny
for reporting that switching away live TV fails when "always suspended"

2
HISTORY
View File

@ -1,6 +1,8 @@
VDR Plugin 'streamdev' Revision History VDR Plugin 'streamdev' Revision History
--------------------------------------- ---------------------------------------
- switching away live TV failed even when "always suspended" (reported by
Michal Novotny)
- fixed regression: no receiver created for ES/PS/PES (reported by Gavin - fixed regression: no receiver created for ES/PS/PES (reported by Gavin
Hamill) Hamill)
- VTP no longer uses a static priority value for its server-side receivers. - VTP no longer uses a static priority value for its server-side receivers.

8
server/connection.c
View File

@ -296,7 +296,6 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority)
if (device && device == cDevice::ActualDevice() if (device && device == cDevice::ActualDevice()
&& !cSuspendCtl::IsActive() && !cSuspendCtl::IsActive()
&& StreamdevServerSetup.SuspendMode != smAlways
&& current != NULL && current != NULL
&& !TRANSPONDER(Channel, current)) { && !TRANSPONDER(Channel, current)) {
// now we would have to switch away live tv...let's see if live tv // now we would have to switch away live tv...let's see if live tv
@ -307,8 +306,13 @@ cDevice *cServerConnection::GetDevice(const cChannel *Channel, int Priority)
#else #else
cDevice *newdev = CheckDevice(current, 0, true, device); cDevice *newdev = CheckDevice(current, 0, true, device);
#endif #endif
if (newdev) if (newdev) {
newdev->SwitchChannel(current, true); newdev->SwitchChannel(current, true);
}
else if (StreamdevServerSetup.SuspendMode == smAlways) {
Channels.SwitchTo(Channel->Number());
Skins.Message(mtInfo, tr("Streaming active"));
}
else else
device = NULL; device = NULL;
} }