summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus Schmidinger <vdr@tvdr.de>2005-02-27 13:58:22 +0100
committerKlaus Schmidinger <vdr@tvdr.de>2005-02-27 13:58:22 +0100
commit87209df391f9554a95c4e7af06ebddd6b8b39ddb (patch)
tree10b2da2ce0bdd25814d78da97825015d858b1a4f
parent940d605f2ef9efb424aa1f0e231fa7faba39c4bf (diff)
downloadvdr-87209df391f9554a95c4e7af06ebddd6b8b39ddb.tar.gz
vdr-87209df391f9554a95c4e7af06ebddd6b8b39ddb.tar.bz2
Keeping the track language codes and descriptions in Transfer Mode
-rw-r--r--CONTRIBUTORS4
-rw-r--r--HISTORY2
-rw-r--r--device.c5
3 files changed, 9 insertions, 2 deletions
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c22ce686..52d52244 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1288,3 +1288,7 @@ Chad Flynt <hoochster@sofnet.com>
Chris Warren <dvb@ixalon.net>
for pointing out that the call to system("sync") in SpinUpDisk() should be
replaced with fsync(f) to avoid problems on NPTL systems
+
+Luca Olivetti <luca@ventoso.org>
+ for making cDevice::AttachPlayer() keep the track language codes and descriptions
+ in Transfer Mode
diff --git a/HISTORY b/HISTORY
index 6b9f2839..37543d1b 100644
--- a/HISTORY
+++ b/HISTORY
@@ -3439,3 +3439,5 @@ Video Disk Recorder Revision History
- Fixed ensuring there is a current audio track in case there is only one track
(thanks to Werner Fink for reporting this one).
- Improved automatic audio track selection.
+- Keeping the track language codes and descriptions in Transfer Mode (thanks to
+ Luca Olivetti).
diff --git a/device.c b/device.c
index aecee91e..d6ab8911 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.98 2005/02/27 13:35:34 kls Exp $
+ * $Id: device.c 1.99 2005/02/27 13:55:15 kls Exp $
*/
#include "device.h"
@@ -842,7 +842,8 @@ bool cDevice::AttachPlayer(cPlayer *Player)
if (CanReplay()) {
if (player)
Detach(player);
- ClrAvailableTracks();
+ if (!dynamic_cast<cTransfer *>(Player))
+ ClrAvailableTracks();
pesAssembler->Reset();
player = Player;
SetPlayMode(player->playMode);