diff options
author | Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-14 22:46:05 +0200 |
---|---|---|
committer | Alexey Yakovenko <wakeroid@gmail.com> | 2010-05-14 22:46:50 +0200 |
commit | 66fcdb87b1b1730845e966de2a65806f9d04f20a (patch) | |
tree | aefd64e7181e29ed70e06faa8c2544e19e0f2244 /main.c | |
parent | 6c6a435e96b2064337357120a7e88ba7e685eb48 (diff) |
ignore current paused song if new files were opened from cmdline
Diffstat (limited to 'main.c')
-rw-r--r-- | main.c | 17 |
1 files changed, 9 insertions, 8 deletions
@@ -230,7 +230,7 @@ server_exec_command_line (const char *cmdline, int len, char *sendback, int sbsi } messagepump_push (M_PLAYLISTREFRESH, 0, 0, 0); if (!queue) { - messagepump_push (M_PLAYSONG, 0, 0, 0); + messagepump_push (M_PLAYSONG, 0, 1, 0); return 2; // don't reload playlist at startup } } @@ -350,15 +350,16 @@ player_mainloop (void) { break; case M_TERMINATE: return; -// case M_SONGCHANGED: -// plug_trigger_event_trackchange (p1, p2); -// break; case M_PLAYSONG: - streamer_play_current_track (); + if (p1) { + p_stop (); + pl_playqueue_clear (); + streamer_set_nextsong (0, 1); + } + else { + streamer_play_current_track (); + } break; -// case M_TRACKCHANGED: -// plug_trigger_event_trackinfochanged (p1); -// break; case M_PLAYSONGNUM: p_stop (); pl_playqueue_clear (); |