Mercurial > mplayer.hg

comparison gui/ui/main.c @ 35352:96cda43fe250

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Don't unconditionally delete the old playlist. On loading a new file or URL, only delete the old playlist if a new file or URL has been selected. If the dialog has been cancelled, the old playlist shall remain.
author ib
date Thu, 22 Nov 2012 14:13:43 +0000
parents 92f6fc87ddc8
children c8478a499a17
comparison
equal deleted inserted replaced
35351:92f6fc87ddc8 35352:96cda43fe250
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 );
145 gtkShow( evLoadURL,NULL ); 144 gtkShow( evLoadURL,NULL );
146 break; 145 break;
147 146
148 case ivSetAudio: 147 case ivSetAudio:
149 if ( !mpctx_get_demuxer(guiInfo.mpcontext) || audio_id == iparam ) break; 148 if ( !mpctx_get_demuxer(guiInfo.mpcontext) || audio_id == iparam ) break;
270 269
271 case evLoadPlay: 270 case evLoadPlay:
272 uiMainAutoPlay=1; 271 uiMainAutoPlay=1;
273 // guiInfo.StreamType=STREAMTYPE_FILE; 272 // guiInfo.StreamType=STREAMTYPE_FILE;
274 case evLoad: 273 case evLoad:
275 listMgr( PLAYLIST_DELETE,0 );
276 gtkShow( evLoad,NULL ); 274 gtkShow( evLoad,NULL );
277 break; 275 break;
278 case evLoadSubtitle: gtkShow( evLoadSubtitle,NULL ); break; 276 case evLoadSubtitle: gtkShow( evLoadSubtitle,NULL ); break;
279 case evDropSubtitle: 277 case evDropSubtitle:
280 nfree( guiInfo.SubtitleFilename ); 278 nfree( guiInfo.SubtitleFilename );