RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

remove obsoleted function (mplResize) 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5047 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2002-03-11 09:19:15 +00:00
parent 8840c8bac6
commit fb104c64c3
6 changed files with 11 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Gui/mplayer/mplayer.c
View File

@ -97,7 +97,6 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp )
appMPlayer.subWindow.ReDraw=mplSubDraw; appMPlayer.subWindow.ReDraw=mplSubDraw;
appMPlayer.subWindow.MouseHandler=mplSubMouseHandle; appMPlayer.subWindow.MouseHandler=mplSubMouseHandle;
appMPlayer.subWindow.KeyHandler=mplMainKeyHandle; appMPlayer.subWindow.KeyHandler=mplMainKeyHandle;
appMPlayer.subWindow.ReSize=mplResize;
wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
wsClearWindow( appMPlayer.subWindow ); wsClearWindow( appMPlayer.subWindow );
@ -109,6 +108,12 @@ void mplInit( int argc,char* argv[], char *envp[], void* disp )
btnModify( evSetVolume,guiIntfStruct.Volume ); btnModify( evSetVolume,guiIntfStruct.Volume );
btnModify( evSetBalance,guiIntfStruct.Balance ); btnModify( evSetBalance,guiIntfStruct.Balance );
btnModify( evSetMoviePosition,guiIntfStruct.Position ); btnModify( evSetMoviePosition,guiIntfStruct.Position );
if ( fullscreen )
{
btnModify( evFullScreen,btnPressed );
mplFullScreen();
}
guiIntfStruct.Playing=0; guiIntfStruct.Playing=0;

2
Gui/mplayer/mw.h
View File

@ -359,7 +359,6 @@ NoPause:
appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight ) / 2; appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight ) / 2;
appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight; appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight;
wsFullScreen( &appMPlayer.subWindow ); wsFullScreen( &appMPlayer.subWindow );
mplResize( appMPlayer.subWindow.X,appMPlayer.subWindow.Y,guiIntfStruct.MovieWidth,guiIntfStruct.MovieHeight );
} }
break; break;
case evDoubleSize: case evDoubleSize:
@ -370,7 +369,6 @@ NoPause:
appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight * 2 ) / 2; appMPlayer.subWindow.OldY=( wsMaxY - guiIntfStruct.MovieHeight * 2 ) / 2;
appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth * 2; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight * 2; appMPlayer.subWindow.OldWidth=guiIntfStruct.MovieWidth * 2; appMPlayer.subWindow.OldHeight=guiIntfStruct.MovieHeight * 2;
wsFullScreen( &appMPlayer.subWindow ); wsFullScreen( &appMPlayer.subWindow );
mplResize( appMPlayer.subWindow.X,appMPlayer.subWindow.Y,guiIntfStruct.MovieWidth,guiIntfStruct.MovieHeight );
} }
break; break;
case evFullScreen: case evFullScreen:

5
Gui/mplayer/play.c
View File

@ -55,7 +55,6 @@ void mplFullScreen( void )
fullscreen=appMPlayer.subWindow.isFullScreen; fullscreen=appMPlayer.subWindow.isFullScreen;
if ( guiIntfStruct.Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 ); if ( guiIntfStruct.Playing ) wsSetBackgroundRGB( &appMPlayer.subWindow,0,0,0 );
else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB ); else wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
// mplResize( 0,0,appMPlayer.subWindow.Width,appMPlayer.subWindow.Height );
} }
extern int mplSubRender; extern int mplSubRender;
@ -121,10 +120,6 @@ void mplState( void )
} }
} }
void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height )
{
}
void mplMPlayerInit( int argc,char* argv[], char *envp[] ) void mplMPlayerInit( int argc,char* argv[], char *envp[] )
{ {
guiIntfStruct.Balance=50.0f; guiIntfStruct.Balance=50.0f;

1
Gui/mplayer/play.h
View File

@ -13,7 +13,6 @@ extern void mplFullScreen( void );
extern void mplPlay( void ); extern void mplPlay( void );
extern void mplPause( void ); extern void mplPause( void );
extern void mplState( void ); extern void mplState( void );
extern void mplResize( unsigned int X,unsigned int Y,unsigned int width,unsigned int height );
extern void mplResizeToMovieSize( unsigned int width,unsigned int height ); extern void mplResizeToMovieSize( unsigned int width,unsigned int height );
extern void mplIncAudioBufDelay( void ); extern void mplIncAudioBufDelay( void );

7
input/input.c
View File

@ -860,9 +860,10 @@ mp_input_get_cmd(int time, int paused) {
void void
mp_cmd_free(mp_cmd_t* cmd) { mp_cmd_free(mp_cmd_t* cmd) {
int i; int i;
#ifdef MP_DEBUG //#ifdef MP_DEBUG
assert(cmd != NULL); // assert(cmd != NULL);
#endif //#endif
if ( !cmd ) return;
if(cmd->name) if(cmd->name)
free(cmd->name); free(cmd->name);

2
mplayer.c
View File

@ -2070,7 +2070,7 @@ read_input:
usleep(20000); usleep(20000);
#ifdef HAVE_NEW_INPUT #ifdef HAVE_NEW_INPUT
} }
if ( cmd ) mp_cmd_free(cmd); mp_cmd_free(cmd);
#else #else
if(use_stdin) usec_sleep(1000); // do not eat the CPU if(use_stdin) usec_sleep(1000); // do not eat the CPU
} }