rename internal API function (_x_<function>).

CVS patchset: 5721
CVS date: 2003/11/11 18:44:50

11 files changed, 77 insertions, 77 deletions

diff --git a/src/video_out/video_out_directx.c b/src/video_out/video_out_directx.c
index 8016e3a08..4852b3e00 100755
--- a/src/video_out/video_out_directx.c
+++ b/src/video_out/video_out_directx.c
@@ -20,7 +20,7 @@
  * video_out_directx.c, direct draw video output plugin for xine
  * by Matthew Grooms <elon@altavista.com>
  *
- * $Id: video_out_directx.c,v 1.9 2003/10/31 17:25:20 mroi Exp $
+ * $Id: video_out_directx.c,v 1.10 2003/11/11 18:45:00 f1rmb Exp $
  */
 
 typedef unsigned char boolean;
@@ -1144,7 +1144,7 @@ static int win32_redraw_needed(vo_driver_t* this_gen)
 
   /* TC - May need to revisit this! */
 #ifdef TC  
-  if( vo_scale_redraw_needed( &win32_driver->sc ) ) {
+  if( _x_vo_scale_redraw_needed( &win32_driver->sc ) ) {
     win32_gui_data_exchange(this_gen, GUI_WIN32_MOVED_OR_RESIZED, 0);    
     ret = 1;
   }
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index 5157a0c02..0d7c8ff73 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -17,7 +17,7 @@
  * 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_fb.c,v 1.30 2003/10/23 15:17:07 mroi Exp $
+ * $Id: video_out_fb.c,v 1.31 2003/11/11 18:45:00 f1rmb Exp $
  * 
  * video_out_fb.c, frame buffer xine driver by Miguel Freitas
  *
@@ -254,12 +254,12 @@ static vo_frame_t *fb_alloc_frame(vo_driver_t *this_gen)
 
 static void fb_compute_ideal_size(fb_driver_t *this, fb_frame_t *frame)
 {
-  vo_scale_compute_ideal_size(&frame->sc);
+  _x_vo_scale_compute_ideal_size(&frame->sc);
 }
 
 static void fb_compute_rgb_size(fb_driver_t *this, fb_frame_t *frame)
 {
-  vo_scale_compute_output_size(&frame->sc);
+  _x_vo_scale_compute_output_size(&frame->sc);
   
   /* avoid problems in yuv2rgb */
   if(frame->sc.output_height < (frame->sc.delivered_height+15) >> 4)
@@ -574,7 +574,7 @@ static void fb_display_frame(vo_driver_t *this_gen, vo_frame_t *frame_gen)
   if (this->sc.frame_output_cb) {
     this->sc.delivered_height   = frame->sc.delivered_height;
     this->sc.delivered_width    = frame->sc.delivered_width;
-    vo_scale_redraw_needed( &this->sc );
+    _x_vo_scale_redraw_needed( &this->sc );
   }
 
   if(this->use_zero_copy)
@@ -638,7 +638,7 @@ static int fb_set_property(vo_driver_t *this_gen, int property, int value)
       value = XINE_VO_ASPECT_AUTO;
     this->sc.user_ratio = value;
     printf("video_out_fb: aspect ratio changed to %s\n",
-           vo_scale_aspect_ratio_name(value));
+           _x_vo_scale_aspect_ratio_name(value));
       break;
 
     case VO_PROP_BRIGHTNESS:
@@ -963,7 +963,7 @@ static vo_driver_t *fb_open_plugin(video_driver_class_t *class_gen,
       (this->fb_var.xres_virtual *
        this->fb_var.bits_per_pixel)/8;
     
-  vo_scale_init(&this->sc, 0, 0, config);
+  _x_vo_scale_init(&this->sc, 0, 0, config);
   this->sc.gui_width  = this->fb_var.xres;
   this->sc.gui_height = this->fb_var.yres;
   this->sc.user_ratio = XINE_VO_ASPECT_AUTO;
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index 5822ec342..42f4cc9e0 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -17,7 +17,7 @@
  * 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_opengl.c,v 1.30 2003/10/23 15:17:07 mroi Exp $
+ * $Id: video_out_opengl.c,v 1.31 2003/11/11 18:45:00 f1rmb Exp $
  * 
  * video_out_glut.c, glut based OpenGL rendering interface for xine
  * Matthias Hopf <mat@mshopf.de>
@@ -302,7 +302,7 @@ static vo_frame_t *opengl_alloc_frame (vo_driver_t *this_gen) {
 
 static void opengl_compute_ideal_size (opengl_driver_t *this) {
 
-    vo_scale_compute_ideal_size (&this->sc);
+    _x_vo_scale_compute_ideal_size (&this->sc);
 }
 
 
@@ -395,7 +395,7 @@ static void opengl_compute_output_size (opengl_driver_t *this) {
     int old_x      = this->sc.output_xoffset;
     int old_y      = this->sc.output_yoffset;
 
-    vo_scale_compute_output_size (&this->sc);
+    _x_vo_scale_compute_output_size (&this->sc);
 
     /* avoid problems in yuv2rgb */
     if (this->sc.output_height < ((this->sc.delivered_height + 15) >> 4))
@@ -476,7 +476,7 @@ static int opengl_redraw_needed (vo_driver_t *this_gen) {
 
     DEBUGF ((stderr, "*** redraw_needed %dx%d\n", this->sc.delivered_width, this->sc.delivered_height));
 
-    if (vo_scale_redraw_needed (&this->sc)) {
+    if (_x_vo_scale_redraw_needed (&this->sc)) {
 	opengl_compute_output_size (this);
 	/* Actually, the output area is cleared in render_image */
         return 1;
@@ -770,7 +770,7 @@ static int opengl_set_property (vo_driver_t *this_gen,
 	    value  = XINE_VO_ASPECT_AUTO;
 	this->sc.user_ratio = value;
 	fprintf (stderr, "video_out_opengl: aspect ratio changed to %s\n",
-	         vo_scale_aspect_ratio_name (value));
+	         _x_vo_scale_aspect_ratio_name (value));
 	opengl_compute_ideal_size (this);
 //	opengl_redraw_needed      ((vo_driver_t *) this);
 	break;
@@ -865,9 +865,9 @@ static int opengl_gui_data_exchange (vo_driver_t *this_gen,
             int x1, y1, x2, y2;
 /*  	    DEBUGF ((stderr, "*** gui_translate_gui_to_video ***\n")); */
       
-            vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
+            _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
                                      &x1, &y1);
-            vo_scale_translate_gui2video(&this->sc,
+            _x_vo_scale_translate_gui2video(&this->sc,
                                      rect->x + rect->w, rect->y + rect->h,
                                      &x2, &y2);
             rect->x = x1;
@@ -921,7 +921,7 @@ static vo_driver_t *opengl_open_plugin (video_driver_class_t *class_gen,
     this->display		    = visual->display;
     this->screen		    = visual->screen;
 
-    vo_scale_init (&this->sc, 0, 0, class->config);
+    _x_vo_scale_init (&this->sc, 0, 0, class->config);
 
     this->sc.frame_output_cb        = visual->frame_output_cb;
     this->sc.dest_size_cb           = visual->dest_size_cb;
diff --git a/src/video_out/video_out_pgx64.c b/src/video_out/video_out_pgx64.c
index 6b49b4ad4..6c4edaa35 100644
--- a/src/video_out/video_out_pgx64.c
+++ b/src/video_out/video_out_pgx64.c
@@ -17,7 +17,7 @@
  * 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_pgx64.c,v 1.44 2003/11/01 15:47:34 komadori Exp $
+ * $Id: video_out_pgx64.c,v 1.45 2003/11/11 18:45:00 f1rmb Exp $
  *
  * video_out_pgx64.c, Sun PGX64/PGX24 output plugin for xine
  *
@@ -414,7 +414,7 @@ static void pgx64_display_frame(vo_driver_t *this_gen, vo_frame_t *frame_gen)
     this->delivered_format          = frame->format;
 
     this->vo_scale.force_redraw = 1;
-    vo_scale_compute_ideal_size(&this->vo_scale);
+    _x_vo_scale_compute_ideal_size(&this->vo_scale);
 
     vram_reset(this);
     if (this->multibuf_en) {
@@ -425,8 +425,8 @@ static void pgx64_display_frame(vo_driver_t *this_gen, vo_frame_t *frame_gen)
     }
   }
 
-  if (vo_scale_redraw_needed(&this->vo_scale)) {  
-    vo_scale_compute_output_size(&this->vo_scale);
+  if (_x_vo_scale_redraw_needed(&this->vo_scale)) {  
+    _x_vo_scale_compute_output_size(&this->vo_scale);
     repaint_output_area(this);
     this->ovl_regen_needed = 1;
 
@@ -805,7 +805,7 @@ static int pgx64_set_property(vo_driver_t *this_gen, int property, int value)
       }
       this->vo_scale.user_ratio = value;
       this->vo_scale.force_redraw = 1;
-      vo_scale_compute_ideal_size(&this->vo_scale);     
+      _x_vo_scale_compute_ideal_size(&this->vo_scale);     
     }
     break;
 
@@ -882,8 +882,8 @@ static int pgx64_gui_data_exchange(vo_driver_t *this_gen, int data_type, void *d
       x11_rectangle_t *rect = data;
       int x1, y1, x2, y2;
 
-      vo_scale_translate_gui2video(&this->vo_scale, rect->x, rect->y, &x1, &y1);
-      vo_scale_translate_gui2video(&this->vo_scale, rect->x + rect->w, rect->y + rect->h, &x2, &y2);
+      _x_vo_scale_translate_gui2video(&this->vo_scale, rect->x, rect->y, &x1, &y1);
+      _x_vo_scale_translate_gui2video(&this->vo_scale, rect->x + rect->w, rect->y + rect->h, &x2, &y2);
 
       rect->x = x1;
       rect->y = y1;
@@ -900,7 +900,7 @@ static int pgx64_redraw_needed(vo_driver_t *this_gen)
 {
   pgx64_driver_t *this = (pgx64_driver_t *)(void *)this_gen;
 
-  if (vo_scale_redraw_needed(&this->vo_scale)) {  
+  if (_x_vo_scale_redraw_needed(&this->vo_scale)) {  
     this->vo_scale.force_redraw = 1;
     this->ovl_regen_needed = 1;
     return 1;
@@ -1063,7 +1063,7 @@ static vo_driver_t* pgx64_init_driver(video_driver_class_t *class_gen, const voi
   this->vo_driver.redraw_needed        = pgx64_redraw_needed;
   this->vo_driver.dispose              = pgx64_dispose;
 
-  vo_scale_init(&this->vo_scale, 0, 0, class->config);
+  _x_vo_scale_init(&this->vo_scale, 0, 0, class->config);
   this->vo_scale.user_ratio = XINE_VO_ASPECT_AUTO;
   this->vo_scale.user_data       = ((x11_visual_t*)visual_gen)->user_data;
   this->vo_scale.frame_output_cb = ((x11_visual_t*)visual_gen)->frame_output_cb;
diff --git a/src/video_out/video_out_sdl.c b/src/video_out/video_out_sdl.c
index df67ff08d..3711855d4 100644
--- a/src/video_out/video_out_sdl.c
+++ b/src/video_out/video_out_sdl.c
@@ -17,7 +17,7 @@
  * 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_sdl.c,v 1.30 2003/10/31 17:25:20 mroi Exp $
+ * $Id: video_out_sdl.c,v 1.31 2003/11/11 18:45:00 f1rmb Exp $
  *
  * video_out_sdl.c, Simple DirectMedia Layer
  *
@@ -157,12 +157,12 @@ static vo_frame_t *sdl_alloc_frame (vo_driver_t *this_gen) {
 
 static void sdl_compute_ideal_size (sdl_driver_t *this) {
 
-  vo_scale_compute_ideal_size( &this->sc );
+  _x_vo_scale_compute_ideal_size( &this->sc );
 }
 
 static void sdl_compute_output_size (sdl_driver_t *this) {
 
-  vo_scale_compute_output_size( &this->sc );
+  _x_vo_scale_compute_output_size( &this->sc );
 
 #ifdef LOG
   printf ("video_out_sdl: frame source %d x %d => screen output %d x %d\n",
@@ -278,7 +278,7 @@ static int sdl_redraw_needed (vo_driver_t *this_gen) {
 
 #ifdef HAVE_X11
 
-  if( vo_scale_redraw_needed( &this->sc ) ) {
+  if( _x_vo_scale_redraw_needed( &this->sc ) ) {
 
     sdl_compute_output_size (this);
 
@@ -372,7 +372,7 @@ static int sdl_set_property (vo_driver_t *this_gen,
       value = XINE_VO_ASPECT_AUTO;
     this->sc.user_ratio = value;
     printf("video_out_sdl: aspect ratio changed to %s\n",
-	   vo_scale_aspect_ratio_name(value));
+	   _x_vo_scale_aspect_ratio_name(value));
 
     sdl_compute_ideal_size (this);
     this->sc.force_redraw = 1;
@@ -419,9 +419,9 @@ static int sdl_gui_data_exchange (vo_driver_t *this_gen,
       int x1, y1, x2, y2;
       x11_rectangle_t *rect = data;
 
-      vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
+      _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
 			     &x1, &y1);
-      vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h,
+      _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h,
 			     &x2, &y2);
       rect->x = x1;
       rect->y = y1;
@@ -484,7 +484,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   this->screen            = visual->screen;
   this->drawable          = visual->d;
 
-  vo_scale_init( &this->sc, 0, 0, config);
+  _x_vo_scale_init( &this->sc, 0, 0, config);
   this->sc.frame_output_cb   = visual->frame_output_cb;
   this->sc.user_data         = visual->user_data;
 
@@ -492,7 +492,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   sprintf(SDL_windowhack,"SDL_WINDOWID=0x%x", (uint32_t) this->drawable );
   putenv(SDL_windowhack);
 #else
-  vo_scale_init( &this->sc, 0, 0, config );
+  _x_vo_scale_init( &this->sc, 0, 0, config );
 #endif
 
 
diff --git a/src/video_out/video_out_stk.c b/src/video_out/video_out_stk.c
index a24c087ef..3d215294b 100644
--- a/src/video_out/video_out_stk.c
+++ b/src/video_out/video_out_stk.c
@@ -17,7 +17,7 @@
  * 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.8 2003/10/31 17:25:20 mroi Exp $
+ * $Id: video_out_stk.c,v 1.9 2003/11/11 18:45:00 f1rmb Exp $
  *
  * video_out_stk.c, Libstk Surface Video Driver
  * more info on Libstk at http://www.libstk.org
@@ -149,12 +149,12 @@ static vo_frame_t *stk_alloc_frame(vo_driver_t *this_gen) {
 
 static void stk_compute_ideal_size (stk_driver_t* this) {
     //printf("video_out_stk: compute_ideal_size()\n");
-    vo_scale_compute_ideal_size(&this->sc);
+    _x_vo_scale_compute_ideal_size(&this->sc);
 }
 
 static void stk_compute_output_size (stk_driver_t *this) {
     //printf("video_out_stk: compute_output_size()\n");
-    vo_scale_compute_output_size( &this->sc );
+    _x_vo_scale_compute_output_size( &this->sc );
 
 #ifdef LOG
     printf ("video_out_stk: frame source %d x %d => screen output %d x %d\n",
@@ -328,7 +328,7 @@ static int stk_set_property (vo_driver_t* this_gen, int property, int value) {
         if (value>=XINE_VO_ASPECT_NUM_RATIOS)
             value = XINE_VO_ASPECT_AUTO;
         this->sc.user_ratio = value;
-        printf("video_out_stk: aspect ratio changed to %s\n", vo_scale_aspect_ratio_name(value));
+        printf("video_out_stk: aspect ratio changed to %s\n", _x_vo_scale_aspect_ratio_name(value));
 
         stk_compute_ideal_size (this);
         this->sc.force_redraw = 1;
@@ -405,7 +405,7 @@ static vo_driver_t *open_plugin(video_driver_class_t *class_gen, const void *vis
     /* this->capabilities = stk_surface_formats(this->surface); */
     this->capabilities = VO_CAP_YUY2 | VO_CAP_YV12;
     /* FIXME: what does this do ? */
-    vo_scale_init( &this->sc, 0, 0, this->config );
+    _x_vo_scale_init( &this->sc, 0, 0, this->config );
     this->sc.gui_x      = stk_xine_panel_x(this->xine_panel);
     this->sc.gui_y      = stk_xine_panel_y(this->xine_panel);
     this->sc.gui_width  = stk_xine_panel_width(this->xine_panel);
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 05b2f2311..ea301fd99 100644
--- a/src/video_out/video_out_syncfb.c
+++ b/src/video_out/video_out_syncfb.c
@@ -17,7 +17,7 @@
  * 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_syncfb.c,v 1.91 2003/10/23 15:17:07 mroi Exp $
+ * $Id: video_out_syncfb.c,v 1.92 2003/11/11 18:45:00 f1rmb Exp $
  * 
  * video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
  * 
@@ -350,13 +350,13 @@ static void syncfb_clean_output_area(syncfb_driver_t* this)
 
 static void syncfb_compute_ideal_size (syncfb_driver_t *this)
 {
-  vo_scale_compute_ideal_size( &this->sc );
+  _x_vo_scale_compute_ideal_size( &this->sc );
 }
 
 /* make ideal width/height "fit" into the gui */
 static void syncfb_compute_output_size(syncfb_driver_t *this)
 {
-  vo_scale_compute_output_size( &this->sc );
+  _x_vo_scale_compute_output_size( &this->sc );
 
 #ifdef DEBUG_OUTPUT
   printf("video_out_syncfb: debug. (frame source %d x %d, screen output %d x %d)\n",
@@ -434,7 +434,7 @@ static int syncfb_redraw_needed(vo_driver_t* this_gen)
 
   int ret = 0;
   
-  if( vo_scale_redraw_needed( &this->sc ) ) {
+  if( _x_vo_scale_redraw_needed( &this->sc ) ) {
 
     syncfb_compute_output_size (this);
 
@@ -782,9 +782,9 @@ static int syncfb_gui_data_exchange(vo_driver_t* this_gen, int data_type,
       int x1, y1, x2, y2;
       x11_rectangle_t *rect = data;
 
-      vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
+      _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
 			     &x1, &y1);
-      vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h,
+      _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h,
 			     &x2, &y2);
       rect->x = x1;
       rect->y = y1;
@@ -963,7 +963,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   this->drawable             = visual->d;
   this->gc                   = XCreateGC (this->display, this->drawable, 0, NULL);
 
-  vo_scale_init (&this->sc, 1, 0, config );
+  _x_vo_scale_init (&this->sc, 1, 0, config );
   this->sc.frame_output_cb   = visual->frame_output_cb;
   this->sc.user_data         = visual->user_data;
 
diff --git a/src/video_out/video_out_vidix.c b/src/video_out/video_out_vidix.c
index 07de45ee1..c6d32fa45 100644
--- a/src/video_out/video_out_vidix.c
+++ b/src/video_out/video_out_vidix.c
@@ -17,7 +17,7 @@
  * 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_vidix.c,v 1.50 2003/10/31 17:25:20 mroi Exp $
+ * $Id: video_out_vidix.c,v 1.51 2003/11/11 18:45:00 f1rmb Exp $
  * 
  * video_out_vidix.c
  *
@@ -414,7 +414,7 @@ static vo_frame_t *vidix_alloc_frame (vo_driver_t *this_gen) {
 
 static void vidix_compute_ideal_size (vidix_driver_t *this) {
 
-  vo_scale_compute_ideal_size( &this->sc );
+  _x_vo_scale_compute_ideal_size( &this->sc );
 
 }
 
@@ -427,7 +427,7 @@ static void vidix_config_playback (vidix_driver_t *this) {
   uint32_t apitch;
   int err,i;
   
-  vo_scale_compute_output_size( &this->sc );
+  _x_vo_scale_compute_output_size( &this->sc );
   
   if( this->vidix_started > 0 ) {
 #ifdef LOG
@@ -595,7 +595,7 @@ static int vidix_redraw_needed (vo_driver_t *this_gen) {
   vidix_driver_t  *this = (vidix_driver_t *) this_gen;
   int ret = 0;
 
-  if(vo_scale_redraw_needed(&this->sc)) {
+  if(_x_vo_scale_redraw_needed(&this->sc)) {
     if(this->got_frame_data) {
       vidix_config_playback(this);
       vidix_clean_output_area(this);
@@ -681,7 +681,7 @@ static int vidix_set_property (vo_driver_t *this_gen,
   if ( property == VO_PROP_ASPECT_RATIO) {
 #ifdef LOG
     printf("video_out_vidix: aspect ratio changed to %s\n",
-	   vo_scale_aspect_ratio_name(value));
+	   _x_vo_scale_aspect_ratio_name(value));
 #endif
     
     if(value == XINE_VO_ASPECT_NUM_RATIOS)
@@ -844,9 +844,9 @@ static int vidix_gui_data_exchange (vo_driver_t *this_gen,
       int x1, y1, x2, y2;
       x11_rectangle_t *rect = data;
 
-      vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
+      _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
 			     &x1, &y1);
-      vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h,
+      _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h,
 			     &x2, &y2);
       rect->x = x1;
       rect->y = y1;
@@ -892,7 +892,7 @@ static vidix_driver_t *open_plugin (video_driver_class_t *class_gen) {
   this->vidix_handler = class->vidix_handler;
   this->vidix_cap = class->vidix_cap;
 
-  vo_scale_init( &this->sc, 1, /*this->vidix_cap.flags & FLAG_UPSCALER,*/ 0, config );
+  _x_vo_scale_init( &this->sc, 1, /*this->vidix_cap.flags & FLAG_UPSCALER,*/ 0, config );
   
   this->xine              = class->xine;
   this->config            = config;
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index 6984fcf87..51193a0ef 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -17,7 +17,7 @@
  * 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_xshm.c,v 1.118 2003/10/24 22:34:50 f1rmb Exp $
+ * $Id: video_out_xshm.c,v 1.119 2003/11/11 18:45:00 f1rmb Exp $
  * 
  * video_out_xshm.c, X11 shared memory extension interface for xine
  *
@@ -401,11 +401,11 @@ static vo_frame_t *xshm_alloc_frame (vo_driver_t *this_gen) {
 }
 
 static void xshm_compute_ideal_size (xshm_driver_t *this, xshm_frame_t *frame) {
-  vo_scale_compute_ideal_size( &frame->sc );
+  _x_vo_scale_compute_ideal_size( &frame->sc );
 }
 
 static void xshm_compute_rgb_size (xshm_driver_t *this, xshm_frame_t *frame) {
-  vo_scale_compute_output_size( &frame->sc );
+  _x_vo_scale_compute_output_size( &frame->sc );
 
   /* avoid problems in yuv2rgb */
   if (frame->sc.output_height < 1)
@@ -656,7 +656,7 @@ static int xshm_redraw_needed (vo_driver_t *this_gen) {
     this->sc.delivered_height   = this->cur_frame->sc.delivered_height;
     this->sc.delivered_width    = this->cur_frame->sc.delivered_width;
     this->sc.video_pixel_aspect = this->cur_frame->sc.video_pixel_aspect;
-    if( vo_scale_redraw_needed( &this->sc ) ) {  
+    if( _x_vo_scale_redraw_needed( &this->sc ) ) {  
 
       clean_output_area (this, this->cur_frame);
       ret = 1;
@@ -684,7 +684,7 @@ static void xshm_display_frame (vo_driver_t *this_gen, vo_frame_t *frame_gen) {
   this->sc.delivered_height   = frame->sc.delivered_height;
   this->sc.delivered_width    = frame->sc.delivered_width;
   this->sc.video_pixel_aspect = frame->sc.video_pixel_aspect;
-  if( vo_scale_redraw_needed( &this->sc ) ) {  
+  if( _x_vo_scale_redraw_needed( &this->sc ) ) {  
 
     clean_output_area (this, frame);
   }
@@ -763,7 +763,7 @@ static int xshm_set_property (vo_driver_t *this_gen,
     this->sc.user_ratio = value;
     if (this->xine->verbosity >= XINE_VERBOSITY_LOG) {
       printf ("video_out_xshm: aspect ratio changed to %s\n",
-	      vo_scale_aspect_ratio_name(value));
+	      _x_vo_scale_aspect_ratio_name(value));
     }
 
   } else if (property == VO_PROP_BRIGHTNESS) {
@@ -887,10 +887,10 @@ static int xshm_gui_data_exchange (vo_driver_t *this_gen,
       x11_rectangle_t *rect = data;
       int              x1, y1, x2, y2;
       
-      vo_scale_translate_gui2video(&this->cur_frame->sc,
+      _x_vo_scale_translate_gui2video(&this->cur_frame->sc,
 			       rect->x, rect->y,
 			       &x1, &y1);
-      vo_scale_translate_gui2video(&this->cur_frame->sc,
+      _x_vo_scale_translate_gui2video(&this->cur_frame->sc,
 			       rect->x + rect->w, rect->y + rect->h,
 			       &x2, &y2);
       rect->x = x1;
@@ -1003,7 +1003,7 @@ static vo_driver_t *xshm_open_plugin (video_driver_class_t *class_gen, const voi
   this->display		    = visual->display;
   this->screen		    = visual->screen;
 
-  vo_scale_init( &this->sc, 0, 0, config );
+  _x_vo_scale_init( &this->sc, 0, 0, config );
   this->sc.frame_output_cb  = visual->frame_output_cb;
   this->sc.dest_size_cb     = visual->dest_size_cb;
   this->sc.user_data        = visual->user_data;
diff --git a/src/video_out/video_out_xv.c b/src/video_out/video_out_xv.c
index 4ff74822b..5c35d77be 100644
--- a/src/video_out/video_out_xv.c
+++ b/src/video_out/video_out_xv.c
@@ -17,7 +17,7 @@
  * 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_xv.c,v 1.180 2003/10/31 17:25:20 mroi Exp $
+ * $Id: video_out_xv.c,v 1.181 2003/11/11 18:45:00 f1rmb Exp $
  *
  * video_out_xv.c, X11 video extension interface for xine
  *
@@ -586,7 +586,7 @@ static void xv_clean_output_area (xv_driver_t *this) {
  */
 
 static void xv_compute_ideal_size (xv_driver_t *this) {
-  vo_scale_compute_ideal_size( &this->sc );
+  _x_vo_scale_compute_ideal_size( &this->sc );
 }
 
 
@@ -596,7 +596,7 @@ static void xv_compute_ideal_size (xv_driver_t *this) {
 
 static void xv_compute_output_size (xv_driver_t *this) {
 
-  vo_scale_compute_output_size( &this->sc );
+  _x_vo_scale_compute_output_size( &this->sc );
 
   /* onefield_xv divide by 2 the number of lines */
   if (this->deinterlace_enabled
@@ -665,7 +665,7 @@ static int xv_redraw_needed (vo_driver_t *this_gen) {
 
     xv_compute_ideal_size(this);
 
-    if( vo_scale_redraw_needed( &this->sc ) ) {
+    if( _x_vo_scale_redraw_needed( &this->sc ) ) {
 
       xv_compute_output_size (this);
 
@@ -936,9 +936,9 @@ static int xv_gui_data_exchange (vo_driver_t *this_gen,
       int x1, y1, x2, y2;
       x11_rectangle_t *rect = data;
 
-      vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
+      _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
 				   &x1, &y1);
-      vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h,
+      _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h,
 				   &x2, &y2);
       rect->x = x1;
       rect->y = y1;
@@ -1148,7 +1148,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   this->xv_port           = class->xv_port;
   this->config            = config;
 
-  vo_scale_init (&this->sc, 1, 0, config );
+  _x_vo_scale_init (&this->sc, 1, 0, config );
   this->sc.frame_output_cb   = visual->frame_output_cb;
   this->sc.user_data         = visual->user_data;
 
diff --git a/src/video_out/video_out_xvmc.c b/src/video_out/video_out_xvmc.c
index 30e816fb4..91f90530d 100644
--- a/src/video_out/video_out_xvmc.c
+++ b/src/video_out/video_out_xvmc.c
@@ -17,7 +17,7 @@
  * 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_xvmc.c,v 1.6 2003/10/31 17:25:21 mroi Exp $
+ * $Id: video_out_xvmc.c,v 1.7 2003/11/11 18:45:00 f1rmb Exp $
  * 
  * video_out_xvmc.c, X11 video motion compensation extension interface for xine
  *
@@ -851,7 +851,7 @@ static void xvmc_clean_output_area (xvmc_driver_t *this) {
  */
 
 static void xvmc_compute_ideal_size (xvmc_driver_t *this) {
-  vo_scale_compute_ideal_size( &this->sc );
+  _x_vo_scale_compute_ideal_size( &this->sc );
 }
 
 /*
@@ -859,7 +859,7 @@ static void xvmc_compute_ideal_size (xvmc_driver_t *this) {
  */
 
 static void xvmc_compute_output_size (xvmc_driver_t *this) {
- vo_scale_compute_output_size( &this->sc );
+ _x_vo_scale_compute_output_size( &this->sc );
 }
 
 static void xvmc_overlay_blend (vo_driver_t *this_gen, 
@@ -926,7 +926,7 @@ static int xvmc_redraw_needed (vo_driver_t *this_gen) {
     
     xvmc_compute_ideal_size(this);
 
-    if(vo_scale_redraw_needed(&this->sc)) {
+    if(_x_vo_scale_redraw_needed(&this->sc)) {
       xvmc_compute_output_size (this);
       xvmc_clean_output_area (this);
       ret = 1;
@@ -1202,9 +1202,9 @@ static int xvmc_gui_data_exchange (vo_driver_t *this_gen,
 	 			 &x2, &y2);
       */
       
-      vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
+      _x_vo_scale_translate_gui2video(&this->sc, rect->x, rect->y,
 				   &x1, &y1);
-      vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h,
+      _x_vo_scale_translate_gui2video(&this->sc, rect->x + rect->w, rect->y + rect->h,
 				   &x2, &y2);
       
       rect->x = x1;
@@ -1377,7 +1377,7 @@ static vo_driver_t *open_plugin (video_driver_class_t *class_gen, const void *vi
   this->xv_port            = class->xv_port;
   this->config             = config;
 
-  vo_scale_init (&this->sc, 1, 0, config );
+  _x_vo_scale_init (&this->sc, 1, 0, config );
 
   this->sc.frame_output_cb   = visual->frame_output_cb;
   this->sc.user_data         = visual->user_data;