From f40a6e9b85065badb97b1b9c43d56b0e8a8da26f Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Fri, 24 Feb 2006 14:14:41 +0100
Subject: Fixed setting the audio language codes in 'Transfer-Mode'

---
 CONTRIBUTORS | 1 +
 HISTORY      | 6 ++++++
 config.h     | 6 +++---
 device.c     | 6 +++---
 4 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index b3dc8e8b..1525fb66 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -961,6 +961,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for making the channel number be reset if the number entered through the numeric keys
  exceeds the maximum channel number
  for suggesting to also set the language codes when setting the audio track descriptions
+ for reporting a problem in setting the audio language codes in 'Transfer-Mode'
 
 Ralf Klueber <ralf.klueber@vodafone.com>
  for reporting a bug in cutting a recording if there is only a single editing mark
diff --git a/HISTORY b/HISTORY
index 7132b811..678e01dc 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4359,3 +4359,9 @@ Video Disk Recorder Revision History
   Reinhard Nissl).
 - Added a comment to tChannelID::nid, explaining that is is actually the "original"
   network id.
+
+2006-02-24: Version 1.3.44
+
+- Fixed setting the audio language codes in 'Transfer-Mode' (reported by Rolf
+  Ahrenberg). The actual problem was the call to the Transferring() function in
+  cDevice::AttachPlayer() before assigning the player.
diff --git a/config.h b/config.h
index 5e992858..105fe630 100644
--- a/config.h
+++ b/config.h
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: config.h 1.244 2006/02/12 10:07:44 kls Exp $
+ * $Id: config.h 1.245 2006/02/24 14:11:19 kls Exp $
  */
 
 #ifndef __CONFIG_H
@@ -19,8 +19,8 @@
 #include "i18n.h"
 #include "tools.h"
 
-#define VDRVERSION  "1.3.43"
-#define VDRVERSNUM   10343  // Version * 10000 + Major * 100 + Minor
+#define VDRVERSION  "1.3.44"
+#define VDRVERSNUM   10344  // Version * 10000 + Major * 100 + Minor
 
 #define MAXPRIORITY 99
 #define MAXLIFETIME 99
diff --git a/device.c b/device.c
index 6a03ade0..5eaa8ac2 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.123 2006/02/04 14:58:24 kls Exp $
+ * $Id: device.c 1.124 2006/02/24 14:05:26 kls Exp $
  */
 
 #include "device.h"
@@ -934,10 +934,10 @@ bool cDevice::AttachPlayer(cPlayer *Player)
   if (CanReplay()) {
      if (player)
         Detach(player);
-     if (!Transferring())
-        ClrAvailableTracks();
      pesAssembler->Reset();
      player = Player;
+     if (!Transferring())
+        ClrAvailableTracks();
      SetPlayMode(player->playMode);
      player->device = this;
      player->Activate(true);
-- 
cgit v1.2.3