Mercurial > mplayer.hg

changeset 35069:90a2e4fedfab

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Remove pointless one-line function.
author reimar
date Tue, 11 Sep 2012 19:39:10 +0000
parents 93f15b7e12c0
children ff4758e8cfba
files libvo/vo_corevideo.h libvo/vo_corevideo.m
diffstat 2 files changed, 2 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/libvo/vo_corevideo.h	Tue Sep 11 19:36:19 2012 +0000
+++ b/libvo/vo_corevideo.h	Tue Sep 11 19:39:10 2012 +0000
@@ -94,7 +94,6 @@
 //vo control
 - (void) fullscreen: (BOOL) animate;
 - (void) ontop;
-- (void) panscan;
 - (void) rootwin;
 
 //menu
--- a/libvo/vo_corevideo.m	Tue Sep 11 19:36:19 2012 +0000
+++ b/libvo/vo_corevideo.m	Tue Sep 11 19:39:10 2012 +0000
@@ -456,7 +456,7 @@
 		case VOCTRL_ROOTWIN: vo_rootwin = !vo_rootwin; [mpGLView rootwin]; return VO_TRUE;
 		case VOCTRL_FULLSCREEN: vo_fs = !vo_fs; if(!shared_buffer){ [mpGLView fullscreen: NO]; } else { [mplayerosxProto toggleFullscreen]; } return VO_TRUE;
 		case VOCTRL_GET_PANSCAN: return VO_TRUE;
-		case VOCTRL_SET_PANSCAN: [mpGLView panscan]; return VO_TRUE;
+		case VOCTRL_SET_PANSCAN: panscan_calc(); return VO_TRUE;
 		case VOCTRL_UPDATE_SCREENINFO: update_screen_info(); return VO_TRUE;
 	}
 	return VO_NOTIMPL;
@@ -682,7 +682,7 @@
 		else
 			[kPanScanCmd setState:NSOffState];
 
-		[self panscan];
+		panscan_calc();
 	}
 
 	if(sender == kAspectOrgCmd)
@@ -874,14 +874,6 @@
 }
 
 /*
-	Toggle panscan
-*/
-- (void) panscan
-{
-	panscan_calc();
-}
-
-/*
 	Toggle rootwin
  */
 - (void) rootwin