diff options
| author | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-28 19:01:50 +0000 |
|---|---|---|
| committer | pontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2002-11-28 19:01:50 +0000 |
| commit | 41565580b5c706e12678570e27eea37f9a323325 (patch) | |
| tree | 2d15ce29205b5eb3f52bd520638f00074774c1ee /Gui | |
| parent | 837893b654265fed2db2e56a6325eccce903f494 (diff) | |
| download | mpv-41565580b5c706e12678570e27eea37f9a323325.tar.bz2 mpv-41565580b5c706e12678570e27eea37f9a323325.tar.xz | |
- add Rüdiger Kuhlmann's <mplayer-list-UGa6JdjLujS2@ruediger-kuhlmann.de> patch
- fix one 10l bug
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@8306 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'Gui')
| -rw-r--r-- | Gui/mplayer/mw.c | 9 | ||||
| -rw-r--r-- | Gui/skin/skin.c | 4 |
2 files changed, 13 insertions, 0 deletions
diff --git a/Gui/mplayer/mw.c b/Gui/mplayer/mw.c index 678685d4c4..fc665761a2 100644 --- a/Gui/mplayer/mw.c +++ b/Gui/mplayer/mw.c @@ -21,6 +21,11 @@ #include "../../libvo/sub.h" #include "../../mplayer.h" +#include "../../libmpdemux/demuxer.h" +#include "../../libmpdemux/stheader.h" +#include "../../codec-cfg.h" + + #include "play.h" #include "widgets.h" @@ -118,6 +123,10 @@ calclengthmmmmss: case 'b': sprintf( tmp,"%3.2f%%",guiIntfStruct.Balance ); strcat( trbuf,tmp ); break; case 'B': sprintf( tmp,"%3.1f",guiIntfStruct.Balance ); strcat( trbuf,tmp ); break; case 'd': sprintf( tmp,"%d",guiIntfStruct.FrameDrop ); strcat( trbuf,tmp ); break; + case 'x': sprintf( tmp,"%d",guiIntfStruct.MovieWidth ); strcat( trbuf,tmp ); break; + case 'y': sprintf( tmp,"%d",guiIntfStruct.MovieHeight ); strcat( trbuf,tmp ); break; + case 'C': sprintf( tmp,"%s", guiIntfStruct.sh_video? ((sh_video_t *)guiIntfStruct.sh_video)->codec->name : ""); + strcat( trbuf,tmp ); break; case 's': if ( guiIntfStruct.Playing == 0 ) strcat( trbuf,"s" ); break; case 'l': if ( guiIntfStruct.Playing == 1 ) strcat( trbuf,"p" ); break; case 'e': if ( guiIntfStruct.Playing == 2 ) strcat( trbuf,"e" ); break; diff --git a/Gui/skin/skin.c b/Gui/skin/skin.c index e7d1e21ec3..9951d9ed23 100644 --- a/Gui/skin/skin.c +++ b/Gui/skin/skin.c @@ -10,6 +10,7 @@ #include "../../config.h" #include "../../mp_msg.h" #include "../../help_mp.h" +#include "../mplayer/widgets.h" listItems * skinAppMPlayer = &appMPlayer; @@ -25,11 +26,14 @@ unsigned char winList[32] = ""; void ERRORMESSAGE( const char * format, ... ) { char p[512]; + char tmp[512]; va_list ap; va_start( ap,format ); vsnprintf( p,512,format,ap ); va_end( ap ); mp_msg( MSGT_GPLAYER,MSGL_STATUS,MSGTR_SKIN_ERRORMESSAGE,linenumber,p ); + snprintf( tmp,512,MSGTR_SKIN_ERRORMESSAGE,linenumber,p ); + gtkMessageBox( GTK_MB_FATAL,tmp ); } #define CHECKDEFLIST( str ) \ |