1 files changed, 9 insertions, 25 deletions

diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c
index 647760fd2..eb6ccb0a9 100644
--- a/src/video_out/video_out_stk.c
+++ b/src/video_out/video_out_stk.c
@@ -59,10 +59,10 @@
 */
 
 #include "xine.h"
-#include "xine_internal.h"
-#include "video_out.h"
-#include "xineutils.h"
-#include "vo_scale.h"
+#include <xine/xine_internal.h>
+#include <xine/video_out.h>
+#include <xine/xineutils.h>
+#include <xine/vo_scale.h>
 
 /* Extend the video frame class with stk private data */
 typedef struct stk_frame_s {
@@ -327,7 +327,7 @@ static int stk_set_property (vo_driver_t* this_gen, int property, int value) {
             value = XINE_VO_ASPECT_AUTO;
         this->sc.user_ratio = value;
         xprintf(this->xine, XINE_VERBOSITY_DEBUG,
-		"video_out_stk: aspect ratio changed to %s\n", _x_vo_scale_aspect_ratio_name(value));
+		"video_out_stk: aspect ratio changed to %s\n", _x_vo_scale_aspect_ratio_name_table[value]);
 
         stk_compute_ideal_size (this);
         this->sc.force_redraw = 1;
@@ -442,22 +442,6 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
 /**
  * Class Functions
  */
-static char* get_identifier (video_driver_class_t *this_gen) {
-    //printf("video_out_stk: get_identifier()\n");
-    return "stk";
-}
-
-static char* get_description (video_driver_class_t *this_gen) {
-    //printf("video_out_stk: get_description()\n");
-    return _("xine video output plugin using the Libstk Surface Set-top Toolkit");
-}
-
-static void dispose_class (video_driver_class_t *this_gen) {
-    //printf("video_out_stk: dispose_class()\n");
-    free(this_gen);
-}
-
-
 static void *init_class (xine_t *xine, void *visual_gen) {
     stk_class_t* this;
 
@@ -466,9 +450,9 @@ static void *init_class (xine_t *xine, void *visual_gen) {
     this = calloc(1, sizeof(stk_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       = "stk";
+    this->driver_class.description      = N_("xine video output plugin using the Libstk Surface Set-top Toolkit");
+    this->driver_class.dispose          = default_video_driver_class_dispose;
 
     this->config                        = xine->config;
     this->xine                          = xine;
@@ -484,7 +468,7 @@ static const vo_info_t vo_info_stk = {
 
 const plugin_info_t xine_plugin_info[] EXPORTED = {
     /* type, API, "name", version, special_info, init_function */
-    { PLUGIN_VIDEO_OUT, 21, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class },
+    { PLUGIN_VIDEO_OUT, 22, "stk", XINE_VERSION_CODE, &vo_info_stk, init_class },
     { PLUGIN_NONE, 0, "" , 0 , NULL, NULL}
 };