summaryrefslogtreecommitdiff
path: root/src/video_out/video_out_syncfb.c
diff options
context:
space:
mode:
authorMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-08-15 03:12:24 +0000
committerMiguel Freitas <miguelfreitas@users.sourceforge.net>2002-08-15 03:12:24 +0000
commitfcb74c4f0e6fc5a1deec0839c773067d0a8b9e90 (patch)
tree154b7d6ac8ddf1e6c52b2f256c4c2f2713be8ba5 /src/video_out/video_out_syncfb.c
parent1b2d20cd85bd3ea8735a1fbc4ea7f68dafdfe23d (diff)
downloadxine-lib-fcb74c4f0e6fc5a1deec0839c773067d0a8b9e90.tar.gz
xine-lib-fcb74c4f0e6fc5a1deec0839c773067d0a8b9e90.tar.bz2
- reimplement independent x/y zooming.
- new helper module (vo_scale.c) with all common scaling code of video out drivers. it should greatly simplify drivers development by removing the boring frame/window calculation, aspect ratio, zooming etc. obs: not completely tested, may contain bugs and break things. also only xshm and xv have being simplified so far, others will follow shortly. CVS patchset: 2455 CVS date: 2002/08/15 03:12:24
Diffstat (limited to 'src/video_out/video_out_syncfb.c')
-rw-r--r--src/video_out/video_out_syncfb.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/src/video_out/video_out_syncfb.c b/src/video_out/video_out_syncfb.c
index 07ab6e82b..4c5c29372 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.74 2002/08/10 21:25:20 miguelfreitas Exp $
+ * $Id: video_out_syncfb.c,v 1.75 2002/08/15 03:12:24 miguelfreitas Exp $
*
* video_out_syncfb.c, SyncFB (for Matrox G200/G400 cards) interface for xine
*
@@ -414,7 +414,7 @@ static void syncfb_compute_ideal_size (syncfb_driver_t *this)
/*
* zoom
*/
- zoom_factor = (double)this->props[VO_PROP_ZOOM_FACTOR].value / (double)VO_ZOOM_STEP;
+ zoom_factor = (double)this->props[VO_PROP_ZOOM_X].value / (double)VO_ZOOM_STEP;
this->displayed_width = this->delivered_width / zoom_factor;
this->displayed_height = this->delivered_height / zoom_factor;
@@ -840,7 +840,7 @@ static int syncfb_set_property(vo_driver_t* this_gen, int property, int value)
syncfb_clean_output_area(this);
break;
- case VO_PROP_ZOOM_FACTOR:
+ case VO_PROP_ZOOM_X:
#ifdef DEBUG_OUTPUT
printf("video_out_syncfb: debug. (VO_PROP_ZOOM %d <=? %d <=? %d)\n",
VO_ZOOM_MIN, value, VO_ZOOM_MAX);
@@ -1044,7 +1044,7 @@ vo_driver_t *init_video_out_plugin(config_values_t *config, void *visual_gen)
this->props[VO_PROP_INTERLACED].value = 0;
this->props[VO_PROP_ASPECT_RATIO].value = ASPECT_AUTO;
- this->props[VO_PROP_ZOOM_FACTOR].value = 100;
+ this->props[VO_PROP_ZOOM_X].value = 100;
/* check for formats we need... */
this->supported_capabilities = 0;