diff options
author | Uoti Urpala <uau@mplayer2.org> | 2011-07-05 00:26:14 +0300 |
---|---|---|
committer | Uoti Urpala <uau@mplayer2.org> | 2011-07-05 00:30:13 +0300 |
commit | 677e78f2785e3ecad4a67050990281a506d9fd4e (patch) | |
tree | 4d407279c8a853582dc0a6d872fea34c08020f35 /libvo/aspecttest.c | |
parent | 8ff5b2b88930146fb1931ead243703754e227709 (diff) | |
download | mpv-677e78f2785e3ecad4a67050990281a506d9fd4e.tar.bz2 mpv-677e78f2785e3ecad4a67050990281a506d9fd4e.tar.xz |
VO: clean up aspect.c, remove aspecttest tool
Clean up aspect.c code and simplify it somewhat (without changing the
overall logic). Replace debug output printf calls under #ifdef with
mp_msg() debug output (somewhat modified).
Remove the file aspecttest.c which created a binary to test aspect.c
functionality. It did not compile and would not be particularly useful
anyway. Remove some support lines from aspect.c and Makefile.
Diffstat (limited to 'libvo/aspecttest.c')
-rw-r--r-- | libvo/aspecttest.c | 65 |
1 files changed, 0 insertions, 65 deletions
diff --git a/libvo/aspecttest.c b/libvo/aspecttest.c deleted file mode 100644 index b73e8c589c..0000000000 --- a/libvo/aspecttest.c +++ /dev/null @@ -1,65 +0,0 @@ -/* - * test app for aspect.[ch] by Atmos - * - * This file is part of MPlayer. - * - * MPlayer is free software; you can redistribute it and/or modify - * it under the terms of the GNU General Public License as published by - * the Free Software Foundation; either version 2 of the License, or - * (at your option) any later version. - * - * MPlayer is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License along - * with MPlayer; if not, write to the Free Software Foundation, Inc., - * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - */ - -#include <stdint.h> -#include <stdio.h> -#include <stdlib.h> - -#include "aspect.h" - -/* default zoom state 0 off, 1 on */ -#define DEF_ZOOM 1 - -extern float monitor_aspect; -int vo_dheight; -int vo_dwidth; -int vo_fs; -float vo_panscan; -int64_t WinID = -1; - -int main(int argc, char *argv[]) { - int w,h,z=DEF_ZOOM; - //printf("argc: %d\n",argc); - switch(argc) { - case 10: - z = atoi(argv[9]); - case 9: - monitor_aspect = (float)atoi(argv[7])/(float)atoi(argv[8]); - case 7: - aspect_save_prescale(atoi(argv[5]),atoi(argv[6])); - printf("prescale size: %sx%s\n",argv[5],argv[6]); - case 5: - aspect_save_screenres(atoi(argv[1]),atoi(argv[2])); - printf("screenres: %sx%s\n",argv[1],argv[2]); - aspect_save_orig(atoi(argv[3]),atoi(argv[4])); - printf("original size: %sx%s\n",argv[3],argv[4]); - w=atoi(argv[3]); h=atoi(argv[4]); - break; - default: - printf("USAGE: %s <screenw> <screenh> <origw> <origh>\n[<prescalew> " - "<prescaleh>] [<screenaspectw> <screenaspecth>] [<zoom 0/1>]\n", - argv[0]); - return 1; - } - printf("monitor_aspect: %f\n",monitor_aspect); - aspect(&w,&h,z); - printf("new size: %dx%d\n",w,h); - return 0; -} |