summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-01-30 14:42:51 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2005-01-30 14:42:51 +0100
commitd3181d3d99f24673ac737e98080f0dc739ed2e91 (patch)
tree1190a978433e32020d6a071a49eb1d37d5626a8d
parent2bec1d5ca0aad0bc18d99ed33c1b1ce443abb699 (diff)
downloadvdr-d3181d3d99f24673ac737e98080f0dc739ed2e91.tar.gz
vdr-d3181d3d99f24673ac737e98080f0dc739ed2e91.tar.bz2
Moved the call to SetAudioChannel(0) into cDevice::ClrAvailableTracks()
-rw-r--r--HISTORY4
-rw-r--r--device.c5
2 files changed, 5 insertions, 4 deletions
diff --git a/HISTORY b/HISTORY
index addafc83..b807f5c4 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3333,7 +3333,7 @@ Video Disk Recorder Revision History
- Added PlayPes(NULL, 0) to cTransfer::Action() when clearing the transfer buffer
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
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
better to do this in a dedicated function that can be called early when shutting
down.
+- Moved the call to SetAudioChannel(0) into cDevice::ClrAvailableTracks() to have it
+ executed also when starting a replay.
diff --git a/device.c b/device.c
index 425ee6a9..2a6e5b8b 100644
--- a/device.c
+++ b/device.c
@@ -4,7 +4,7 @@
* See the main source file 'vdr.c' for copyright information and
* 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"
@@ -569,8 +569,6 @@ eSetChannelResult cDevice::SetChannel(const cChannel *Channel, bool LiveView)
const tTrackId *Track = GetTrack(GetCurrentAudioTrack());
if (!Track || !Track->id || PreferredTrack != GetCurrentAudioTrack())
SetCurrentAudioTrack(PreferredTrack);
- // Fall back to stereo:
- SetAudioChannel(0);
}
cStatus::MsgChannelSwitch(this, Channel->Number()); // only report status if channel switch successfull
}
@@ -663,6 +661,7 @@ void cDevice::ClrAvailableTracks(bool DescriptionsOnly)
else {
memset(availableTracks, 0, sizeof(availableTracks));
pre_1_3_19_PrivateStream = false;
+ SetAudioChannel(0); // fall back to stereo
}
}