1 files changed, 12 insertions, 46 deletions

diff --git a/src/demuxers/demux_cdda.c b/src/demuxers/demux_cdda.c
index 6aee5042e..f936ff4f2 100644
--- a/src/demuxers/demux_cdda.c
+++ b/src/demuxers/demux_cdda.c
@@ -41,10 +41,10 @@
 /* #define LOG_VERBOSE */
 /* #define LOG */
 
-#include "xine_internal.h"
-#include "xineutils.h"
-#include "demux.h"
-#include "buffer.h"
+#include <xine/xine_internal.h>
+#include <xine/xineutils.h>
+#include <xine/demux.h>
+#include <xine/buffer.h>
 #include "bswap.h"
 #include "group_audio.h"
 
@@ -159,12 +159,6 @@ static int demux_cdda_seek (demux_plugin_t *this_gen, off_t start_pos, int start
   return this->status;
 }
 
-static void demux_cdda_dispose (demux_plugin_t *this_gen) {
-  demux_cdda_t *this = (demux_cdda_t *) this_gen;
-
-  free(this);
-}
-
 static int demux_cdda_get_status (demux_plugin_t *this_gen) {
   demux_cdda_t *this = (demux_cdda_t *) this_gen;
 
@@ -200,7 +194,7 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   this->demux_plugin.send_headers      = demux_cdda_send_headers;
   this->demux_plugin.send_chunk        = demux_cdda_send_chunk;
   this->demux_plugin.seek              = demux_cdda_seek;
-  this->demux_plugin.dispose           = demux_cdda_dispose;
+  this->demux_plugin.dispose           = default_demux_plugin_dispose;
   this->demux_plugin.get_status        = demux_cdda_get_status;
   this->demux_plugin.get_stream_length = demux_cdda_get_stream_length;
   this->demux_plugin.get_capabilities  = demux_cdda_get_capabilities;
@@ -212,14 +206,8 @@ static demux_plugin_t *open_plugin (demux_class_t *class_gen, xine_stream_t *str
   switch (stream->content_detection_method) {
 
   case METHOD_BY_CONTENT:
-  case METHOD_BY_EXTENSION:
-    if (strncasecmp (input->get_mrl (input), "cdda:", 5)) {
-      free (this);
-      return NULL;
-    }
-
-  break;
-
+    return NULL;
+  case METHOD_BY_MRL:
   case METHOD_EXPLICIT:
   break;
 
@@ -231,39 +219,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 "CD Digital Audio demux plugin";
-}
-
-static const char *get_identifier (demux_class_t *this_gen) {
-  return "CDDA";
-}
-
-static const char *get_extensions (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static const char *get_mimetypes (demux_class_t *this_gen) {
-  return NULL;
-}
-
-static void class_dispose (demux_class_t *this_gen) {
-  demux_cdda_class_t *this = (demux_cdda_class_t *) this_gen;
-
-  free (this);
-}
-
 void *demux_cdda_init_plugin (xine_t *xine, void *data) {
   demux_cdda_class_t     *this;
 
   this = calloc(1, sizeof(demux_cdda_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     = N_("CD Digital Audio demux plugin");
+  this->demux_class.identifier      = "CDDA";
+  this->demux_class.mimetypes       = NULL;
+  this->demux_class.extensions      = "cdda:/";
+  this->demux_class.dispose         = default_demux_class_dispose;
 
   return this;
 }