add avi subtitle decoder (based on mplayer code), minor cleanups, removed register_empty function from configfile (undocumented and doesn't make sense)

CVS patchset: 1153
CVS date: 2001/12/01 22:38:31

4 files changed, 12 insertions, 29 deletions

diff --git a/src/xine-engine/buffer.h b/src/xine-engine/buffer.h
index 22288ecbd..480f1031e 100644
--- a/src/xine-engine/buffer.h
+++ b/src/xine-engine/buffer.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: buffer.h,v 1.25 2001/11/30 19:31:55 jcdutton Exp $
+ * $Id: buffer.h,v 1.26 2001/12/01 22:38:32 guenter Exp $
  *
  *
  * contents:
@@ -123,6 +123,7 @@ extern "C" {
 #define BUF_SPU_PACKAGE		0x04010000
 #define BUF_SPU_SUBP_CONTROL	0x04020000
 #define BUF_SPU_NAV		0x04030000
+#define BUF_SPU_TEXT            0x04040000
 
 /* demuxer block types: */
 
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index abde13c37..02e220733 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.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: configfile.c,v 1.12 2001/11/30 21:55:06 f1rmb Exp $
+ * $Id: configfile.c,v 1.13 2001/12/01 22:38:32 guenter Exp $
  *
  * config file management - implementation
  *
@@ -101,27 +101,6 @@ cfg_entry_t *config_file_lookup_entry (config_values_t *this, char *key) {
 }
 
 
-static void config_file_register_empty (config_values_t *this, char *key) {
-  cfg_entry_t *entry;
-  
-  assert(key);
-  
-#ifdef CONFIG_LOG
-  printf ("configfile: register empty %s\n", key);
-#endif
-  
-  entry = config_file_lookup_entry (this, key);
-  
-  /* 
-   * Don't register as empty if entry already exist.
-   */
-  if(entry)
-    return;
-  
-  entry = config_file_add (this, key);
-}
-
-
 static char *config_file_register_string (config_values_t *this,
 					  char *key, char *def_value,
 					  char *description, 
@@ -594,7 +573,6 @@ config_values_t *config_file_init (char *filename) {
     exit (1);
   }
 
-  this->register_empty  = config_file_register_empty;
   this->register_string = config_file_register_string;
   this->register_range  = config_file_register_range;
   this->register_enum   = config_file_register_enum;
@@ -613,6 +591,9 @@ config_values_t *config_file_init (char *filename) {
 
 /*
  * $Log: configfile.c,v $
+ * Revision 1.13  2001/12/01 22:38:32  guenter
+ * add avi subtitle decoder (based on mplayer code), minor cleanups, removed register_empty function from configfile (undocumented and doesn't make sense)
+ *
  * Revision 1.12  2001/11/30 21:55:06  f1rmb
  * Add an automatic way for input plugin to add extra valid mrls:
  * add at bottom of init_input_plugin() a line like this:
diff --git a/src/xine-engine/configfile.h b/src/xine-engine/configfile.h
index 4085098b8..74831d526 100644
--- a/src/xine-engine/configfile.h
+++ b/src/xine-engine/configfile.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: configfile.h,v 1.6 2001/11/30 21:55:06 f1rmb Exp $
+ * $Id: configfile.h,v 1.7 2001/12/01 22:38:32 guenter Exp $
  *
  * config file management
  *
@@ -95,9 +95,6 @@ struct config_values_s {
    * from the config file otherwise
    */
 
-  void (*register_empty) (config_values_t *this, 
-			  char *key);
-
   char* (*register_string) (config_values_t *this,
 			    char *key, 
 			    char *def_value,
@@ -191,6 +188,9 @@ config_values_t *config_file_init (char *filename);
 
 /*
  * $Log: configfile.h,v $
+ * Revision 1.7  2001/12/01 22:38:32  guenter
+ * add avi subtitle decoder (based on mplayer code), minor cleanups, removed register_empty function from configfile (undocumented and doesn't make sense)
+ *
  * Revision 1.6  2001/11/30 21:55:06  f1rmb
  * Add an automatic way for input plugin to add extra valid mrls:
  * add at bottom of init_input_plugin() a line like this:
diff --git a/src/xine-engine/video_decoder.c b/src/xine-engine/video_decoder.c
index d03d8d7ba..4d4c10b6c 100644
--- a/src/xine-engine/video_decoder.c
+++ b/src/xine-engine/video_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: video_decoder.c,v 1.65 2001/11/17 14:26:39 f1rmb Exp $
+ * $Id: video_decoder.c,v 1.66 2001/12/01 22:38:32 guenter Exp $
  *
  */
 
@@ -134,6 +134,7 @@ void *video_decoder_loop (void *this_gen) {
     case BUF_SPU_SUBP_CONTROL:
     case BUF_SPU_CLUT:
     case BUF_SPU_PACKAGE:
+    case BUF_SPU_TEXT:
       xine_profiler_start_count (prof_spu_decode);
 
       spu_decoder = update_spu_decoder(this, buf->type);