summaryrefslogtreecommitdiffstats
path: root/mplayer.c
diff options
context:
space:
mode:
authorpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-22 21:36:12 +0000
committerpontscho <pontscho@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-04-22 21:36:12 +0000
commitb8f39a4f863e6da5eb7b98c5045f4ff4b82f1d88 (patch)
treee1465bce576dd66a0b6b02ad2913f81e07f721f3 /mplayer.c
parent281eecb323ccb20701c80775afae774ef4dec332 (diff)
downloadmpv-b8f39a4f863e6da5eb7b98c5045f4ff4b82f1d88.tar.bz2
mpv-b8f39a4f863e6da5eb7b98c5045f4ff4b82f1d88.tar.xz
fix audio only files play
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5790 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'mplayer.c')
-rw-r--r--mplayer.c32
1 files changed, 16 insertions, 16 deletions
diff --git a/mplayer.c b/mplayer.c
index 05b1a009cb..5ec8fac784 100644
--- a/mplayer.c
+++ b/mplayer.c
@@ -769,6 +769,7 @@ if(!use_stdin && !slave_mode){
#ifdef HAVE_NEW_GUI
if ( use_gui ) {
+ guiGetEvent( guiReDrawSubWindow,0 );
while ( guiIntfStruct.Playing != 1 )
{
#ifdef HAVE_NEW_INPUT
@@ -1280,22 +1281,6 @@ if(auto_quality>0){
// ========== Init display (sh_video->disp_w*sh_video->disp_h/out_fmt) ============
-#ifdef HAVE_NEW_GUI
- if ( use_gui )
- {
- mplResizeToMovieSize( sh_video->disp_w,sh_video->disp_h );
- guiIntfStruct.MovieWidth=sh_video->disp_w;
- guiIntfStruct.MovieHeight=sh_video->disp_h;
- guiIntfStruct.StreamType=stream->type;
- guiGetEvent( guiSetFileName,filename );
- if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels;
- else guiIntfStruct.AudioType=0;
-#ifdef USE_DVDREAD
- if ( stream->type == STREAMTYPE_DVD ) guiGetEvent( guiSetDVD,(char *)stream->priv );
-#endif
- }
-#endif
-
current_module="init_vo_vaa";
if(video_out->control(VOCTRL_QUERY_VAA, &vo_vaa)==VO_NOTIMPL)
@@ -1327,6 +1312,20 @@ if(!sh_video) osd_level = 0;
fflush(stdout);
+#ifdef HAVE_NEW_GUI
+ if ( use_gui )
+ {
+ guiGetEvent( guiSetShVideo,(char *)sh_video );
+ guiGetEvent( guiSetFileName,filename );
+ guiIntfStruct.StreamType=stream->type;
+ if ( sh_audio ) guiIntfStruct.AudioType=sh_audio->channels; else guiIntfStruct.AudioType=0;
+ if ( !sh_video && sh_audio ) guiGetEvent( guiSetAudioOnly,1 ); else guiGetEvent( guiSetAudioOnly,0 );
+#ifdef USE_DVDREAD
+ if ( stream->type == STREAMTYPE_DVD ) guiGetEvent( guiSetDVD,(char *)stream->priv );
+#endif
+ }
+#endif
+
{
//int frame_corr_num=0; //
//float v_frame=0; // Video
@@ -2734,6 +2733,7 @@ if(rel_seek_secs || abs_seek_pos){
#ifdef HAVE_NEW_GUI
if(use_gui){
+ guiEventHandling();
if(demuxer->file_format==DEMUXER_TYPE_AVI && sh_video->video.dwLength>2){
// get pos from frame number / total frames
guiIntfStruct.Position=(float)d_video->pack_no*100.0f/sh_video->video.dwLength;