1 files changed, 8 insertions, 21 deletions

diff --git a/src/video_out/video_out_macosx.m b/src/video_out/video_out_macosx.m
index b5b4d731c..3a87908df 100644
--- a/src/video_out/video_out_macosx.m
+++ b/src/video_out/video_out_macosx.m
@@ -36,11 +36,11 @@
 #define LOG
 */
 
-#include "video_out.h"
-#include "vo_scale.h"
 #include "xine.h"
-#include "xine_internal.h"
-#include "xineutils.h"
+#include "xine/video_out.h"
+#include "xine/vo_scale.h"
+#include "xine/xine_internal.h"
+#include "xine/xineutils.h"
 
 #include "macosx/video_window.h"
 
@@ -349,19 +349,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *driver_class, const void *
 /*
  * Class related functions.
  */
-static char* get_identifier (video_driver_class_t *driver_class) {
-  return "MacOSX";
-}
-
-static char* get_description (video_driver_class_t *driver_class) {
-  return _("xine video output plugin for Mac OS X");
-}
-
-static void dispose_class (video_driver_class_t *driver_class) {
-  macosx_class_t    *this = (macosx_class_t *) driver_class;
-  
-  free (this);
-}
 
 static void *init_class (xine_t *xine, void *visual) {
   macosx_class_t        *this;
@@ -369,9 +356,9 @@ static void *init_class (xine_t *xine, void *visual) {
   this = calloc(1, sizeof(macosx_class_t));
 
   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      = "MacOSX";
+  this->driver_class.description     = N_("xine video output plugin for Mac OS X");
+  this->driver_class.dispose         = default_video_driver_class_dispose;
 
   this->config                       = xine->config;
   this->xine                         = xine;
@@ -389,7 +376,7 @@ plugin_info_t xine_plugin_info[] EXPORTED = {
   /* work around the problem that dlclose() is not allowed to
    * get rid of an image module which contains objective C code and simply
    * crashes with a Trace/BPT trap when we try to do so */
-  { PLUGIN_VIDEO_OUT | PLUGIN_NO_UNLOAD, 21, "macosx", XINE_VERSION_CODE, &vo_info_macosx, init_class },
+  { PLUGIN_VIDEO_OUT | PLUGIN_NO_UNLOAD, 22, "macosx", XINE_VERSION_CODE, &vo_info_macosx, init_class },
   { PLUGIN_NONE, 0, "", 0, NULL, NULL }
 };