Mercurial > mplayer.hg

comparison mplayer.c @ 33646:f3300b0c38a9

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Rename guiInterface_t member AudioType AudioChannels. Additionally, simplify code in mplayer.c.
author ib
date Mon, 27 Jun 2011 10:02:04 +0000
parents 442726a401f1
children 9bb5d229a60b
comparison
equal deleted inserted replaced
33645:4c3bee76ef3b 33646:f3300b0c38a9
3675 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_FPSforced, mpctx->sh_video->fps, mpctx->sh_video->frametime); 3675 mp_msg(MSGT_CPLAYER, MSGL_INFO, MSGTR_FPSforced, mpctx->sh_video->fps, mpctx->sh_video->frametime);
3676 } 3676 }
3677 3677
3678 #ifdef CONFIG_GUI 3678 #ifdef CONFIG_GUI
3679 if (use_gui) { 3679 if (use_gui) {
3680 if (mpctx->sh_audio) 3680 guiInfo.AudioChannels = mpctx->sh_audio ? mpctx->sh_audio->channels : 0;
3681 guiInfo.AudioType = mpctx->sh_audio->channels;
3682 else
3683 guiInfo.AudioType = 0;
3684 if (!mpctx->sh_video && mpctx->sh_audio) 3681 if (!mpctx->sh_video && mpctx->sh_audio)
3685 guiGetEvent(guiSetAudioOnly, (char *)1); 3682 guiGetEvent(guiSetAudioOnly, (char *)1);
3686 else 3683 else
3687 guiGetEvent(guiSetAudioOnly, (char *)0); 3684 guiGetEvent(guiSetAudioOnly, (char *)0);
3688 guiGetEvent(guiSetFileFormat, (char *)mpctx->demuxer->file_format); 3685 guiGetEvent(guiSetFileFormat, (char *)mpctx->demuxer->file_format);