fixed some typos in the demuxer plugins

CVS patchset: 40
CVS date: 2001/04/28 21:23:04

7 files changed, 27 insertions, 36 deletions

diff --git a/src/demuxers/demux_avi.c b/src/demuxers/demux_avi.c
index 83cd44bf9..0f4013c65 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.5 2001/04/27 23:51:52 guenter Exp $
+ * $Id: demux_avi.c,v 1.6 2001/04/28 21:23:04 guenter Exp $
  *
  * demultiplexer for avi streams
  *
@@ -964,7 +964,7 @@ static char *demux_avi_get_id(void) {
   return "AVI";
 }
 
-demux_plugin_t *init_demux_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
 
   demux_avi_t *this = xmalloc (sizeof (demux_avi_t));
 
diff --git a/src/demuxers/demux_mpeg.c b/src/demuxers/demux_mpeg.c
index ecdd17ef0..6011627b1 100644
--- a/src/demuxers/demux_mpeg.c
+++ b/src/demuxers/demux_mpeg.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_mpeg.c,v 1.4 2001/04/24 17:42:26 guenter Exp $
+ * $Id: demux_mpeg.c,v 1.5 2001/04/28 21:23:04 guenter Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  * reads streams of variable blocksizes
@@ -608,7 +608,7 @@ static void demux_mpeg_close (demux_plugin_t *this) {
   /* nothing */
 }
 
-demux_plugin_t *init_demux_plugin(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
 
   demux_mpeg_t *this = xmalloc (sizeof (demux_mpeg_t));
 
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 1ee29506f..ac18aae9c 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.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_mpeg_block.c,v 1.4 2001/04/24 17:42:26 guenter Exp $
+ * $Id: demux_mpeg_block.c,v 1.5 2001/04/28 21:23:04 guenter Exp $
  *
  * demultiplexer for mpeg 1/2 program streams
  *
@@ -325,7 +325,7 @@ static void *demux_mpeg_block_loop (void *this_gen) {
   } while (this->status == DEMUX_OK) ;
 
   xprintf (VERBOSE|DEMUX, "demux loop finished (status: %d)\n",
-	   this->mnStatus);
+	   this->status);
 
   this->status = DEMUX_FINISHED;
 
@@ -502,7 +502,7 @@ static void demux_mpeg_block_close (demux_plugin_t *this) {
   /* nothing */
 }
 
