GithubStar/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv.git synced 2026-10-22 18:58:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Replace deprecated function

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18058 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
nplourde
2006-04-08 16:16:48 +00:00
parent 310dda5ed0
commit fd290901bb
2 changed files with 22 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
libvo/vo_macosx.m
+12 -20
View File
@@ -167,7 +167,7 @@ static int config(uint32_t width, uint32_t height, uint32_t d_width, uint32_t d_
//connnect to mplayerosx
mplayerosxProxy=[NSConnection rootProxyForConnectionWithRegisteredName:@"mplayerosx" host:nil];
[mplayerosxProxy startWithWidth: image_width withHeight: image_height withBytes: image_bytes withAspect:movie_aspect];
[mplayerosxProxy startWithWidth: image_width withHeight: image_height withBytes: image_bytes withAspect:(int)(movie_aspect*100)];
}
return 0;
}
@@ -249,7 +249,7 @@ static void uninit(void)
}
SetSystemUIMode( kUIModeNormal, 0);
ShowCursor();
CGDisplayShowCursor(kCGDirectMainDisplay);
[autoreleasepool release];
}
@@ -708,16 +708,12 @@ static int control(uint32_t request, void *data, ...)
//auto hide mouse cursor and futur on-screen control?
if(isFullscreen && !mouseHide && !isRootwin)
{
DateTimeRec d;
unsigned long curTime;
static unsigned long lastTime = 0;
int curTime = TickCount()/60;
static int lastTime = 0;
GetTime(&d);
DateToSeconds( &d, &curTime);
if( ((curTime - lastTime) >= 5) || (lastTime == 0) )
{
HideCursor();
CGDisplayHideCursor(kCGDirectMainDisplay);
mouseHide = YES;
lastTime = curTime;
}
@@ -725,14 +721,10 @@ static int control(uint32_t request, void *data, ...)
//update activity every 30 seconds to prevent
//screensaver from starting up.
DateTimeRec d;
unsigned long curTime;
static unsigned long lastTime = 0;
GetTime(&d);
DateToSeconds( &d, &curTime);
if( ( (curTime - lastTime) >= 30) || (lastTime == 0))
int curTime = TickCount()/60;
static int lastTime = 0;
if( ((curTime - lastTime) >= 30) || (lastTime == 0) )
{
UpdateSystemActivity(UsrActivity);
lastTime = curTime;
@@ -782,7 +774,7 @@ static int control(uint32_t request, void *data, ...)
if(!isRootwin)
{
SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
HideCursor();
CGDisplayHideCursor(kCGDirectMainDisplay);
mouseHide = YES;
}
@@ -803,7 +795,7 @@ static int control(uint32_t request, void *data, ...)
SetSystemUIMode( kUIModeNormal, 0);
isFullscreen = 0;
ShowCursor();
CGDisplayShowCursor(kCGDirectMainDisplay);
mouseHide = NO;
//revert window to previous setting
@@ -946,7 +938,7 @@ static int control(uint32_t request, void *data, ...)
{
if(isFullscreen && !isRootwin)
{
ShowCursor();
CGDisplayShowCursor(kCGDirectMainDisplay);
mouseHide = NO;
}
}
libvo/vo_quartz.c
+10 -18
View File
@@ -282,7 +282,7 @@ static OSStatus MouseEventHandler(EventHandlerCallRef nextHandler, EventRef even
{
if(vo_quartz_fs)
{
ShowCursor();
CGDisplayShowCursor(kCGDirectMainDisplay);
mouseHide = FALSE;
}
}
@@ -967,16 +967,12 @@ static void flip_page(void)
//auto hide mouse cursor and futur on-screen control?
if(vo_quartz_fs && !mouseHide)
{
DateTimeRec d;
unsigned long curTime;
static unsigned long lastTime = 0;
int curTime = TickCount()/60;
static int lastTime = 0;
GetTime(&d);
DateToSeconds( &d, &curTime);
if( ((curTime - lastTime) >= 5) || (lastTime == 0) )
{
HideCursor();
CGDisplayHideCursor(kCGDirectMainDisplay);
mouseHide = TRUE;
lastTime = curTime;
}
@@ -984,14 +980,10 @@ static void flip_page(void)
//update activity every 30 seconds to prevent
//screensaver from starting up.
DateTimeRec d;
unsigned long curTime;
static unsigned long lastTime = 0;
GetTime(&d);
DateToSeconds( &d, &curTime);
if( ( (curTime - lastTime) >= 30) || (lastTime == 0))
int curTime = TickCount()/60;
static int lastTime = 0;
if( ((curTime/ - lastTime) >= 5) || (lastTime == 0) )
{
UpdateSystemActivity(UsrActivity);
lastTime = curTime;
@@ -1359,7 +1351,7 @@ void window_fullscreen()
if(device_id == 0)
{
SetSystemUIMode( kUIModeAllHidden, kUIOptionAutoShowMenuBar);
HideCursor();
CGDisplayHideCursor(kCGDirectMainDisplay);
mouseHide = TRUE;
}
@@ -1407,7 +1399,7 @@ void window_fullscreen()
SetSystemUIMode( kUIModeNormal, NULL);
//show mouse cursor
ShowCursor();
CGDisplayShowCursor(kCGDirectMainDisplay);
mouseHide = FALSE;
//revert window to previous setting