Move more of the code for USF subtitles decoding out into separate

module. It has almost no code in common with normal subtitles and ASS
subtitle decoding, and this split further simplifies what belongs to
what.

configure.ac

@@ -1193,7 +1193,7 @@ dnl  default modules
 dnl
 VLC_ADD_PLUGINS([dummy logger memcpy])
 VLC_ADD_PLUGINS([mpgv mpga m4v m4a h264 vc1 ps pva avi asf mp4 rawdv rawvid nsv real aiff mjpeg demuxdump flacsys tta])
-VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec dvbsub mpeg_audio lpcm a52 dts cinepak flac])
+VLC_ADD_PLUGINS([cvdsub svcdsub spudec subsdec subsusf dvbsub mpeg_audio lpcm a52 dts cinepak flac])
 VLC_ADD_PLUGINS([deinterlace invert adjust transform wave ripple psychedelic gradient motionblur rv32 rotate noise grain extract sharpen seamcarving])
 VLC_ADD_PLUGINS([converter_fixed mono])
 VLC_ADD_PLUGINS([trivial_resampler ugly_resampler])

modules/codec/subtitles/Modules.am

-SOURCES_subsdec = subsass.c subsusf.c subsdec.c subsdec.h
+SOURCES_subsdec = subsass.c subsdec.c subsdec.h
+SOURCES_subsusf = subsusf.c subsdec.h

modules/codec/subtitles/subsass.c

@@ -2,12 +2,11 @@
  * subsass.c : ASS/SSA subtitles decoder
  *****************************************************************************
  * Copyright (C) 2000-2006 the VideoLAN team
- * $Id: subsdec.c 20996 2007-08-05 20:01:21Z jb $
+ * $Id$
  *
  * Authors: Gildas Bazin <gbazin@videolan.org>
  *          Samuel Hocevar <sam@zoy.org>
  *          Derk-Jan Hartman <hartman at videolan dot org>
- *          Bernie Purcell <b dot purcell at adbglobal dot com>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by

modules/codec/subtitles/subsdec.h

@@ -7,7 +7,7 @@
  * Authors: Gildas Bazin <gbazin@videolan.org>
  *          Samuel Hocevar <sam@zoy.org>
  *          Derk-Jan Hartman <hartman at videolan dot org>
- *          Bernie Purcell <b dot purcell at adbglobal dot com>
+ *          Bernie Purcell <bitmap@videolan.org>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -93,18 +93,6 @@ struct decoder_sys_t
 
 
 char                *GotoNextLine( char *psz_text );
-void                SetupPositions( subpicture_region_t *, char * );
-
-char                *GrabAttributeValue( const char *, const char * );
-subpicture_region_t *LoadEmbeddedImage( decoder_t *p_dec, subpicture_t *p_spu,
-                        const char *psz_filename, int i_transparent_color );
-
-char                *CreatePlainText( char * );
-subpicture_region_t *CreateTextRegion( decoder_t *, subpicture_t *,
-                                        char *, int, int );
-
-void                ParseUSFHeader ( decoder_t * );
-subpicture_region_t *ParseUSFString ( decoder_t *, char *, subpicture_t * );
 
 void                ParseSSAHeader ( decoder_t * );
 void                ParseSSAString ( decoder_t *, char *, subpicture_t * );