frodovdr
/
vdr
mirror of https://github.com/VDR4Arch/vdr.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Moved the call to SetAudioChannel(0) into cDevice::ClrAvailableTracks()

This commit is contained in:
Klaus Schmidinger 2005-01-30 14:42:51 +01:00
parent 2bec1d5ca0
commit d3181d3d99
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
HISTORY
View File

@ -3333,7 +3333,7 @@ Video Disk Recorder Revision History
- Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer - Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer
to avoid overflows (thanks to Marco Schlüßler for pointing this out). to avoid overflows (thanks to Marco Schlüßler for pointing this out).
2005-01-25: Version 1.3.20 2005-01-30: Version 1.3.20
- Fixed displaying the "Audio" menu with the "Green" button from the "Main" menu - Fixed displaying the "Audio" menu with the "Green" button from the "Main" menu
in case there is only one audio track (thanks to Sascha Volkenandt for reporting in case there is only one audio track (thanks to Sascha Volkenandt for reporting
@ -3349,3 +3349,5 @@ Video Disk Recorder Revision History
of a plugin. Previously this was done in the plugin's desctructor, but it is of a plugin. Previously this was done in the plugin's desctructor, but it is
better to do this in a dedicated function that can be called early when shutting better to do this in a dedicated function that can be called early when shutting
down. down.
- Moved the call to SetAudioChannel(0) into cDevice::ClrAvailableTracks() to have it
executed also when starting a replay.

5
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.80 2005/01/30 12:52:45 kls Exp $ * $Id: device.c 1.81 2005/01/30 14:41:57 kls Exp $
*/ */
#include "device.h" #include "device.h"
@ -569,8 +569,6 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
const tTrackId *Track = GetTrack(GetCurrentAudioTrack()); const tTrackId *Track = GetTrack(GetCurrentAudioTrack());
if (!Track || !Track->id || PreferredTrack != GetCurrentAudioTrack()) if (!Track || !Track->id || PreferredTrack != GetCurrentAudioTrack())
SetCurrentAudioTrack(PreferredTrack); SetCurrentAudioTrack(PreferredTrack);
// Fall back to stereo:
SetAudioChannel(0);
} }
cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
} }
@ -663,6 +661,7 @@ void cDevice::ClrAvailableTracks(bool DescriptionsOnly)
else { else {
memset(availableTracks, 0, sizeof(availableTracks)); memset(availableTracks, 0, sizeof(availableTracks));
pre_1_3_19_PrivateStream = false; pre_1_3_19_PrivateStream = false;
SetAudioChannel(0); // fall back to stereo
} }
} }