small cleanup

impressive work, Miguel!

CVS patchset: 3868
CVS date: 2003/01/11 11:34:15

2 files changed, 7 insertions, 15 deletions

diff --git a/src/libsputext/demux_sputext.c b/src/libsputext/demux_sputext.c
index f95ce177e..afb5f9d11 100644
--- a/src/libsputext/demux_sputext.c
+++ b/src/libsputext/demux_sputext.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: demux_sputext.c,v 1.7 2003/01/11 03:47:01 miguelfreitas Exp $
+ * $Id: demux_sputext.c,v 1.8 2003/01/11 11:34:15 mroi Exp $
  *
  * code based on old libsputext/xine_decoder.c
  *
@@ -53,9 +53,7 @@
 */
 
 #define ERR (void *)-1
-
 #define SUB_MAX_TEXT  5
-
 #define SUB_BUFSIZE 1024
 
 /*
@@ -67,8 +65,8 @@ typedef struct {
 
   int lines;
 
-  unsigned long start; /* hsecs */
-  unsigned long end;   /* hsecs */
+  unsigned long start; /* csecs */
+  unsigned long end;   /* csecs */
     
   char *text[SUB_MAX_TEXT];
 
diff --git a/src/libsputext/xine_decoder.c b/src/libsputext/xine_decoder.c
index d6b3d3666..b7d5171ba 100644
--- a/src/libsputext/xine_decoder.c
+++ b/src/libsputext/xine_decoder.c
@@ -17,7 +17,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
  *
- * $Id: xine_decoder.c,v 1.43 2003/01/11 03:47:01 miguelfreitas Exp $
+ * $Id: xine_decoder.c,v 1.44 2003/01/11 11:34:15 mroi Exp $
  *
  */
 
@@ -68,13 +68,9 @@ typedef struct sputext_decoder_s {
   sputext_class_t   *class;
   xine_stream_t     *stream;
 
-  int                output_open;
-
   int                lines;
   char               text[SUB_MAX_TEXT][SUB_BUFSIZE];
 
-  float              mpsub_position;  
-
   int                width;          /* frame width                */
   int                height;         /* frame height               */
   int                font_size;
@@ -204,10 +200,10 @@ static void spudec_decode_data (spu_decoder_t *this_gen, buf_element_t *buf) {
   }
   
   printf("libsputext: decoder data [%s]\n", this->text[0]);
-  printf("libsputext: mode %d timming %d->%d\n", uses_time, start, end);
+  printf("libsputext: mode %d timing %d->%d\n", uses_time, start, end);
 
   if( end <= start ) {
-    printf("libsputext: discarding subtitle with invalid timming\n");
+    printf("libsputext: discarding subtitle with invalid timing\n");
   }
   
   if( this->stream->master_stream )
@@ -324,7 +320,7 @@ static void spudec_dispose (spu_decoder_t *this_gen) {
     this->renderer->free_object (this->osd);
     this->osd = NULL;
   }
-
+  free(this);
 }
 
 static void update_osd_font(void *this_gen, xine_cfg_entry_t *entry)
@@ -394,8 +390,6 @@ static spu_decoder_t *sputext_class_open_plugin (spu_decoder_class_t *class_gen,
 			        NULL, 10, update_time_offset, this);
 
 
-  this->mpsub_position     = 0;
-
   return (spu_decoder_t *) this;
 }