From 182d528760cba355dfc35c9e8e27651c30e6fb76 Mon Sep 17 00:00:00 2001
From: Michael Roitzsch <mroi@users.sourceforge.net>
Date: Sun, 29 Dec 2002 16:48:34 +0000
Subject: remove old hack for sputext

CVS patchset: 3719
CVS date: 2002/12/29 16:48:34
---
 src/demuxers/demux_avi.c | 43 +------------------------------------------
 src/input/input_file.c   | 28 ++--------------------------
 src/input/input_plugin.h |  5 +----
 3 files changed, 4 insertions(+), 72 deletions(-)

diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index c7f46fc12..c5bfceebe 100644
--- a/src/demuxers/demux_avi.c
+++ b/src/demuxers/demux_avi.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_avi.c,v 1.141 2002/12/23 21:29:57 miguelfreitas Exp $
+ * $Id: demux_avi.c,v 1.142 2002/12/29 16:48:34 mroi Exp $
  *
  * demultiplexer for avi streams
  *
@@ -183,7 +183,6 @@ typedef struct demux_avi_s {
   int                  status;
 
   int                  no_audio;
-  int                  have_spu;
 
   uint32_t             video_step;
   uint32_t             AVI_errno;
@@ -1129,23 +1128,6 @@ static int demux_avi_next (demux_avi_t *this, int decoder_flags) {
     */
 
     this->video_fifo->put (this->video_fifo, buf);
-
-    /*
-     * send packages to inform & drive text spu decoder
-     */
-
-    if (this->have_spu && (buf->decoder_flags & BUF_FLAG_FRAME_END)) {
-      buf_element_t *buf;
-      buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-
-      buf->decoder_flags = BUF_FLAG_FRAME_END;
-      buf->type          = BUF_SPU_TEXT;
-      buf->pts           = video_pts;
-
-      buf->decoder_info[1] = this->avi->video_posf;
-
-      this->video_fifo->put (this->video_fifo, buf);
-    }
   }
 
   if( buf ) {
@@ -1285,29 +1267,6 @@ static void demux_avi_send_headers (demux_plugin_t *this_gen) {
           this->audio_fifo->put (this->audio_fifo, buf);
         }
       }
-
-      /*
-       * send external spu file pointer, if present
-       */
-
-      if (this->input->get_optional_data (this->input, &sub, INPUT_OPTIONAL_DATA_TEXTSPU0)) {
-        buf = this->video_fifo->buffer_pool_alloc (this->video_fifo);
-        buf->content = sub;
-
-        buf->type = BUF_SPU_TEXT;
-
-        buf->decoder_flags   = BUF_FLAG_HEADER;
-        buf->decoder_info[1] = this->avi->width;
-        buf->decoder_info[2] = this->avi->height;
-
-        this->video_fifo->put (this->video_fifo, buf);
-
-        this->have_spu = 1;
-
-        printf ("demux_avi: text subtitle file available\n");
-
-      } else
-        this->have_spu = 0;
     }
 
     /*
diff --git a/src/input/input_file.c b/src/input/input_file.c
index e314cf948..42702855e 100644
--- a/src/input/input_file.c
+++ b/src/input/input_file.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: input_file.c,v 1.71 2002/12/27 16:47:10 miguelfreitas Exp $
+ * $Id: input_file.c,v 1.72 2002/12/29 16:48:34 mroi Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -71,7 +71,7 @@ typedef struct {
 
 static uint32_t file_plugin_get_capabilities (input_plugin_t *this_gen) {
 
-  return INPUT_CAP_SEEKABLE | INPUT_CAP_SPULANG;
+  return INPUT_CAP_SEEKABLE;
 }
 
 
@@ -188,30 +188,6 @@ static int file_plugin_get_optional_data (input_plugin_t *this_gen,
 	  data_type, this->sub);
 #endif
 
-  switch(data_type) {
-  case INPUT_OPTIONAL_DATA_TEXTSPU0:
-    if(this->sub) {
-      FILE **tmp;
-      
-      /* dirty hacks... */
-      tmp = data;
-      *tmp = this->sub;
-      
-      return INPUT_OPTIONAL_SUCCESS;
-    }
-    break;
-    
-  case INPUT_OPTIONAL_DATA_SPULANG:
-    sprintf(data, "%3s", (this->sub) ? "sub" : "none");
-    return INPUT_OPTIONAL_SUCCESS;
-    break;
-    
-  default:
-    return INPUT_OPTIONAL_UNSUPPORTED;
-    break;
-
-  }
-
   return INPUT_OPTIONAL_UNSUPPORTED;
 }
 
diff --git a/src/input/input_plugin.h b/src/input/input_plugin.h
index 138fef60d..2bd26461b 100644
--- a/src/input/input_plugin.h
+++ b/src/input/input_plugin.h
@@ -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: input_plugin.h,v 1.42 2002/12/21 12:56:47 miguelfreitas Exp $
+ * $Id: input_plugin.h,v 1.43 2002/12/29 16:48:35 mroi Exp $
  */
 
 #ifndef HAVE_INPUT_PLUGIN_H
@@ -253,9 +253,6 @@ struct input_plugin_s {
 
 #define INPUT_OPTIONAL_DATA_AUDIOLANG 2
 #define INPUT_OPTIONAL_DATA_SPULANG   3
-#define INPUT_OPTIONAL_DATA_TEXTSPU0  4
-#define INPUT_OPTIONAL_DATA_TEXTSPU1  5
-#define INPUT_OPTIONAL_DATA_TEXTSPU2  6
 #define INPUT_OPTIONAL_DATA_PREVIEW   7
 
 #define MAX_MRL_ENTRIES 255
-- 
cgit v1.2.3