* Remove crud

diff --git a/modules/demux/util/sub.c b/modules/demux/util/sub.c
index e01b995c7a70a351e6e1cb9639d691f5bb2d5bc5..c56e3edfef2569a8541bef605dd33c7c362b55a8 100644 (file)
--- a/modules/demux/util/sub.c
+++ b/modules/demux/util/sub.c
@@ -1,10 +1,11 @@
 /*****************************************************************************
- * sub.c
+ * sub.c: subtitle demux for external subtitle files
  *****************************************************************************
- * Copyright (C) 1999-2003 VideoLAN
- * $Id: sub.c,v 1.43 2004/01/26 20:26:54 gbazin Exp $
+ * Copyright (C) 1999-2004 VideoLAN
+ * $Id: sub.c,v 1.44 2004/01/26 22:32:51 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
+ *          Derk-Jan Hartman <hartman at videolan dot 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
@@ -45,8 +46,7 @@ static int  Open ( vlc_object_t *p_this );
 static int  sub_open ( subtitle_demux_t *p_sub,
                        input_thread_t  *p_input,
                        char  *psz_name,
-                       mtime_t i_microsecperframe,
-                       int i_track_id );
+                       mtime_t i_microsecperframe );
 static int  sub_demux( subtitle_demux_t *p_sub, mtime_t i_maxdate );
 static int  sub_seek ( subtitle_demux_t *p_sub, mtime_t i_date );
 static void sub_close( subtitle_demux_t *p_sub );
@@ -256,8 +256,7 @@ static char * local_stristr( char *psz_big, char *psz_little)
  * sub_open: Open a subtitle file and add subtitle ES
  *****************************************************************************/
 static int sub_open( subtitle_demux_t *p_sub, input_thread_t  *p_input,
-                     char *psz_name, mtime_t i_microsecperframe,
-                     int i_track_id )
+                     char *psz_name, mtime_t i_microsecperframe )
 {
     text_t  txt;
     vlc_value_t val;

diff --git a/modules/demux/util/sub.h b/modules/demux/util/sub.h
index 77fd3bc8bcccd9dec4992a7aac88a8d975555525..513116887ca640729d5bb2d6b2c5fa50e16f6aef 100644 (file)
--- a/modules/demux/util/sub.h
+++ b/modules/demux/util/sub.h
@@ -1,8 +1,8 @@
 /*****************************************************************************
  * sub.h
  *****************************************************************************
- * Copyright (C) 2001-2003 VideoLAN
- * $Id: sub.h,v 1.14 2004/01/26 20:26:54 gbazin Exp $
+ * Copyright (C) 2001-2004 VideoLAN
+ * $Id: sub.h,v 1.15 2004/01/26 22:32:51 hartman Exp $
  *
  * Authors: Laurent Aimar <fenrir@via.ecp.fr>
  *
@@ -40,22 +40,6 @@ typedef struct subtitle_s
 
 } subtitle_t;
 
-#if 0
-typedef struct
-{
-    int             i_track_id;
-    char            *psz_header;
-    int             i_subtitle;
-    int             i_subtitles;
-    subtitle_t      *subtitle;
-    char            *psz_language;
-
-    int             i_previously_selected; /* to make pf_seek */
-    es_descriptor_t *p_es;
-
-} subtitle_track_t;
-#endif
-
 typedef struct subtitle_demux_s
 {
     VLC_COMMON_MEMBERS
@@ -83,10 +67,6 @@ typedef struct subtitle_demux_s
     int                 i_previously_selected; /* to make pf_seek */
     FILE                *p_vobsub_file;
 
-    /*unsigned int i_tracks;
-    subtitle_track_t *p_tracks
-    */
-
 } subtitle_demux_t;
 
 /*****************************************************************************
@@ -103,8 +83,7 @@ typedef struct subtitle_demux_s
  *****************************************************************************/
 static inline subtitle_demux_t *subtitle_New( input_thread_t *p_input,
                                               char *psz_name,
-                                              mtime_t i_microsecperframe,
-                                              int i_track_id )
+                                              mtime_t i_microsecperframe )
 {
     subtitle_demux_t *p_sub;
 
@@ -114,8 +93,7 @@ static inline subtitle_demux_t *subtitle_New( input_thread_t *p_input,
     p_sub->p_module = module_Need( p_sub, "subtitle demux", "" );
 
     if( p_sub->p_module &&
-        p_sub->pf_open( p_sub, p_input, psz_name, i_microsecperframe,
-                        i_track_id ) >=0 )
+        p_sub->pf_open( p_sub, p_input, psz_name, i_microsecperframe ) >=0 )
     {
         msg_Info( p_input, "subtitle started" );