-demux_plugin_t *init_demux_mpeg_block(int iface, config_values_t *config) {
+demux_plugin_t *init_demuxer_plugin(int iface, config_values_t *config) {
 
   demux_mpeg_block_t *this = xmalloc (sizeof (demux_mpeg_block_t));
 
diff --git a/src/input/input_file.c b/src/input/input_file.c
index 5c1f76083..b71e6121d 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.4 2001/04/24 17:42:27 guenter Exp $
+ * $Id: input_file.c,v 1.5 2001/04/28 21:23:04 guenter Exp $
  */
 
 #ifdef HAVE_CONFIG_H
@@ -166,7 +166,7 @@ static char *file_plugin_get_identifier (input_plugin_t *this_gen) {
   return "file";
 }
 
-input_plugin_t *get_input_plugin (int iface, config_values_t *config) {
+input_plugin_t *init_input_plugin (int iface, config_values_t *config) {
 
   file_input_plugin_t *this;
 
diff --git a/src/video_out/Makefile.am b/src/video_out/Makefile.am
index 2cb32cc4b..f78d10ed5 100644
--- a/src/video_out/Makefile.am
+++ b/src/video_out/Makefile.am
@@ -1,6 +1,6 @@
 CFLAGS = @GLOBAL_CFLAGS@ @X_CFLAGS@ -DXINE_COMPILE
 
-LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
+# LIBTOOL = $(SHELL) $(top_builddir)/libtool-nofpic
 
 libdir = $(XINE_PLUGINDIR)
 
diff --git a/src/xine-engine/load_plugins.c b/src/xine-engine/load_plugins.c
index 7e35e4f6b..bf40d3115 100644
--- a/src/xine-engine/load_plugins.c
+++ b/src/xine-engine/load_plugins.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: load_plugins.c,v 1.12 2001/04/28 19:47:42 guenter Exp $
+ * $Id: load_plugins.c,v 1.13 2001/04/28 21:23:04 guenter Exp $
  *
  *
  * Load input/demux/audio_out/video_out/codec plugins
@@ -156,13 +156,13 @@ void load_input_plugins (xine_t *this,
 	 */
 	
 	sprintf (str, "%s/%s", XINE_PLUGINDIR, pEntry->d_name);
+
+	printf ("load_plugins: trying to load input plugin >%s<\n",str);
 	
 	if(!(plugin = dlopen (str, RTLD_LAZY))) {
-	  fprintf(stderr, "%s(%d): %s doesn't seem to be installed (%s)\n", 
-		  __FILE__, __LINE__, str, dlerror());
-	  exit(1);
-	}
-	else {
+	  printf("load_plugins: cannot open input plugin %s: %s\n", 
+		 str, dlerror());
+	} else {
 	  void *(*initplug) (int, config_values_t *);
 	  
 	  if((initplug = dlsym(plugin, "init_input_plugin")) != NULL) {
@@ -171,12 +171,14 @@ void load_input_plugins (xine_t *this,
 	    ip = (input_plugin_t *) initplug(iface_version, config);
 	    this->input_plugins[this->num_input_plugins] = ip; 
 	    
-	    printf("input plugin found : %s(ID: %s, iface: %d)\n", 
+	    printf("load_plugins: input plugin found : %s(ID: %s, iface: %d)\n", 
 		   str,   
 		   this->input_plugins[this->num_input_plugins]->get_identifier(this->input_plugins[this->num_input_plugins]),
 		   this->input_plugins[this->num_input_plugins]->interface_version);
 
 	    this->num_input_plugins++;
+	  } else {
+	    printf ("load_plugins: %s is no valid input plugin (lacks init_input_plugin() function)\n");
 	  }
 	  
 	  if(this->num_input_plugins > INPUT_PLUGIN_MAX) {
@@ -190,7 +192,7 @@ void load_input_plugins (xine_t *this,
   }
   
   if (this->num_input_plugins == 0) {
-    printf ("No input plugins found in %s! - "
+    printf ("load_plugins: no input plugins found in %s! - "
 	    "Did you install xine correctly??\n", XINE_PLUGINDIR);
     exit (1);
   }
@@ -486,6 +488,8 @@ char **xine_list_audio_output_plugins() {
 	
 	sprintf (str, "%s/%s", XINE_PLUGINDIR, dir_entry->d_name);
 
+	/* printf ("load_plugins: trying to load plugin %s\n", str); */
+
 	/*
 	 * now, see if we can open this plugin,
 	 * and get it's id
@@ -501,6 +505,8 @@ char **xine_list_audio_output_plugins() {
 	  ao_info_t* (*getinfo) ();
 	  ao_info_t   *ao_info;
 
+	  /* printf ("load_plugins: plugin %s successfully loaded.\n", str); */
+
 	  if ((getinfo = dlsym(plugin, "get_audio_out_plugin_info")) != NULL) {
 	    ao_info = getinfo();
 
diff --git a/src/xine-engine/xine.c b/src/xine-engine/xine.c
index 32b40a33a..14e23be70 100644
--- a/src/xine-engine/xine.c
+++ b/src/xine-engine/xine.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.c,v 1.8 2001/04/28 19:47:42 guenter Exp $
+ * $Id: xine.c,v 1.9 2001/04/28 21:23:04 guenter Exp $
  *
  * top-level xine functions
  *
@@ -129,21 +129,8 @@ static int try_demux_with_stages(xine_t *this, const char *MRL,
 	
 	this->cur_demuxer_plugin = this->demuxer_plugins[i];
 	
-	xprintf(VERBOSE|DEMUX,"demuxer '%s' handle in stage '%s'.\n", 
-		this->demux_plugins[i].get_identifier(),
-		(stages[s] == STAGE_BY_CONTENT) ? "STAGE_BY_CONTENT"
-		: ((stages[s] == STAGE_BY_EXTENSION) ? "STAGE_BY_EXTENSION"
-		   : "UNKNOWN"));
 	return 1;
       }
-#ifdef DEBUG
-      else
-	xprintf(VERBOSE|DEMUX, "demuxer '%s' cannot handle in stage '%s'.\n", 
-		this->demuxer_plugins[i].get_identifier(),
-		(stages[s] == STAGE_BY_CONTENT) ? "STAGE_BY_CONTENT"
-		: ((stages[s] == STAGE_BY_EXTENSION) ? "STAGE_BY_EXTENSION"
-		   : "UNKNOWN"));
-#endif
     }
     s++;
   }
@@ -396,21 +383,19 @@ xine_t *xine_init (vo_driver_t *vo,
   this->config          = config;
   xine_debug            = config->lookup_int (config, "xine_debug", 0);
 
-#ifdef TEST_FILE
-  gTestFile = open ("/tmp/test.mp3", O_WRONLY | O_CREAT, 0644); 
-#endif
-
   /*
    * init lock
    */
 
   pthread_mutex_init (&this->xine_lock, NULL);
+  printf ("xine_init: lock created\n");
 
   /*
    * create a metronom
    */
 
   this->metronom = metronom_init ();
+  printf ("xine_init: metronom created\n");
 
   /*
    * load input and demuxer plugins