2009-02-04 20:31:53 +01:00
|
|
|
/*
|
2013-01-03 00:35:05 +01:00
|
|
|
* Copyright (C) 2003-2013 The Music Player Daemon Project
|
2009-02-04 20:31:53 +01:00
|
|
|
* http://www.musicpd.org
|
|
|
|
*
|
|
|
|
* This program is free software; you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
2009-03-13 18:43:16 +01:00
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License along
|
|
|
|
* with this program; if not, write to the Free Software Foundation, Inc.,
|
|
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
2009-02-04 20:31:53 +01:00
|
|
|
*/
|
|
|
|
|
|
|
|
/*
|
|
|
|
* Functions for editing the playlist (adding, removing, reordering
|
|
|
|
* songs in the queue).
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2009-11-12 09:12:38 +01:00
|
|
|
#include "config.h"
|
2013-01-07 10:55:05 +01:00
|
|
|
#include "Playlist.hxx"
|
2013-01-04 22:31:53 +01:00
|
|
|
#include "PlayerControl.hxx"
|
2013-04-08 23:30:21 +02:00
|
|
|
#include "util/UriUtil.hxx"
|
2013-07-28 13:25:12 +02:00
|
|
|
#include "Song.hxx"
|
2013-01-09 08:36:52 +01:00
|
|
|
#include "Idle.hxx"
|
2013-01-03 00:30:15 +01:00
|
|
|
#include "DatabaseGlue.hxx"
|
|
|
|
#include "DatabasePlugin.hxx"
|
|
|
|
|
2009-02-04 20:31:53 +01:00
|
|
|
#include <stdlib.h>
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
void
|
|
|
|
playlist::OnModified()
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
queue.IncrementVersion();
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
idle_add(IDLE_PLAYLIST);
|
|
|
|
}
|
|
|
|
|
2009-11-03 21:08:48 +01:00
|
|
|
void
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::Clear(player_control &pc)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
Stop(pc);
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
queue.Clear();
|
|
|
|
current = -1;
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
OnModified();
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::AppendFile(struct player_control &pc,
|
2013-01-18 15:33:34 +01:00
|
|
|
const char *path_utf8, unsigned *added_id)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-07-28 13:25:12 +02:00
|
|
|
Song *song = Song::LoadFile(path_utf8, nullptr);
|
2009-02-04 20:31:53 +01:00
|
|
|
if (song == NULL)
|
|
|
|
return PLAYLIST_RESULT_NO_SUCH_SONG;
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
return AppendSong(pc, song, added_id);
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::AppendSong(struct player_control &pc,
|
2013-07-28 13:25:12 +02:00
|
|
|
Song *song, unsigned *added_id)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
|
|
|
unsigned id;
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (queue.IsFull())
|
2009-02-04 20:31:53 +01:00
|
|
|
return PLAYLIST_RESULT_TOO_LARGE;
|
|
|
|
|
2013-07-28 13:25:12 +02:00
|
|
|
const Song *const queued_song = GetQueuedSong();
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
id = queue.Append(song, 0);
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (queue.random) {
|
2009-02-04 20:31:53 +01:00
|
|
|
/* shuffle the new song into the list of remaining
|
|
|
|
songs to play */
|
|
|
|
|
|
|
|
unsigned start;
|
2013-01-07 10:55:05 +01:00
|
|
|
if (queued >= 0)
|
|
|
|
start = queued + 1;
|
2009-02-04 20:31:53 +01:00
|
|
|
else
|
2013-01-07 10:55:05 +01:00
|
|
|
start = current + 1;
|
|
|
|
if (start < queue.GetLength())
|
|
|
|
queue.ShuffleOrderLast(start, queue.GetLength());
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
UpdateQueuedSong(pc, queued_song);
|
|
|
|
OnModified();
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
if (added_id)
|
|
|
|
*added_id = id;
|
|
|
|
|
|
|
|
return PLAYLIST_RESULT_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::AppendURI(struct player_control &pc,
|
2009-11-03 21:08:48 +01:00
|
|
|
const char *uri, unsigned *added_id)
|
2009-07-14 21:28:36 +02:00
|
|
|
{
|
|
|
|
g_debug("add to playlist: %s", uri);
|
|
|
|
|
2013-01-03 00:30:15 +01:00
|
|
|
const Database *db = nullptr;
|
2013-07-28 13:25:12 +02:00
|
|
|
Song *song;
|
2013-01-03 00:30:15 +01:00
|
|
|
if (uri_has_scheme(uri)) {
|
2013-07-28 13:25:12 +02:00
|
|
|
song = Song::NewRemote(uri);
|
2013-01-03 00:30:15 +01:00
|
|
|
} else {
|
|
|
|
db = GetDatabase(nullptr);
|
|
|
|
if (db == nullptr)
|
|
|
|
return PLAYLIST_RESULT_NO_SUCH_SONG;
|
|
|
|
|
|
|
|
song = db->GetSong(uri, nullptr);
|
|
|
|
if (song == nullptr)
|
|
|
|
return PLAYLIST_RESULT_NO_SUCH_SONG;
|
|
|
|
}
|
2009-07-14 21:28:36 +02:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
enum playlist_result result = AppendSong(pc, song, added_id);
|
2013-01-03 00:30:15 +01:00
|
|
|
if (db != nullptr)
|
|
|
|
db->ReturnSong(song);
|
2012-08-15 23:28:19 +02:00
|
|
|
|
|
|
|
return result;
|
2009-07-14 21:28:36 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::SwapPositions(player_control &pc, unsigned song1, unsigned song2)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
if (!queue.IsValidPosition(song1) || !queue.IsValidPosition(song2))
|
2009-02-04 20:31:53 +01:00
|
|
|
return PLAYLIST_RESULT_BAD_RANGE;
|
|
|
|
|
2013-07-28 13:25:12 +02:00
|
|
|
const Song *const queued_song = GetQueuedSong();
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
queue.SwapPositions(song1, song2);
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (queue.random) {
|
|
|
|
/* update the queue order, so that current
|
2009-02-04 20:31:53 +01:00
|
|
|
still points to the current song order */
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
queue.SwapOrders(queue.PositionToOrder(song1),
|
|
|
|
queue.PositionToOrder(song2));
|
2009-02-04 20:31:53 +01:00
|
|
|
} else {
|
|
|
|
/* correct the "current" song order */
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (current == (int)song1)
|
|
|
|
current = song2;
|
|
|
|
else if (current == (int)song2)
|
|
|
|
current = song1;
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
UpdateQueuedSong(pc, queued_song);
|
|
|
|
OnModified();
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
return PLAYLIST_RESULT_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::SwapIds(player_control &pc, unsigned id1, unsigned id2)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
int song1 = queue.IdToPosition(id1);
|
|
|
|
int song2 = queue.IdToPosition(id2);
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
if (song1 < 0 || song2 < 0)
|
|
|
|
return PLAYLIST_RESULT_NO_SUCH_SONG;
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
return SwapPositions(pc, song1, song2);
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
2011-07-19 00:34:33 +02:00
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::SetPriorityRange(player_control &pc,
|
|
|
|
unsigned start, unsigned end,
|
|
|
|
uint8_t priority)
|
2011-07-19 00:34:33 +02:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
if (start >= GetLength())
|
2011-07-19 00:34:33 +02:00
|
|
|
return PLAYLIST_RESULT_BAD_RANGE;
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (end > GetLength())
|
|
|
|
end = GetLength();
|
2011-07-19 00:34:33 +02:00
|
|
|
|
|
|
|
if (start >= end)
|
|
|
|
return PLAYLIST_RESULT_SUCCESS;
|
|
|
|
|
|
|
|
/* remember "current" and "queued" */
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
const int current_position = GetCurrentPosition();
|
2013-07-28 13:25:12 +02:00
|
|
|
const Song *const queued_song = GetQueuedSong();
|
2011-07-19 00:34:33 +02:00
|
|
|
|
|
|
|
/* apply the priority changes */
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
queue.SetPriorityRange(start, end, priority, current);
|
2011-07-19 00:34:33 +02:00
|
|
|
|
|
|
|
/* restore "current" and choose a new "queued" */
|
|
|
|
|
|
|
|
if (current_position >= 0)
|
2013-01-07 10:55:05 +01:00
|
|
|
current = queue.PositionToOrder(current_position);
|
2011-07-19 00:34:33 +02:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
UpdateQueuedSong(pc, queued_song);
|
|
|
|
OnModified();
|
2011-07-19 00:34:33 +02:00
|
|
|
|
|
|
|
return PLAYLIST_RESULT_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::SetPriorityId(struct player_control &pc,
|
|
|
|
unsigned song_id, uint8_t priority)
|
2011-07-19 00:34:33 +02:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
int song_position = queue.IdToPosition(song_id);
|
2011-07-19 00:34:33 +02:00
|
|
|
if (song_position < 0)
|
|
|
|
return PLAYLIST_RESULT_NO_SUCH_SONG;
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
return SetPriorityRange(pc, song_position, song_position + 1,
|
|
|
|
priority);
|
2011-07-19 00:34:33 +02:00
|
|
|
|
|
|
|
}
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
void
|
|
|
|
playlist::DeleteInternal(player_control &pc,
|
2013-07-28 13:25:12 +02:00
|
|
|
unsigned song, const Song **queued_p)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
assert(song < GetLength());
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
unsigned songOrder = queue.PositionToOrder(song);
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (playing && current == (int)songOrder) {
|
2013-01-20 17:48:23 +01:00
|
|
|
const bool paused = pc.GetState() == PLAYER_STATE_PAUSE;
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
/* the current song is going to be deleted: stop the player */
|
|
|
|
|
2013-01-20 17:48:23 +01:00
|
|
|
pc.Stop();
|
2013-01-07 10:55:05 +01:00
|
|
|
playing = false;
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
/* see which song is going to be played instead */
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
current = queue.GetNextOrder(current);
|
|
|
|
if (current == (int)songOrder)
|
|
|
|
current = -1;
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (current >= 0 && !paused)
|
2009-02-04 20:31:53 +01:00
|
|
|
/* play the song after the deleted one */
|
2013-01-07 10:55:05 +01:00
|
|
|
PlayOrder(pc, current);
|
2009-02-04 20:31:53 +01:00
|
|
|
else
|
|
|
|
/* no songs left to play, stop playback
|
|
|
|
completely */
|
2013-01-07 10:55:05 +01:00
|
|
|
Stop(pc);
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2009-09-30 23:10:15 +02:00
|
|
|
*queued_p = NULL;
|
2013-01-07 10:55:05 +01:00
|
|
|
} else if (current == (int)songOrder)
|
2009-02-10 17:55:08 +01:00
|
|
|
/* there's a "current song" but we're not playing
|
|
|
|
currently - clear "current" */
|
2013-01-07 10:55:05 +01:00
|
|
|
current = -1;
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
/* now do it: remove the song */
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
queue.DeletePosition(song);
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
/* update the "current" and "queued" variables */
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (current > (int)songOrder)
|
|
|
|
current--;
|
2009-09-30 23:10:15 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::DeletePosition(struct player_control &pc, unsigned song)
|
2009-09-30 23:10:15 +02:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
if (song >= queue.GetLength())
|
2009-09-30 23:10:15 +02:00
|
|
|
return PLAYLIST_RESULT_BAD_RANGE;
|
|
|
|
|
2013-07-28 13:25:12 +02:00
|
|
|
const Song *queued_song = GetQueuedSong();
|
2009-09-30 23:10:15 +02:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
DeleteInternal(pc, song, &queued_song);
|
2009-09-30 23:10:15 +02:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
UpdateQueuedSong(pc, queued_song);
|
|
|
|
OnModified();
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
return PLAYLIST_RESULT_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2009-09-30 23:13:13 +02:00
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::DeleteRange(struct player_control &pc, unsigned start, unsigned end)
|
2009-09-30 23:13:13 +02:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
if (start >= queue.GetLength())
|
2009-09-30 23:13:13 +02:00
|
|
|
return PLAYLIST_RESULT_BAD_RANGE;
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (end > queue.GetLength())
|
|
|
|
end = queue.GetLength();
|
2009-09-30 23:13:13 +02:00
|
|
|
|
|
|
|
if (start >= end)
|
|
|
|
return PLAYLIST_RESULT_SUCCESS;
|
|
|
|
|
2013-07-28 13:25:12 +02:00
|
|
|
const Song *queued_song = GetQueuedSong();
|
2009-09-30 23:13:13 +02:00
|
|
|
|
|
|
|
do {
|
2013-01-07 10:55:05 +01:00
|
|
|
DeleteInternal(pc, --end, &queued_song);
|
2009-09-30 23:13:13 +02:00
|
|
|
} while (end != start);
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
UpdateQueuedSong(pc, queued_song);
|
|
|
|
OnModified();
|
2009-09-30 23:13:13 +02:00
|
|
|
|
|
|
|
return PLAYLIST_RESULT_SUCCESS;
|
|
|
|
}
|
|
|
|
|
2009-02-04 20:31:53 +01:00
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::DeleteId(struct player_control &pc, unsigned id)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
int song = queue.IdToPosition(id);
|
2009-02-04 20:31:53 +01:00
|
|
|
if (song < 0)
|
|
|
|
return PLAYLIST_RESULT_NO_SUCH_SONG;
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
return DeletePosition(pc, song);
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void
|
2013-07-28 13:25:12 +02:00
|
|
|
playlist::DeleteSong(struct player_control &pc, const struct Song &song)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
for (int i = queue.GetLength() - 1; i >= 0; --i)
|
|
|
|
// TODO: compare URI instead of pointer
|
|
|
|
if (&song == queue.Get(i))
|
|
|
|
DeletePosition(pc, i);
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::MoveRange(player_control &pc, unsigned start, unsigned end, int to)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
if (!queue.IsValidPosition(start) || !queue.IsValidPosition(end - 1))
|
2009-02-04 20:31:53 +01:00
|
|
|
return PLAYLIST_RESULT_BAD_RANGE;
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if ((to >= 0 && to + end - start - 1 >= GetLength()) ||
|
|
|
|
(to < 0 && unsigned(abs(to)) > GetLength()))
|
2009-02-04 20:31:53 +01:00
|
|
|
return PLAYLIST_RESULT_BAD_RANGE;
|
|
|
|
|
2009-03-26 22:02:56 +01:00
|
|
|
if ((int)start == to)
|
|
|
|
/* nothing happens */
|
2009-02-04 20:31:53 +01:00
|
|
|
return PLAYLIST_RESULT_SUCCESS;
|
|
|
|
|
2013-07-28 13:25:12 +02:00
|
|
|
const Song *const queued_song = GetQueuedSong();
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
/*
|
|
|
|
* (to < 0) => move to offset from current song
|
|
|
|
* (-playlist.length == to) => move to position BEFORE current song
|
|
|
|
*/
|
2013-01-07 10:55:05 +01:00
|
|
|
const int currentSong = GetCurrentPosition();
|
2013-08-04 14:36:22 +02:00
|
|
|
if (to < 0) {
|
|
|
|
if (currentSong < 0)
|
|
|
|
/* can't move relative to current song,
|
|
|
|
because there is no current song */
|
|
|
|
return PLAYLIST_RESULT_BAD_RANGE;
|
|
|
|
|
2011-12-19 21:15:00 +01:00
|
|
|
if (start <= (unsigned)currentSong && (unsigned)currentSong < end)
|
2009-02-04 20:31:53 +01:00
|
|
|
/* no-op, can't be moved to offset of itself */
|
|
|
|
return PLAYLIST_RESULT_SUCCESS;
|
2013-01-07 10:55:05 +01:00
|
|
|
to = (currentSong + abs(to)) % GetLength();
|
2009-03-26 22:02:56 +01:00
|
|
|
if (start < (unsigned)to)
|
|
|
|
to--;
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
queue.MoveRange(start, end, to);
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (!queue.random) {
|
2009-02-04 20:31:53 +01:00
|
|
|
/* update current/queued */
|
2013-01-07 10:55:05 +01:00
|
|
|
if ((int)start <= current && (unsigned)current < end)
|
|
|
|
current += to - start;
|
|
|
|
else if (current >= (int)end && current <= to)
|
|
|
|
current -= end - start;
|
|
|
|
else if (current >= to && current < (int)start)
|
|
|
|
current += end - start;
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
UpdateQueuedSong(pc, queued_song);
|
|
|
|
OnModified();
|
2009-02-04 20:31:53 +01:00
|
|
|
|
|
|
|
return PLAYLIST_RESULT_SUCCESS;
|
|
|
|
}
|
|
|
|
|
|
|
|
enum playlist_result
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::MoveId(player_control &pc, unsigned id1, int to)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
int song = queue.IdToPosition(id1);
|
2009-02-04 20:31:53 +01:00
|
|
|
if (song < 0)
|
|
|
|
return PLAYLIST_RESULT_NO_SUCH_SONG;
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
return MoveRange(pc, song, song + 1, to);
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
2009-07-14 21:28:36 +02:00
|
|
|
void
|
2013-01-07 10:55:05 +01:00
|
|
|
playlist::Shuffle(player_control &pc, unsigned start, unsigned end)
|
2009-02-04 20:31:53 +01:00
|
|
|
{
|
2013-01-07 10:55:05 +01:00
|
|
|
if (end > GetLength())
|
2009-02-13 11:12:31 +01:00
|
|
|
/* correct the "end" offset */
|
2013-01-07 10:55:05 +01:00
|
|
|
end = GetLength();
|
2009-02-13 11:12:31 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (start + 1 >= end)
|
2009-02-13 11:12:31 +01:00
|
|
|
/* needs at least two entries. */
|
2009-02-04 20:31:53 +01:00
|
|
|
return;
|
|
|
|
|
2013-07-28 13:25:12 +02:00
|
|
|
const Song *const queued_song = GetQueuedSong();
|
2013-01-07 10:55:05 +01:00
|
|
|
if (playing && current >= 0) {
|
|
|
|
unsigned current_position = queue.OrderToPosition(current);
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (current_position >= start && current_position < end) {
|
2009-02-04 20:31:53 +01:00
|
|
|
/* put current playing song first */
|
2013-01-07 10:55:05 +01:00
|
|
|
queue.SwapPositions(start, current_position);
|
2009-02-13 10:38:32 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
if (queue.random) {
|
|
|
|
current = queue.PositionToOrder(start);
|
2009-02-13 10:38:32 +01:00
|
|
|
} else
|
2013-01-07 10:55:05 +01:00
|
|
|
current = start;
|
2009-02-13 10:38:32 +01:00
|
|
|
|
|
|
|
/* start shuffle after the current song */
|
|
|
|
start++;
|
|
|
|
}
|
2009-02-04 20:31:53 +01:00
|
|
|
} else {
|
2013-01-07 10:55:05 +01:00
|
|
|
/* no playback currently: reset current */
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
current = -1;
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
queue.ShuffleRange(start, end);
|
2009-02-04 20:31:53 +01:00
|
|
|
|
2013-01-07 10:55:05 +01:00
|
|
|
UpdateQueuedSong(pc, queued_song);
|
|
|
|
OnModified();
|
2009-02-04 20:31:53 +01:00
|
|
|
}
|