diff options
Diffstat (limited to 'src/video_out/video_out_stk.c')
| -rw-r--r-- | src/video_out/video_out_stk.c | 38 |
1 files changed, 10 insertions, 28 deletions
diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c index 2e5708874..e68efb30b 100644 --- a/src/video_out/video_out_stk.c +++ b/src/video_out/video_out_stk.c @@ -15,9 +15,7 @@ * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA - * - * $Id: video_out_stk.c,v 1.19 2006/07/10 22:08:44 dgp85 Exp $ + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110, USA * * video_out_stk.c, Libstk Surface Video Driver * more info on Libstk at http://www.libstk.org @@ -61,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 { @@ -329,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; @@ -444,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; @@ -468,9 +450,9 @@ static void *init_class (xine_t *xine, void *visual_gen) { this = (stk_class_t *) xine_xmalloc(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; @@ -486,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} }; |