From fcbfc8e988989e507f894d531872290a0c425124 Mon Sep 17 00:00:00 2001
From: Klaus Schmidinger <vdr@tvdr.de>
Date: Sun, 6 Feb 2005 09:58:08 +0100
Subject: [PATCH] Added CMD_SPU_CHG_COLCON to cDvbSpuDecoder::setTime()

---
 CONTRIBUTORS | 1 +
 HISTORY      | 3 ++-
 dvbspu.c     | 9 ++++++++-
 3 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index a7300d2a..5244c1da 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -1125,6 +1125,7 @@ Marco Schl
  for a patch that implements substream handling into cDevice::PlayPesPacket()
  for pointing out that PlayPes(NULL, 0) needs to be called in cTransfer::Action()
  when clearing the transfer buffer to avoid overflows
+ for adding CMD_SPU_CHG_COLCON to cDvbSpuDecoder::setTime()
 
 Jürgen Schmitz <j.schmitz@web.de>
  for reporting a bug in displaying the current channel when switching via the SVDRP
diff --git a/HISTORY b/HISTORY
index 61c1393a..4bc93a90 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-30: Version 1.3.20
+2005-02-06: 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
@@ -3364,3 +3364,4 @@ Video Disk Recorder Revision History
   (thanks to Reinhard Nissl).
 - Fixed several memory leaks that were introduced through the use of cString (thanks
   to Stefan Huelswitt for reporting these).
+- Added CMD_SPU_CHG_COLCON to cDvbSpuDecoder::setTime() (thanks to Marco Schlüßler).
diff --git a/dvbspu.c b/dvbspu.c
index 44cb7b33..3ca780aa 100644
--- a/dvbspu.c
+++ b/dvbspu.c
@@ -8,7 +8,7 @@
  *
  * parts of this file are derived from the OMS program.
  *
- * $Id: dvbspu.c 1.11 2005/01/08 09:57:03 kls Exp $
+ * $Id: dvbspu.c 1.12 2005/02/06 09:54:51 kls Exp $
  */
 
 #include <assert.h>
@@ -216,6 +216,7 @@ void cDvbSpuBitmap::putFieldData(int field, uint8_t * data, uint8_t * endp)
 #define CMD_SPU_SET_ALPHA       0x04
 #define CMD_SPU_SET_SIZE        0x05
 #define CMD_SPU_SET_PXD_OFFSET  0x06
+#define CMD_SPU_CHG_COLCON      0x07
 #define CMD_SPU_EOF             0xff
 
 #define spuU32(i)  ((spu[i] << 8) + spu[i+1])
@@ -509,6 +510,12 @@ int cDvbSpuDecoder::setTime(uint32_t pts)
                     i += 5;
                     break;
 
+                case CMD_SPU_CHG_COLCON: {
+                    int size = spuU32(i + 1);
+                    i += 1 + size;
+                    }
+                    break;
+
                 case CMD_SPU_MENU:
                     DEBUG("\tspu menu\n");
                     state = spMENU;