Merge from 1.2 main.

1 files changed, 4 insertions, 20 deletions

diff --git a/src/audio_out/audio_directx2_out.c b/src/audio_out/audio_directx2_out.c
index d9688b647..9bcc52233 100644
--- a/src/audio_out/audio_directx2_out.c
+++ b/src/audio_out/audio_directx2_out.c
@@ -62,7 +62,7 @@
 #include "audio_out.h"
 
 
-#define AO_OUT_DIRECTX2_IFACE_VERSION 8
+#define AO_OUT_DIRECTX2_IFACE_VERSION 9
 
 /* 
  * buffer size in miliseconds 
@@ -988,22 +988,6 @@ static ao_driver_t *open_plugin(audio_driver_class_t *class_gen, const void *dat
   return (ao_driver_t *)this;
 }
 
-
-static char* get_identifier(audio_driver_class_t *this_gen) {
-  return "directx2";
-}
-
-
-static char *get_description(audio_driver_class_t *this_gen) {
-  return _("second xine audio output plugin using directx");
-}
-
-
-static void dispose_class(audio_driver_class_t *this_gen) {
-  free(this_gen);
-}
-
-
 static void *init_class(xine_t *xine, void *data) {
   dx2_class_t *this;
 
@@ -1014,9 +998,9 @@ static void *init_class(xine_t *xine, void *data) {
     return NULL;
 
   this->driver_class.open_plugin     = open_plugin;
-  this->driver_class.get_identifier  = get_identifier;
-  this->driver_class.get_description = get_description;
-  this->driver_class.dispose         = dispose_class;
+  this->driver_class.identifier      = "directx2";
+  this->driver_class.description     = N_("second xine audio output plugin using directx");
+  this->driver_class.dispose         = default_audio_driver_class_dispose;
 
   this->xine = xine;