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

add vcd,dvd,etcsymbol handling 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2448 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
pontscho 2001-10-24 10:58:18 +00:00
parent 90e0b71a9e
commit 8cf74425f9
4 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Gui/mplayer/mw.h
View File

@ -1,6 +1,8 @@
// main window
#include "../../libmpdemux/stream.h"
unsigned char * mplDrawBuffer = NULL;
int mplMainRender = 1;
int mplMainAutoPlay = 0;
@ -100,6 +102,16 @@ calclengthmmmmss:
case 2: strcat( trbuf,"t" ); break;
}
break;
case 'T':
switch ( mplShMem->StreamType )
{
case STREAMTYPE_FILE: strcat( trbuf,"f" ); break;
case STREAMTYPE_VCD: strcat( trbuf,"v" ); break;
case STREAMTYPE_STREAM: strcat( trbuf,"u" ); break;
case STREAMTYPE_DVD: strcat( trbuf,"d" ); break;
default: strcat( trbuf," " ); break;
}
break;
case '$': strcat( trbuf,"$" ); break;
default: continue;
}

16
Gui/mplayer/play.c
View File

@ -121,6 +121,7 @@ void mplMPlayerInit( int argc,char* argv[], char *envp[] )
mplShMem=calloc( 1,sizeof( mplCommStruct ) );
mplShMem->Balance=50.0f;
mplShMem->StreamType=-1;
memset(&sa, 0, sizeof(sa));
sa.sa_handler = mplMainSigHandler;
sigaction( SIGTYPE,&sa,NULL );
@ -178,21 +179,6 @@ void ChangeSkin( void )
wsResizeImage( &appMPlayer.menuWindow,appMPlayer.menuBase.width,appMPlayer.menuBase.height );
}
/*
if ( appMPlayer.sub.Bitmap.Image ) wsResizeImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
if ( !mplShMem->Playing )
{
if ( !appMPlayer.subWindow.isFullScreen )
{
wsResizeWindow( &appMPlayer.subWindow,appMPlayer.sub.width,appMPlayer.sub.height );
wsMoveWindow( &appMPlayer.subWindow,appMPlayer.sub.x,appMPlayer.sub.y );
}
wsSetBackgroundRGB( &appMPlayer.subWindow,appMPlayer.subR,appMPlayer.subG,appMPlayer.subB );
wsClearWindow( appMPlayer.subWindow );
if ( appMPlayer.sub.Bitmap.Image ) wsConvert( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Image,appMPlayer.sub.Bitmap.ImageSize );
mplSubRender=1; wsPostRedisplay( &appMPlayer.subWindow );
}
*/
if ( appMPlayer.sub.Bitmap.Image ) wsResizeImage( &appMPlayer.subWindow,appMPlayer.sub.Bitmap.Width,appMPlayer.sub.Bitmap.Height );
if ( ( !appMPlayer.subWindow.isFullScreen )&&( !mplShMem->Playing ) )
{

2
Gui/mplayer/psignal.c
View File

@ -16,6 +16,7 @@
#include "../../config.h"
#include "../../libvo/x11_common.h"
#include "../../libmpdemux/stream.h"
#include "./mplayer.h"
@ -174,6 +175,7 @@ void mplMainSigHandler( int s )
strcat( mplShMem->Filename,gtkShMem->fs.filename );
printf( "%%%%%%%% Playing file: %s\n",mplShMem->Filename );
mplShMem->FilenameChanged=1;
mplShMem->StreamType=STREAMTYPE_FILE;
if ( mplMainAutoPlay ) mplGeneralTimer=1;
break;
case evMessageBox:

1
mplayer.c
View File

@ -1084,6 +1084,7 @@ current_module="init_libvo";
mplResizeToMovieSize( sh_video->disp_w,sh_video->disp_h );
moviewidth=screen_size_x=sh_video->disp_w;
movieheight=screen_size_y=sh_video->disp_h;
mplShMem->StreamType=stream->type;
}
#endif