Merge from 1.2 main.

1 files changed, 4 insertions, 18 deletions

diff --git a/src/audio_out/audio_directx_out.c b/src/audio_out/audio_directx_out.c
index 77e3e15b9..c7dea4e04 100644
--- a/src/audio_out/audio_directx_out.c
+++ b/src/audio_out/audio_directx_out.c
@@ -52,7 +52,7 @@ typedef unsigned char boolean;
 #define DSBUFF_LEFT		  1
 #define DSBUFF_RIGHT	          2
 
-#define AO_DIRECTX_IFACE_VERSION  8
+#define AO_DIRECTX_IFACE_VERSION  9
 
 /*****************************************************************************
  * DirectDraw GUIDs.
@@ -819,20 +819,6 @@ static ao_driver_t *open_plugin (audio_driver_class_t *class_gen, const void *da
   return ( ao_driver_t * ) ao_directx;
 }
 
-static char* get_identifier (audio_driver_class_t *this_gen) {
-  return "DirectX";
-}
-
-static char* get_description (audio_driver_class_t *this_gen) {
-  return _("xine audio output plugin for win32 using directx");
-}
-
-static void dispose_class (audio_driver_class_t *this_gen) {
-  audiox_class_t  *audiox = (audiox_class_t *) this_gen;
-
-  free (audiox);
-}
-
 static void *init_class (xine_t *xine, void *data) {
   audiox_class_t    *audiox;
 
@@ -846,9 +832,9 @@ static void *init_class (xine_t *xine, void *data) {
     return NULL;
   
   audiox->driver_class.open_plugin     = open_plugin;
-  audiox->driver_class.get_identifier  = get_identifier;
-  audiox->driver_class.get_description = get_description;
-  audiox->driver_class.dispose         = dispose_class;
+  audiox->driver_class.identifier      = "DirectX";
+  audiox->driver_class.description     = N_("xine audio output plugin for win32 using directx");
+  audiox->driver_class.dispose         = default_audio_driver_class_dispose;
 
   audiox->xine                         = xine;
   audiox->config                       = xine->config;