MKV: remove unused parameter

[vlc] / modules / codec / subsusf.c

diff --git a/modules/codec/subsusf.c b/modules/codec/subsusf.c
index ab480681f802e8053b22831eac99d69d2168ee12..80db2bd50e97dfc79453a38a54d10ebc0c410c56 100644 (file)
--- a/modules/codec/subsusf.c
+++ b/modules/codec/subsusf.c
@@ -23,31 +23,24 @@
 #ifdef HAVE_CONFIG_H
 # include "config.h"
 #endif
+#include <assert.h>
 
-#include "subsdec.h"
+#include <vlc_common.h>
 #include <vlc_plugin.h>
 #include <vlc_modules.h>
-#include <assert.h>
+#include <vlc_codec.h>
+#include <vlc_input.h>
+#include <vlc_charset.h>
+#include <vlc_image.h>
+#include <vlc_xml.h>
+#include <vlc_stream.h>
 
 /*****************************************************************************
- * Local prototypes
+ * Module descriptor.
  *****************************************************************************/
 static int  OpenDecoder   ( vlc_object_t * );
 static void CloseDecoder  ( vlc_object_t * );
 
-static subpicture_t *DecodeBlock   ( decoder_t *, block_t ** );
-static char         *CreatePlainText( char * );
-static int           ParseImageAttachments( decoder_t *p_dec );
-
-static subpicture_t        *ParseText     ( decoder_t *, block_t * );
-static void                 ParseUSFHeader( decoder_t * );
-static subpicture_region_t *ParseUSFString( decoder_t *, char * );
-static subpicture_region_t *LoadEmbeddedImage( decoder_t *p_dec, const char *psz_filename, int i_transparent_color );
-
-/*****************************************************************************
- * Module descriptor.
- *****************************************************************************/
-
 vlc_module_begin ()
     set_capability( "decoder", 40 )
     set_shortname( N_("USFSubs"))
@@ -58,6 +51,58 @@ vlc_module_begin ()
     /* We inherit subsdec-align and subsdec-formatted from subsdec.c */
 vlc_module_end ()
 
+
+/*****************************************************************************
+ * Local prototypes
+ *****************************************************************************/
+enum
+{
+    ATTRIBUTE_ALIGNMENT = (1 << 0),
+    ATTRIBUTE_X         = (1 << 1),
+    ATTRIBUTE_X_PERCENT = (1 << 2),
+    ATTRIBUTE_Y         = (1 << 3),
+    ATTRIBUTE_Y_PERCENT = (1 << 4),
+};
+
+typedef struct
+{
+    char       *psz_filename;
+    picture_t  *p_pic;
+} image_attach_t;
+
+typedef struct
+{
+    char *          psz_stylename; /* The name of the style, no comma's allowed */
+    text_style_t    font_style;
+    int             i_align;
+    int             i_margin_h;
+    int             i_margin_v;
+    int             i_margin_percent_h;
+    int             i_margin_percent_v;
+}  ssa_style_t;
+
+struct decoder_sys_t
+{
+    int                 i_original_height;
+    int                 i_original_width;
+    int                 i_align;          /* Subtitles alignment on the vout */
+
+    ssa_style_t         **pp_ssa_styles;
+    int                 i_ssa_styles;
+
+    image_attach_t      **pp_images;
+    int                 i_images;
+};
+
+static subpicture_t *DecodeBlock   ( decoder_t *, block_t ** );
+static char         *CreatePlainText( char * );
+static int           ParseImageAttachments( decoder_t *p_dec );
+
+static subpicture_t        *ParseText     ( decoder_t *, block_t * );
+static void                 ParseUSFHeader( decoder_t * );
+static subpicture_region_t *ParseUSFString( decoder_t *, char * );
+static subpicture_region_t *LoadEmbeddedImage( decoder_t *p_dec, const char *psz_filename, int i_transparent_color );
+
 /*****************************************************************************
  * OpenDecoder: probe the decoder and return score
  *****************************************************************************
@@ -80,11 +125,6 @@ static int OpenDecoder( vlc_object_t *p_this )
     p_dec->fmt_out.i_cat = SPU_ES;
     p_dec->fmt_out.i_codec = 0;
 
-    /* Unused fields of p_sys - not needed for USF decoding */
-    p_sys->b_ass = false;
-    p_sys->iconv_handle = (vlc_iconv_t)-1;
-    p_sys->b_autodetect_utf8 = false;
-
     /* init of p_sys */
     p_sys->i_align = 0;
     p_sys->i_original_height = 0;