The playlist is not lock at this stage so let it lock itself.

[vlc] / modules / demux / subtitle_asa.c

diff --git a/modules/demux/subtitle_asa.c b/modules/demux/subtitle_asa.c
index 0d3f67005f6d73f533b8502f5a44e0acd15d9651..273d8f39f96d756878dc8b71032060dfbe7fa7c8 100644 (file)
--- a/modules/demux/subtitle_asa.c
+++ b/modules/demux/subtitle_asa.c
@@ -30,7 +30,8 @@
  * Preamble
  *****************************************************************************/
 #include "config.h"
-#include <vlc/vlc.h>
+#include <vlc_common.h>
+#include <vlc_plugin.h>
 #include <vlc_input.h>
 
 
@@ -60,19 +61,19 @@ static void Close( vlc_object_t *p_this );
     N_("Force the subtiles format. Use \"auto\", the set of supported values varies.")
 
 vlc_module_begin();
-    set_shortname( _("Subtitles (asa demuxer)"));
-    set_description( _("Text subtitles parser") );
-    set_capability( "demux2", 50 );
+    set_shortname( N_("Subtitles (asa demuxer)"));
+    set_description( N_("Text subtitles parser") );
+    set_capability( "demux", 50 );
     set_category( CAT_INPUT );
     set_subcategory( SUBCAT_INPUT_DEMUX );
     add_float( "sub-fps", 0.0, NULL,
                N_("Frames per second"),
-               SUB_FPS_LONGTEXT, VLC_TRUE );
+               SUB_FPS_LONGTEXT, true );
     add_integer( "sub-delay", 0, NULL,
                N_("Subtitles delay"),
-               SUB_DELAY_LONGTEXT, VLC_TRUE );
+               SUB_DELAY_LONGTEXT, true );
     add_string( "sub-type", "auto", NULL, N_("Subtitles format"),
-                SUB_TYPE_LONGTEXT, VLC_TRUE );
+                SUB_TYPE_LONGTEXT, true );
     set_callbacks( Open, Close );
 
     add_shortcut( "asademux" );
@@ -139,6 +140,8 @@ static int Open ( vlc_object_t *p_this )
     p_demux->pf_demux = Demux;
     p_demux->pf_control = Control;
     p_demux->p_sys = p_sys = malloc( sizeof( demux_sys_t ) );
+    if( !p_sys  )
+        return VLC_ENOMEM;
     p_sys->psz_header         = NULL;
     p_sys->i_subtitle         = 0;
     p_sys->i_subtitles        = 0;
@@ -219,7 +222,6 @@ static int Open ( vlc_object_t *p_this )
     p_data = malloc( i_ssize );
     if( !p_data )
     {
-        msg_Err( p_demux, "out of memory");
         free( p_sys );
         return VLC_ENOMEM;
     }
@@ -280,7 +282,6 @@ static int ProcessLine( demux_t *p_demux, void *p_arg,
         if( !( p_sys->subtitle = realloc( p_sys->subtitle, sizeof(subtitle_t)
                                           * p_sys->i_subs_alloc ) ) )
         {
-            msg_Err( p_demux, "out of memory");
             return VLC_ENOMEM;
         }
     }
@@ -477,7 +478,7 @@ static int Demux( demux_t *p_demux )
 static void Fix( demux_t *p_demux )
 {
     demux_sys_t *p_sys = p_demux->p_sys;
-    vlc_bool_t b_done;
+    bool b_done;
     int     i_index;
 
     /* *** fix order (to be sure...) *** */
@@ -486,7 +487,7 @@ static void Fix( demux_t *p_demux )
      */
     do
     {
-        b_done = VLC_TRUE;
+        b_done = true;
         for( i_index = 1; i_index < p_sys->i_subtitles; i_index++ )
         {
             if( p_sys->subtitle[i_index].i_start <
@@ -502,7 +503,7 @@ static void Fix( demux_t *p_demux )
                 memcpy( p_sys->subtitle + i_index,
                         &sub_xch,
                         sizeof( subtitle_t ) );
-                b_done = VLC_FALSE;
+                b_done = false;
             }
         }
     } while( !b_done );