Mercurial > mplayer.hg

comparison gui/dialog/menu.c @ 36665:045bb0dcea27

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add new audio pixmap. Replace audiolang pixmap by new one. As a result, audiolang.xpm isn't used any longer and can be removed.
author ib
date Mon, 27 Jan 2014 14:04:13 +0000
parents aacfb0698863
children 1862771a5ba9
comparison
equal deleted inserted replaced
36664:aacfb0698863 36665:045bb0dcea27
81 #ifdef CONFIG_DVDREAD 81 #ifdef CONFIG_DVDREAD
82 #include "pixmaps/dvd.xpm" 82 #include "pixmaps/dvd.xpm"
83 #include "pixmaps/playdvd.xpm" 83 #include "pixmaps/playdvd.xpm"
84 #include "pixmaps/chapter.xpm" 84 #include "pixmaps/chapter.xpm"
85 #include "pixmaps/dolby.xpm" 85 #include "pixmaps/dolby.xpm"
86 #include "pixmaps/audiolang.xpm" 86 #include "pixmaps/audio.xpm"
87 #endif 87 #endif
88 #ifdef CONFIG_TV 88 #ifdef CONFIG_TV
89 #include "pixmaps/tv.xpm" 89 #include "pixmaps/tv.xpm"
90 #endif 90 #endif
91 #include "pixmaps/empty1px.xpm" 91 #include "pixmaps/empty1px.xpm"
521 else 521 else
522 { 522 {
523 MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDChapterMenu,MSGTR_MENU_None,evNone ); 523 MenuItem=AddMenuItem( window1, (const char*)empty1px_xpm, DVDChapterMenu,MSGTR_MENU_None,evNone );
524 gtk_widget_set_sensitive( MenuItem,FALSE ); 524 gtk_widget_set_sensitive( MenuItem,FALSE );
525 } 525 }
526 DVDAudioLanguageMenu=AddSubMenu( window1, (const char*)audiolang_xpm, DVDSubMenu,MSGTR_MENU_AudioLanguages ); 526 DVDAudioLanguageMenu=AddSubMenu( window1, (const char*)audio_xpm, DVDSubMenu,MSGTR_MENU_AudioLanguages );
527 if ( guiInfo.AudioStreams && ( guiInfo.StreamType == STREAMTYPE_DVD ) ) 527 if ( guiInfo.AudioStreams && ( guiInfo.StreamType == STREAMTYPE_DVD ) )
528 { 528 {
529 char tmp[64]; int i, id = demuxer ? demuxer->audio->id : audio_id; 529 char tmp[64]; int i, id = demuxer ? demuxer->audio->id : audio_id;
530 for ( i=0;i < guiInfo.AudioStreams;i++ ) 530 for ( i=0;i < guiInfo.AudioStreams;i++ )
531 { 531 {
649 for ( i=0;i < MAX_A_STREAMS;i++ ) 649 for ( i=0;i < MAX_A_STREAMS;i++ )
650 if ( demuxer->a_streams[i] ) c++; 650 if ( demuxer->a_streams[i] ) c++;
651 651
652 if ( c > 1 ) 652 if ( c > 1 )
653 { 653 {
654 SubMenu=AddSubMenu( window1, (const char*)audiolang_xpm, Menu,MSGTR_MENU_AudioTrack ); 654 SubMenu=AddSubMenu( window1, (const char*)audio_xpm, Menu,MSGTR_MENU_AudioTrack );
655 for ( i=0;i < MAX_A_STREAMS;i++ ) 655 for ( i=0;i < MAX_A_STREAMS;i++ )
656 if ( demuxer->a_streams[i] ) 656 if ( demuxer->a_streams[i] )
657 { 657 {
658 int aid = ((sh_audio_t *)demuxer->a_streams[i])->aid; 658 int aid = ((sh_audio_t *)demuxer->a_streams[i])->aid;
659 int selected_id = (audio_id == aid || (audio_id == -1 && aid == demuxer_default_audio_track(mpctx_get_demuxer(guiInfo.mpcontext)))); 659 int selected_id = (audio_id == aid || (audio_id == -1 && aid == demuxer_default_audio_track(mpctx_get_demuxer(guiInfo.mpcontext))));