frodovdr/vdr
1
0
Fork 0
mirror of https://github.com/VDR4Arch/vdr.git synced 2023-10-10 13:36:52 +02:00
Code Issues Releases Wiki Activity

Fixed calling cStatus::MsgChannelSwitch() in cDevice::SetChannel()

Browse Source
This commit is contained in:
Klaus Schmidinger 2005-02-19 12:20:53 +01:00
parent f226c84583
commit 605cd54280
3 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CONTRIBUTORS
View File

@ -1148,6 +1148,7 @@ Marco Schl
for reporting a missing 'resultSkipped = 0' in cRemux::Clear() for reporting a missing 'resultSkipped = 0' in cRemux::Clear()
for reporting a missing reset of the 'repacker' in cTS2PES::Clear() for reporting a missing reset of the 'repacker' in cTS2PES::Clear()
for avoiding unnecessary calls to SetPid() in cDvbDevice::SetAudioTrackDevice() for avoiding unnecessary calls to SetPid() in cDvbDevice::SetAudioTrackDevice()
for fixing calling cStatus::MsgChannelSwitch() in cDevice::SetChannel()
Jürgen Schmitz <j.schmitz@web.de> Jürgen Schmitz <j.schmitz@web.de>
for reporting a bug in displaying the current channel when switching via the SVDRP for reporting a bug in displaying the current channel when switching via the SVDRP

2
HISTORY
View File

@ -3422,3 +3422,5 @@ Video Disk Recorder Revision History
cEvent::FixEpgBugs() (thanks to Wolfgang Rohdewald). cEvent::FixEpgBugs() (thanks to Wolfgang Rohdewald).
- Avoiding unnecessary calls to SetPid() in cDvbDevice::SetAudioTrackDevice() - Avoiding unnecessary calls to SetPid() in cDvbDevice::SetAudioTrackDevice()
(thanks to Marco Schlüßler). (thanks to Marco Schlüßler).
- Fixed calling cStatus::MsgChannelSwitch() in cDevice::SetChannel() (thanks to
Marco Schlüßler).

10
device.c
View File

@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and * See the main source file 'vdr.c' for copyright information and
* how to reach the author. * how to reach the author.
* *
* $Id: device.c 1.92 2005/02/13 09:51:48 kls Exp $ * $Id: device.c 1.93 2005/02/19 12:20:39 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -571,11 +571,8 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
else else
Result = scrFailed; Result = scrFailed;
Channels.Unlock(); Channels.Unlock();
}
if (Result == scrOk) { if (Result == scrOk) {
if (LiveView && IsPrimaryDevice()) { if (LiveView && IsPrimaryDevice()) {
currentChannel = Channel->Number();
// Set the available audio tracks: // Set the available audio tracks:
ClrAvailableTracks(); ClrAvailableTracks();
currentAudioTrack = ttAudioFirst; currentAudioTrack = ttAudioFirst;
@ -587,6 +584,11 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
} }
EnsureAudioTrack(true); EnsureAudioTrack(true);
} }
}
}
if (Result == scrOk) {
if (LiveView && IsPrimaryDevice())
currentChannel = Channel->Number();
cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
} }