When setting the audio track descriptions, the language codes are now also set in case this is a replay session

3 files changed, 7 insertions, 4 deletions

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index 1b20eb7a..f0ccaa63 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -960,6 +960,7 @@ Rolf Ahrenberg <rahrenbe@cc.hut.fi>
  for making cMenuText use the given font
  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
 
 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 7fa50cfb..7c830f35 100644
--- a/HISTORY
+++ b/HISTORY
@@ -4317,7 +4317,7 @@ Video Disk Recorder Revision History
 - Added cSkin::GetTextAreaWidth() and cSkin::GetTextAreaFont(), so that a plugin
   that wants to do special text formatting can do so (thanks to Alexander Rieger).
 
-2006-02-18: Version 1.3.43
+2006-02-19: Version 1.3.43
 
 - Removed an unnecessary toFile->SetReadAhead() from cutter.c (thanks to Artur
   Skawina).
@@ -4349,3 +4349,5 @@ Video Disk Recorder Revision History
 - Externally provided EPG data (with table ID 0x00) now gets its component
   descriptors set from the broadcast data, so that language codes and descriptions
   are available (suggested by Andreas Brugger).
+- When setting the audio track descriptions, the language codes are now also set
+  in case this is a replay session (based on a patch from Rolf Ahrenberg).
diff --git a/menu.c b/menu.c
index 6690521b..e2088943 100644
--- a/menu.c
+++ b/menu.c
@@ -4,7 +4,7 @@
  * See the main source file 'vdr.c' for copyright information and
  * how to reach the author.
  *
- * $Id: menu.c 1.412 2006/02/18 12:42:24 kls Exp $
+ * $Id: menu.c 1.413 2006/02/19 10:18:28 kls Exp $
  */
 
 #include "menu.h"
@@ -2989,9 +2989,9 @@ static void SetTrackDescriptions(int LiveChannel)
          const tComponent *p = Components->Component(i);
          if (p->stream == 2) {
             if (p->type == 0x05)
-               cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, NULL, p->description);
+               cDevice::PrimaryDevice()->SetAvailableTrack(ttDolby, indexDolby++, 0, LiveChannel ? NULL : p->language, p->description);
             else
-               cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, indexAudio++, 0, NULL, p->description);
+               cDevice::PrimaryDevice()->SetAvailableTrack(ttAudio, indexAudio++, 0, LiveChannel ? NULL : p->language, p->description);
             }
          }
      }