Merge with 1.2-plugins-changes.

1 files changed, 4 insertions, 16 deletions

diff --git a/src/audio_out/audio_fusionsound_out.c b/src/audio_out/audio_fusionsound_out.c
index 92eadc6cf..ceda0a293 100644
--- a/src/audio_out/audio_fusionsound_out.c
+++ b/src/audio_out/audio_fusionsound_out.c
@@ -49,7 +49,7 @@
                                                 FUSIONSOUND_MICRO_VERSION )
 
 
-#define AO_OUT_FS_IFACE_VERSION 8
+#define AO_OUT_FS_IFACE_VERSION 9
 
 #define GAP_TOLERANCE  5000
 
@@ -434,18 +434,6 @@ static ao_driver_t* open_plugin(audio_driver_class_t *ao_class,
  * class functions
  */
 
-static char* get_identifier(audio_driver_class_t *ao_class) {
-  return "FusionSound";
-}
-
-static char* get_description(audio_driver_class_t *ao_class) {
-  return "xine FusionSound audio output plugin";
-}
-
-static void dispose_class(audio_driver_class_t *ao_class) {
-  free (ao_class);
-}
-
 static void* init_class(xine_t *xine, void *data) {
   fusionsound_class_t *class;
   const char          *error;
@@ -468,9 +456,9 @@ static void* init_class(xine_t *xine, void *data) {
   }
 
   class->ao_class.open_plugin     = open_plugin;
-  class->ao_class.get_identifier  = get_identifier;
-  class->ao_class.get_description = get_description;
-  class->ao_class.dispose         = dispose_class;
+  class->ao_class.identifier      = "FunsionSound";
+  class->ao_class.description     = N_("xine FusionSound audio output plugin");
+  class->ao_class.dispose         = default_audio_driver_class_dispose;
   class->xine                     = xine;
 
   return class;