qt4: Hopefully blindely fix the qt4 build, by defining the std p_playlist.

[vlc] / modules / codec / kate.c

diff --git a/modules/codec/kate.c b/modules/codec/kate.c
index 6feaa685b7c0e4a596a1d56db14343c976fbcd04..ac6ba6372ca6c95d8a25f1ac5b130a6a58a86071 100644 (file)
--- a/modules/codec/kate.c
+++ b/modules/codec/kate.c
@@ -28,7 +28,7 @@
 # include "config.h"
 #endif
 
-#include <vlc/vlc.h>
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_input.h>
 #include <vlc_codec.h>
@@ -39,7 +39,7 @@
 
 /* #define ENABLE_PACKETIZER */
 /* #define ENABLE_FORMATTING */
-/* #define ENABLE_BITMAPS */
+#define ENABLE_BITMAPS
 
 /*****************************************************************************
  * decoder_sys_t : decoder descriptor
@@ -110,8 +110,8 @@ static void ParseKateComments( decoder_t * );
 
 
 vlc_module_begin();
-    set_shortname( _("Kate"));
-    set_description( _("Kate text subtitles decoder") );
+    set_shortname( N_("Kate"));
+    set_description( N_("Kate text subtitles decoder") );
     set_capability( "decoder", 50 );
     set_callbacks( OpenDecoder, CloseDecoder );
     set_category( CAT_INPUT );
@@ -120,7 +120,7 @@ vlc_module_begin();
 
 #ifdef ENABLE_PACKETIZER
     add_submodule();
-    set_description( _("Kate text subtitles packetizer") );
+    set_description( N_("Kate text subtitles packetizer") );
     set_capability( "packetizer", 100 );
     set_callbacks( OpenPacketizer, CloseDecoder );
     add_shortcut( "kate" );
@@ -468,7 +468,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t
     p_spu->b_pausable = true;
 
 #ifdef ENABLE_BITMAPS
-    if (ev->bitmap && ev->palette) {
+    if (ev->bitmap && ev->bitmap->type==kate_bitmap_type_paletted && ev->palette) {
         /* create a separate region for the bitmap */
         memset( &fmt, 0, sizeof(video_format_t) );
         fmt.i_chroma = VLC_FOURCC('Y','U','V','P');
@@ -504,7 +504,7 @@ static subpicture_t *DecodePacket( decoder_t *p_dec, kate_packet *p_kp, block_t
           memcpy(dest, src, ev->bitmap->width);
         }
 
-        msg_Dbg(p_dec, "Created bitmap, %dx%d, %d colors\n", ev->bitmap->width, ev->bitmap->height, ev->palette->ncolors);
+        msg_Dbg(p_dec, "Created bitmap, %zux%zu, %zu colors\n", ev->bitmap->width, ev->bitmap->height, ev->palette->ncolors);
     }
 #endif