1 files changed, 12 insertions, 45 deletions

diff --git a/src/demuxers/demux_slave.c b/src/demuxers/demux_slave.c
index a00ad0661..80a5ebbf8 100644
--- a/src/demuxers/demux_slave.c
+++ b/src/demuxers/demux_slave.c
@@ -17,12 +17,10 @@
  * 
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA
  */
 
 /*
- * $Id: demux_slave.c,v 1.23 2007/01/19 01:05:24 dgp85 Exp $
- *
  * demuxer for slave "protocol"
  * master xine must be started with XINE_PARAM_BROADCASTER_PORT set, that is,
  * 'xine --broadcast-port <port_number>'
@@ -44,10 +42,10 @@
 #define LOG
 */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "compat.h"
-#include "demux.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/compat.h>
+#include <xine/demux.h>
 
 #define SCRATCH_SIZE        1024
 #define CHECK_VPTS_INTERVAL 2*90000
@@ -337,16 +335,6 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
 
   switch (stream->content_detection_method) {
 
-  case METHOD_BY_EXTENSION: {
-    const char *const mrl = input->get_mrl (input);
-
-    if(!strncmp(mrl, "slave://", 8))
-      break;
-
-    free (this);
-    return NULL;
-  }
-
   case METHOD_BY_CONTENT: {
 
     if (_x_demux_read_header(input, this->scratch, SCRATCH_SIZE) > 0) {
@@ -358,6 +346,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
     return NULL;
   }
 
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
   break;
 
@@ -391,39 +380,17 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   return &this->demux_plugin;
 }
 
-static const char *get_description (demux_class_t *this_gen) {
-  return "";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "slave";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return "";
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static void class_dispose (demux_class_t *this_gen) {
-  demux_slave_class_t *this = (demux_slave_class_t *) this_gen;
-
-  free (this);
-}
-
 static void *init_plugin (xine_t *xine, void *data) {
   demux_slave_class_t     *this;
 
   this = xine_xmalloc (sizeof (demux_slave_class_t));
 
   this->demux_class.open_plugin     = open_plugin;
-  this->demux_class.get_description = get_description;
-  this->demux_class.get_identifier  = get_identifier;
-  this->demux_class.get_mimetypes   = get_mimetypes;
-  this->demux_class.get_extensions  = get_extensions;
-  this->demux_class.dispose         = class_dispose;
+  this->demux_class.description     = "";
+  this->demux_class.identifier      = "slave";
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "slave://";
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }
@@ -437,6 +404,6 @@ static const demuxer_info_t demux_info_slave = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_DEMUX, 26, "slave", XINE_VERSION_CODE, &demux_info_slave, init_plugin },
+  { PLUGIN_DEMUX, 27, "slave", XINE_VERSION_CODE, &demux_info_slave, init_plugin },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };