[xine-cvs] CVS: xine-lib/src/xine-engine load_plugins.c,1.34,1.35 xine_internal.h,1.35,1.36

[Guenter B. <gu...@us...>]

Update of /cvsroot/xine/xine-lib/src/xine-engine
In directory usw-pr-cvs1:/tmp/cvs-serv15873/src/xine-engine

Modified Files:
	load_plugins.c xine_internal.h 
Log Message:
fixed video/audio/spu decoder version handling

Index: load_plugins.c
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/load_plugins.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -r1.34 -r1.35
--- load_plugins.c	2001/07/27 21:46:59	1.34
+++ load_plugins.c	2001/07/30 17:13:22	1.35
@@ -252,48 +252,39 @@
  *  Decoder plugins section
  */
 static int decide_spu_insert(spu_decoder_t *p, int streamtype, int prio) {
-int plugin_prio;
+
   if (!p->can_handle (p, (streamtype<<16) | BUF_SPU_BASE))
     return 0;
-  /* Only iface_version 2 is known to have priorities */
-  if (p->interface_version == 2)
-    plugin_prio = p->priority;
-  else
-    plugin_prio = 5;
-  if (plugin_prio < prio)
+  
+  if (p->priority < prio)
     return 0;
+
   /* All conditions successfully passed */
-  return plugin_prio;
+  return p->priority;
 }
 
 static int decide_video_insert(video_decoder_t *p, int streamtype, int prio) {
-int plugin_prio;
+
   if (!p->can_handle (p, (streamtype<<16) | BUF_VIDEO_BASE))
     return 0;
-  /* Only iface_version 2 is known to have priorities */
-  if (p->interface_version == 2)
-    plugin_prio = p->priority;
-  else
-    plugin_prio = 5;
-  if (plugin_prio < prio)
+
+  if (p->priority < prio)
     return 0;
+
   /* All conditions successfully passed */
-  return plugin_prio;
+  return p->priority;
 }
 
 static int decide_audio_insert(audio_decoder_t *p, int streamtype, int prio) {
-int plugin_prio;
+
   if (!p->can_handle (p, (streamtype<<16) | BUF_AUDIO_BASE))
     return 0;
-  /* Only iface_version 2 is known to have priorities */
-  if (p->interface_version == 2)
-    plugin_prio = p->priority;
-  else
-    plugin_prio = 5;
-  if (plugin_prio < prio)
+
+  if (p->priority < prio)
     return 0;
+
   /* All conditions successfully passed */
-  return plugin_prio;
+  return p->priority;
 }
 
 /*
@@ -381,19 +372,19 @@
             int            streamtype;
 
             sdp = (spu_decoder_t *) initplug(iface_version, config);
-            sdp->metronom = this->metronom;
+	    if (sdp) {
+	      sdp->metronom = this->metronom;
 
-            printf("SPU Can Handle ?\n");
-            for (streamtype = 0; streamtype<DECODER_PLUGIN_MAX; streamtype++)
-              if ((plugin_prio =
-              decide_spu_insert(sdp, streamtype, spu_prio[streamtype]))) {
-                printf("SPU Can Handle yes %x\n",streamtype);
-                this->spu_decoder_plugins[streamtype] = sdp;
-                spu_prio[streamtype] = plugin_prio;
-              }
-
-            printf("spu decoder plugin found : %s\n",
-			   sdp->get_identifier());
+	      for (streamtype = 0; streamtype<DECODER_PLUGIN_MAX; streamtype++)
+		if ((plugin_prio =
+		     decide_spu_insert(sdp, streamtype, spu_prio[streamtype]))) {
+		  this->spu_decoder_plugins[streamtype] = sdp;
+		  spu_prio[streamtype] = plugin_prio;
+		}
+	      
+	      printf("spu decoder plugin found : %s\n",
+		     sdp->get_identifier());
+	    }
 	  }
 
 	  /*
@@ -406,18 +397,19 @@
 	    int              streamtype;
 	      
 	    vdp = (video_decoder_t *) initplug(iface_version, config);
-	    vdp->metronom = this->metronom;
+	    if (vdp) {
+	      vdp->metronom = this->metronom;
 
-            for (streamtype = 0; streamtype<DECODER_PLUGIN_MAX; streamtype++)
-              if ((plugin_prio =
-              decide_video_insert(vdp, streamtype, video_prio[streamtype]))) {
-                this->video_decoder_plugins[streamtype] = vdp;
-                video_prio[streamtype] = plugin_prio;
-              }
+	      for (streamtype = 0; streamtype<DECODER_PLUGIN_MAX; streamtype++)
+		if ((plugin_prio =
+		     decide_video_insert(vdp, streamtype, video_prio[streamtype]))) {
+		  this->video_decoder_plugins[streamtype] = vdp;
+		  video_prio[streamtype] = plugin_prio;
+		}
 	    
-	    printf("video decoder plugin found : %s\n", 
-		   vdp->get_identifier());
-
+	      printf("video decoder plugin found : %s\n", 
+		     vdp->get_identifier());
+	    }
 	  }
 	  
 	  /*
@@ -430,17 +422,18 @@
 	    int              streamtype;
 	      
 	    adp = (audio_decoder_t *) initplug(iface_version, config);
-
-	    for (streamtype = 0; streamtype<DECODER_PLUGIN_MAX; streamtype++)
-              if ((plugin_prio =
-              decide_audio_insert(adp, streamtype, audio_prio[streamtype]))) {
-		this->audio_decoder_plugins[streamtype] = adp; 
-                audio_prio[streamtype] = plugin_prio;
-              }
-
-	    printf("audio decoder plugin found : %s\n", 
-		   adp->get_identifier());
-
+	    if (adp) {
+	    
+	      for (streamtype = 0; streamtype<DECODER_PLUGIN_MAX; streamtype++)
+		if ((plugin_prio =
+		     decide_audio_insert(adp, streamtype, audio_prio[streamtype]))) {
+		  this->audio_decoder_plugins[streamtype] = adp; 
+		  audio_prio[streamtype] = plugin_prio;
+		}
+	      
+	      printf("audio decoder plugin found : %s\n", 
+		     adp->get_identifier());
+	    }
 	  }
 	  
 	}

Index: xine_internal.h
===================================================================
RCS file: /cvsroot/xine/xine-lib/src/xine-engine/xine_internal.h,v
retrieving revision 1.35
retrieving revision 1.36
diff -u -r1.35 -r1.36
--- xine_internal.h	2001/07/26 11:12:26	1.35
+++ xine_internal.h	2001/07/30 17:13:22	1.36
@@ -42,7 +42,7 @@
 #define INPUT_PLUGIN_MAX       50
 #define DEMUXER_PLUGIN_MAX     50
 #define DECODER_PLUGIN_MAX     256
-#define DECODER_PLUGIN_IFACE_VERSION      1
+#define DECODER_PLUGIN_IFACE_VERSION      2
 #define AUDIO_OUT_PLUGIN_MAX   50
 #define VIDEO_OUT_PLUGIN_MAX   50
 #define XINE_MAX_EVENT_LISTENERS 50