diff options
| -rw-r--r-- | HISTORY | 2 | ||||
| -rw-r--r-- | device.c | 10 | ||||
| -rw-r--r-- | dvbdevice.c | 8 |
3 files changed, 10 insertions, 10 deletions
@@ -3160,7 +3160,7 @@ Video Disk Recorder Revision History right day of week for timers in the future. - Some improvements to cPoller (thanks to Marco Schlüßler). -2005-01-02: Version 1.3.18 +2005-01-04: Version 1.3.18 - Removed an unused variable from cTimer::GetWDayFromMDay() (thanks to Wayne Keer for reporting this one). @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: device.c 1.65 2005/01/02 14:08:40 kls Exp $ + * $Id: device.c 1.66 2005/01/04 13:13:24 kls Exp $ */ #include "device.h" @@ -540,8 +540,14 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView) } if (Result == scrOk) { - if (LiveView && IsPrimaryDevice()) + if (LiveView && IsPrimaryDevice()) { + ClrAvailableTracks(); + for (int i = 0; i < MAXAPIDS; i++) { + SetAvailableTrack(ttAudio, i, Channel->Apid(i), Channel->Alang(i)); + SetAvailableTrack(ttDolby, i, Channel->Dpid(i), Channel->Dlang(i)); + } currentChannel = Channel->Number(); + } cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull } diff --git a/dvbdevice.c b/dvbdevice.c index 7264d86f..58612c03 100644 --- a/dvbdevice.c +++ b/dvbdevice.c @@ -4,7 +4,7 @@ * See the main source file 'vdr.c' for copyright information and * how to reach the author. * - * $Id: dvbdevice.c 1.108 2005/01/02 11:51:18 kls Exp $ + * $Id: dvbdevice.c 1.109 2005/01/04 13:13:32 kls Exp $ */ #include "dvbdevice.h" @@ -801,12 +801,6 @@ bool cDvbDevice::SetChannelDevice(const cChannel *Channel, bool LiveView) // PID settings: if (TurnOnLivePIDs) { - ClrAvailableTracks(); - for (int i = 0; i < MAXAPIDS; i++) { - //XXX do this in cDevice??? - SetAvailableTrack(ttAudio, i, Channel->Apid(i), Channel->Alang(i)); - SetAvailableTrack(ttDolby, i, Channel->Dpid(i), Channel->Dlang(i)); - } if (!(AddPid(Channel->Ppid(), ptPcr) && AddPid(Channel->Vpid(), ptVideo) && AddPid(Channel->Apid(0), ptAudio))) {//XXX+ dolby dpid1!!! (if audio plugins are attached) esyslog("ERROR: failed to set PIDs for channel %d on device %d", Channel->Number(), CardIndex() + 1); return false; |