Support for multiple OSD channels :

[vlc] / modules / codec / ogt / ogt_parse.c

diff --git a/modules/codec/ogt/ogt_parse.c b/modules/codec/ogt/ogt_parse.c
index 3d16de5018433d8692dfe13118f7a0661a6f7e85..09dfea8cb63987ee35c7197103bdabb223018467 100644 (file)
--- a/modules/codec/ogt/ogt_parse.c
+++ b/modules/codec/ogt/ogt_parse.c
@@ -2,7 +2,7 @@
  * Philips OGT (SVCD subtitle) packet parser
  *****************************************************************************
  * Copyright (C) 2003, 2004 VideoLAN
- * $Id: ogt_parse.c,v 1.11 2004/01/21 04:45:47 rocky Exp $
+ * $Id$
  *
  * Author: Rocky Bernstein 
  *   based on code from: 
@@ -165,7 +165,8 @@ E_(ParsePacket)( decoder_t *p_dec)
     dbg_print( (DECODE_DBG_CALL|DECODE_DBG_EXT) , "");
     
     /* Allocate the subpicture internal data. */
-    p_spu = vout_CreateSubPicture( p_sys->p_vout, MEMORY_SUBPICTURE );
+    p_spu = vout_CreateSubPicture( p_sys->p_vout, SUBT1_CHAN, TEXT_CONTENT,
+                                   MEMORY_SUBPICTURE );
     if( p_spu == NULL )
     {
         return;
@@ -191,6 +192,11 @@ E_(ParsePacket)( decoder_t *p_dec)
     p_spu->i_x        = p_sys->i_x_start 
       + config_GetInt( p_dec, MODULE_STRING "-horizontal-correct" );
 
+    p_spu->p_sys->p_palette[0] = p_sys->p_palette[0];
+    p_spu->p_sys->p_palette[1] = p_sys->p_palette[1];
+    p_spu->p_sys->p_palette[2] = p_sys->p_palette[2];
+    p_spu->p_sys->p_palette[3] = p_sys->p_palette[3];
+
     /* FIXME: use aspect ratio for x? */
     p_spu->i_x        = (p_spu->i_x * 3) / 4; 
     p_spu->i_y        = p_sys->i_y_start