Mercurial > mplayer.hg
comparison Gui/mplayer/play.c @ 9291:64b8c5a07c2c
- It adds an option enqueue/noenqueue, so users can choose if they want to
have playlist overwritten by files on commandline or just enqueue them at
the end ...
- Playtree is finally cleared, as such gui has total control!
- Autoplay if files are available on commandline and -enqueue is not set!
- Fallback on Playlists finally does work with Gui and even with streaming
Playlists! [ Before gui was broken as mplayer.c:playtree tried to have
control]
patch by Fabian Franz <FabianFranz@gmx.de>
author | arpi |
---|---|
date | Wed, 05 Feb 2003 23:02:35 +0000 |
parents | c2f31ca14a92 |
children | f0bcaf5ea675 |
comparison
equal
deleted
inserted
replaced
9290:0e043196d176 | 9291:64b8c5a07c2c |
---|---|
67 | 67 |
68 void mplEnd( void ) | 68 void mplEnd( void ) |
69 { | 69 { |
70 plItem * next; | 70 plItem * next; |
71 | 71 |
72 if ( !mplGotoTheNext ) { mplGotoTheNext=1; return; } | 72 if ( !mplGotoTheNext && guiIntfStruct.Playing) { mplGotoTheNext=1; return; } |
73 | 73 |
74 if ( guiIntfStruct.Playing && (next=gtkSet( gtkGetNextPlItem,0,NULL )) && plLastPlayed != next ) | 74 if ( guiIntfStruct.Playing && (next=gtkSet( gtkGetNextPlItem,0,NULL )) && plLastPlayed != next ) |
75 { | 75 { |
76 plLastPlayed=next; | 76 plLastPlayed=next; |
77 guiSetDF( guiIntfStruct.Filename,next->path,next->name ); | 77 guiSetDF( guiIntfStruct.Filename,next->path,next->name ); |
266 guiIntfStruct.StreamType=type; | 266 guiIntfStruct.StreamType=type; |
267 gfree( (void **)&guiIntfStruct.AudioFile ); | 267 gfree( (void **)&guiIntfStruct.AudioFile ); |
268 gfree( (void **)&guiIntfStruct.Subtitlename ); | 268 gfree( (void **)&guiIntfStruct.Subtitlename ); |
269 } | 269 } |
270 | 270 |
271 void mplCurr( void ) | |
272 { | |
273 plItem * curr; | |
274 int stop = 0; | |
275 | |
276 if ( guiIntfStruct.Playing == 2 ) return; | |
277 switch ( guiIntfStruct.StreamType ) | |
278 { | |
279 #ifdef USE_DVDREAD | |
280 case STREAMTYPE_DVD: | |
281 break; | |
282 #endif | |
283 #ifdef HAVE_VCD | |
284 case STREAMTYPE_VCD: | |
285 break; | |
286 #endif | |
287 default: | |
288 if ( (curr=gtkSet( gtkGetCurrPlItem,0,NULL)) ) | |
289 { | |
290 mplSetFileName( curr->path,curr->name,STREAMTYPE_FILE ); | |
291 mplGotoTheNext=0; | |
292 break; | |
293 } | |
294 return; | |
295 } | |
296 if ( stop ) mplEventHandling( evStop,0 ); | |
297 if ( guiIntfStruct.Playing == 1 ) mplEventHandling( evPlay,0 ); | |
298 } | |
299 | |
300 | |
271 void mplPrev( void ) | 301 void mplPrev( void ) |
272 { | 302 { |
273 plItem * prev; | 303 plItem * prev; |
274 int stop = 0; | 304 int stop = 0; |
275 | 305 |