Mercurial > mplayer.hg

comparison gui/ui/main.c @ 35349:60930e7347c6

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add an URL loaded by the GUI to its playlist. Additionally, allow URLs to be in the playlist. The GUI operates on its playlist, so the URL may not be missing there. For further information see r35442.
author ib
date Thu, 22 Nov 2012 13:13:29 +0000
parents 203d0d5cac1f
children 92f6fc87ddc8
comparison
equal deleted inserted replaced
35348:3aba69339390 35349:60930e7347c6
139 case evExit: 139 case evExit:
140 mplayer( MPLAYER_EXIT_GUI, EXIT_QUIT, 0 ); 140 mplayer( MPLAYER_EXIT_GUI, EXIT_QUIT, 0 );
141 break; 141 break;
142 142
143 case evLoadURL: 143 case evLoadURL:
144 listMgr( PLAYLIST_DELETE,0 );
144 gtkShow( evLoadURL,NULL ); 145 gtkShow( evLoadURL,NULL );
145 break; 146 break;
146 147
147 case ivSetAudio: 148 case ivSetAudio:
148 if ( !mpctx_get_demuxer(guiInfo.mpcontext) || audio_id == iparam ) break; 149 if ( !mpctx_get_demuxer(guiInfo.mpcontext) || audio_id == iparam ) break;
206 case evPlaySwitchToPause: 207 case evPlaySwitchToPause:
207 play: 208 play:
208 209
209 if ( ( msg == evPlaySwitchToPause )&&( guiInfo.Playing == GUI_PAUSE ) ) goto NoPause; 210 if ( ( msg == evPlaySwitchToPause )&&( guiInfo.Playing == GUI_PAUSE ) ) goto NoPause;
210 211
211 if ( listMgr( PLAYLIST_ITEM_GET_CURR,0 ) &&( guiInfo.StreamType == STREAMTYPE_FILE ) ) 212 if ( listMgr( PLAYLIST_ITEM_GET_CURR,0 ) &&( guiInfo.StreamType == STREAMTYPE_FILE || guiInfo.StreamType == STREAMTYPE_STREAM ) )
212 { 213 {
213 plItem * next = listMgr( PLAYLIST_ITEM_GET_CURR,0 ); 214 plItem * next = listMgr( PLAYLIST_ITEM_GET_CURR,0 );
214 uiSetFileName( next->path,next->name,SAME_STREAMTYPE ); 215 uiSetFileName( next->path,next->name,SAME_STREAMTYPE );
215 } 216 }
216 217