Merge with 1.2-plugins-changes.

2 files changed, 16 insertions, 66 deletions

diff --git a/src/libw32dll/qt_decoder.c b/src/libw32dll/qt_decoder.c
index 3053b2b68..ca358bb9b 100644
--- a/src/libw32dll/qt_decoder.c
+++ b/src/libw32dll/qt_decoder.c
@@ -569,19 +569,6 @@ static audio_decoder_t *qta_open_plugin (audio_decoder_class_t *class_gen,
 /*
  * qta plugin class
  */
-
-static char *qta_get_identifier (audio_decoder_class_t *this) {
-  return "qta";
-}
-
-static char *qta_get_description (audio_decoder_class_t *this) {
-  return "quicktime audio decoder plugin";
-}
-
-static void qta_dispose_class (audio_decoder_class_t *this) {
-  free (this);
-}
-
 static void *qta_init_class (xine_t *xine, void *data) {
 
   qta_class_t     *this;
@@ -595,9 +582,9 @@ static void *qta_init_class (xine_t *xine, void *data) {
   this = (qta_class_t *) xine_xmalloc (sizeof (qta_class_t));
 
   this->decoder_class.open_plugin     = qta_open_plugin;
-  this->decoder_class.get_identifier  = qta_get_identifier;
-  this->decoder_class.get_description = qta_get_description;
-  this->decoder_class.dispose         = qta_dispose_class;
+  this->decoder_class.identifier      = "qta";
+  this->decoder_class.description     = N_("quicktime audio decoder plugin");
+  this->decoder_class.dispose         = default_audio_decoder_class_dispose;
 
   return this;
 }
@@ -1081,18 +1068,6 @@ static video_decoder_t *qtv_open_plugin (video_decoder_class_t *class_gen,
  * qtv plugin class
  */
 
-static char *qtv_get_identifier (video_decoder_class_t *this) {
-  return "qtvdec";
-}
-
-static char *qtv_get_description (video_decoder_class_t *this) {
-  return "quicktime binary-only codec based video decoder plugin";
-}
-
-static void qtv_dispose_class (video_decoder_class_t *this) {
-  free (this);
-}
-
 /*
  * some fake functions to make qt codecs happy 
  */
@@ -1119,9 +1094,9 @@ static void *qtv_init_class (xine_t *xine, void *data) {
   this = (qtv_class_t *) xine_xmalloc (sizeof (qtv_class_t));
 
   this->decoder_class.open_plugin     = qtv_open_plugin;
-  this->decoder_class.get_identifier  = qtv_get_identifier;
-  this->decoder_class.get_description = qtv_get_description;
-  this->decoder_class.dispose         = qtv_dispose_class;
+  this->decoder_class.identifier      = "qtvdec";
+  this->decoder_class.description     = N_("quicktime binary-only codec based video decoder plugin");
+  this->decoder_class.dispose         = default_video_decoder_class_dispose;
 
   return this;
 }
@@ -1139,7 +1114,7 @@ static const decoder_info_t qtv_dec_info = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "qtv", XINE_VERSION_CODE, &qtv_dec_info, qtv_init_class },
-  { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "qta", XINE_VERSION_CODE, &qta_dec_info, qta_init_class },
+  { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "qtv", XINE_VERSION_CODE, &qtv_dec_info, qtv_init_class },
+  { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "qta", XINE_VERSION_CODE, &qta_dec_info, qta_init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };
diff --git a/src/libw32dll/w32codec.c b/src/libw32dll/w32codec.c
index 88790ebc7..3b66dfb23 100644
--- a/src/libw32dll/w32codec.c
+++ b/src/libw32dll/w32codec.c
@@ -1568,18 +1568,6 @@ static video_decoder_t *open_video_decoder_plugin (video_decoder_class_t *class_
  * video decoder class
  */
 
-static char *get_video_identifier (video_decoder_class_t *this) {
-  return "w32v";
-}
-
-static char *get_video_description (video_decoder_class_t *this) {
-  return "win32 binary video codec plugin";
-}
-
-static void dispose_video_class (video_decoder_class_t *this) {
-  free (this);
-}
-
 static void init_routine(void) {
   pthread_mutex_init (&win32_codec_mutex, NULL);
   w32v_init_rgb_ycc();
@@ -1596,9 +1584,9 @@ static void *init_video_decoder_class (xine_t *xine, void *data) {
   this = (w32v_class_t *) xine_xmalloc (sizeof (w32v_class_t));
 
   this->decoder_class.open_plugin     = open_video_decoder_plugin;
-  this->decoder_class.get_identifier  = get_video_identifier;
-  this->decoder_class.get_description = get_video_description;
-  this->decoder_class.dispose         = dispose_video_class;
+  this->decoder_class.identifier      = "w32v";
+  this->decoder_class.description     = N_("win32 binary video codec plugin");
+  this->decoder_class.dispose         = default_video_decoder_class_dispose;
 
   pthread_once (&once_control, init_routine);
   
@@ -1634,19 +1622,6 @@ static audio_decoder_t *open_audio_decoder_plugin (audio_decoder_class_t *class_
 /*
  * audio decoder plugin class
  */
-
-static char *get_identifier (audio_decoder_class_t *this) {
-  return "win32 audio";
-}
-
-static char *get_description (audio_decoder_class_t *this) {
-  return "win32 binary audio codec plugin";
-}
-
-static void dispose_class (audio_decoder_class_t *this) {
-  free (this);
-}
-
 static void *init_audio_decoder_class (xine_t *xine, void *data) {
 
   w32a_class_t    *this;
@@ -1658,9 +1633,9 @@ static void *init_audio_decoder_class (xine_t *xine, void *data) {
   this = (w32a_class_t *) xine_xmalloc (sizeof (w32a_class_t));
 
   this->decoder_class.open_plugin     = open_audio_decoder_plugin;
-  this->decoder_class.get_identifier  = get_identifier;
-  this->decoder_class.get_description = get_description;
-  this->decoder_class.dispose         = dispose_class;
+  this->decoder_class.identifier      = "win32 audio";
+  this->decoder_class.description     = N_("win32 binary audio codec plugin");
+  this->decoder_class.dispose         = default_audio_decoder_class_dispose;
 
   pthread_once (&once_control, init_routine);
 
@@ -1703,7 +1678,7 @@ static const decoder_info_t dec_info_audio = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
   /* type, API, "name", version, special_info, init_function */  
-  { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 18, "win32v", XINE_VERSION_CODE, &dec_info_video, init_video_decoder_class },
-  { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 15, "win32a", XINE_VERSION_CODE, &dec_info_audio, init_audio_decoder_class },
+  { PLUGIN_VIDEO_DECODER | PLUGIN_MUST_PRELOAD, 19, "win32v", XINE_VERSION_CODE, &dec_info_video, init_video_decoder_class },
+  { PLUGIN_AUDIO_DECODER | PLUGIN_MUST_PRELOAD, 16, "win32a", XINE_VERSION_CODE, &dec_info_audio, init_audio_decoder_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };