diff options
| -rw-r--r-- | src/video_out/video_out_directfb.c | 8 | ||||
| -rw-r--r-- | src/video_out/video_out_fb.c | 17 | ||||
| -rw-r--r-- | src/video_out/video_out_xshm.c | 17 |
3 files changed, 8 insertions, 34 deletions
diff --git a/src/video_out/video_out_directfb.c b/src/video_out/video_out_directfb.c index a0dd3991f..0ab7acfe6 100644 --- a/src/video_out/video_out_directfb.c +++ b/src/video_out/video_out_directfb.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_directfb.c,v 1.7 2002/03/07 13:26:15 jcdutton Exp $ + * $Id: video_out_directfb.c,v 1.8 2002/05/06 00:48:09 miguelfreitas Exp $ * * DirectFB based output plugin. * Rich Wareham <richwareham@users.sourceforge.net> @@ -101,9 +101,6 @@ typedef struct directfb_driver_s { int last_frame_height; /* original size */ int last_frame_ratio_code; - /* TODO: check */ - int zoom_mpeg1; - /* display anatomy */ double display_ratio; /* given by visual parameter from init function */ void *user_data; @@ -540,9 +537,6 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->config = config; this->frame_width = 0; this->frame_height = 0; - this->zoom_mpeg1 = config->register_bool (config, "video.zoom_mpeg1", 1, - "Zoom small video formats to double size", - NULL, NULL, NULL); this->vo_driver.get_capabilities = directfb_get_capabilities; this->vo_driver.alloc_frame = directfb_alloc_frame; diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 7f2a62e9a..0d8af80f2 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.9 2002/03/25 03:08:38 miguelfreitas Exp $ + * $Id: video_out_fb.c,v 1.10 2002/05/06 00:48:09 miguelfreitas Exp $ * * video_out_fb.c, frame buffer xine driver by Miguel Freitas * @@ -115,7 +115,6 @@ typedef struct fb_driver_s { int mem_size; uint8_t* video_mem; /* mmapped video memory */ - int zoom_mpeg1; int scaling_disabled; int depth, bpp, bytes_per_pixel; int expecting_event; @@ -701,18 +700,10 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->config = config; this->output_scale_factor = 1.0; - this->zoom_mpeg1 = config->register_bool (config, "video.zoom_mpeg1", 1, - "Zoom small video formats to double size", + + this->scaling_disabled = config->register_bool (config, "video.disable_scaling", 0, + "disable all video scaling (faster!)", NULL, NULL, NULL); - /* - * FIXME: replace getenv() with config->lookup_int, merge with zoom_mpeg1? - * - * this->video_scale = config->lookup_int (config, "video_scale", 2); - * 0: disable all scaling (including aspect ratio switching, ...) - * 1: enable aspect ratio switch - * 2: like 1, double the size for small videos - */ - this->scaling_disabled = getenv("VIDEO_OUT_NOSCALE") != NULL; this->vo_driver.get_capabilities = fb_get_capabilities; this->vo_driver.alloc_frame = fb_alloc_frame; diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 691a334f2..545d9f6ba 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.73 2002/05/03 14:20:19 f1rmb Exp $ + * $Id: video_out_xshm.c,v 1.74 2002/05/06 00:48:09 miguelfreitas Exp $ * * video_out_xshm.c, X11 shared memory extension interface for xine * @@ -138,7 +138,6 @@ typedef struct xshm_driver_s { int user_ratio; /* speed tradeoffs */ - int zoom_mpeg1; int scaling_disabled; int expecting_event; /* completion event */ @@ -1278,19 +1277,9 @@ vo_driver_t *init_video_out_plugin (config_values_t *config, void *visual_gen) { this->gui_width = 0; this->gui_height = 0; this->user_ratio = ASPECT_AUTO; - this->zoom_mpeg1 = config->register_bool (config, "video.zoom_mpeg1", 1, - "Zoom small video formats to double size", - NULL, NULL, NULL); - /* - * FIXME: replace getenv() with config->lookup_int, merge with zoom_mpeg1? - * - * this->video_scale = config->lookup_int (config, "video_scale", 2); - * 0: disable all scaling (including aspect ratio switching, ...) - * 1: enable aspect ratio switch - * 2: like 1, double the size for small videos - */ + this->scaling_disabled = config->register_bool (config, "video.disable_scaling", 0, - "disable all video scaling", + "disable all video scaling (faster!)", NULL, NULL, NULL); this->drawable = visual->d; this->expecting_event = 0; |