oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

Queue: rename struct queue to Queue 

Works around a build failure on Solaris because annoyingly, Solaris
reserves the name "queue".  This rename was pending anyway.
This commit is contained in:
Max Kellermann 2014-01-20 08:57:22 +01:00
parent 6b4d7d7315
commit ab9c9068d4
12 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -1,6 +1,7 @@
ver 0.18.8 (not yet released) ver 0.18.8 (not yet released)
* decoder * decoder
- ffmpeg: support libav v10_alpha1 - ffmpeg: support libav v10_alpha1
* fix Solaris build failure
ver 0.18.7 (2013/01/13) ver 0.18.7 (2013/01/13)
* playlist * playlist

2
src/Playlist.hxx
View File

@ -30,7 +30,7 @@ struct playlist {
/** /**
* The song queue - it contains the "real" playlist. * The song queue - it contains the "real" playlist.
*/ */
struct queue queue; struct Queue queue;
/** /**
* This value is true if the player is currently playing (or * This value is true if the player is currently playing (or

4
src/PlaylistPrint.cxx
View File

@ -40,7 +40,7 @@
void void
playlist_print_uris(Client &client, const playlist &playlist) playlist_print_uris(Client &client, const playlist &playlist)
{ {
const queue &queue = playlist.queue; const Queue &queue = playlist.queue;
queue_print_uris(client, queue, 0, queue.GetLength()); queue_print_uris(client, queue, 0, queue.GetLength());
} }
@ -49,7 +49,7 @@ bool
playlist_print_info(Client &client, const playlist &playlist, playlist_print_info(Client &client, const playlist &playlist,
unsigned start, unsigned end) unsigned start, unsigned end)
{ {
const queue &queue = playlist.queue; const Queue &queue = playlist.queue;
if (end > queue.GetLength()) if (end > queue.GetLength())
/* correct the "end" offset */ /* correct the "end" offset */

2
src/PlaylistSave.cxx
View File

@ -65,7 +65,7 @@ playlist_print_uri(FILE *file, const char *uri)
} }
PlaylistResult PlaylistResult
spl_save_queue(const char *name_utf8, const queue &queue) spl_save_queue(const char *name_utf8, const Queue &queue)
{ {
if (map_spl_path().IsNull()) if (map_spl_path().IsNull())
return PlaylistResult::DISABLED; return PlaylistResult::DISABLED;

4
src/PlaylistSave.hxx
View File

@ -25,7 +25,7 @@
#include <stdio.h> #include <stdio.h>
struct Song; struct Song;
struct queue; struct Queue;
struct playlist; struct playlist;
struct PlayerControl; struct PlayerControl;
class Error; class Error;
@ -40,7 +40,7 @@ playlist_print_uri(FILE *fp, const char *uri);
* Saves a queue object into a stored playlist file. * Saves a queue object into a stored playlist file.
*/ */
PlaylistResult PlaylistResult
spl_save_queue(const char *name_utf8, const queue &queue); spl_save_queue(const char *name_utf8, const Queue &queue);
/** /**
* Saves a playlist object into a stored playlist file. * Saves a playlist object into a stored playlist file.

50
src/Queue.cxx
View File

@ -23,7 +23,7 @@
#include <stdlib.h> #include <stdlib.h>
queue::queue(unsigned _max_length) Queue::Queue(unsigned _max_length)
:max_length(_max_length), length(0), :max_length(_max_length), length(0),
version(1), version(1),
items(new Item[max_length]), items(new Item[max_length]),
@ -36,7 +36,7 @@ queue::queue(unsigned _max_length)
{ {
} }
queue::~queue() Queue::~Queue()
{ {
Clear(); Clear();
@ -45,7 +45,7 @@ queue::~queue()
} }
int int
queue::GetNextOrder(unsigned _order) const Queue::GetNextOrder(unsigned _order) const
{ {
assert(_order < length); assert(_order < length);
@ -62,7 +62,7 @@ queue::GetNextOrder(unsigned _order) const
} }
void void
queue::IncrementVersion() Queue::IncrementVersion()
{ {
static unsigned long max = ((uint32_t) 1 << 31) - 1; static unsigned long max = ((uint32_t) 1 << 31) - 1;
@ -77,7 +77,7 @@ queue::IncrementVersion()
} }
void void
queue::ModifyAtOrder(unsigned _order) Queue::ModifyAtOrder(unsigned _order)
{ {
assert(_order < length); assert(_order < length);
@ -86,7 +86,7 @@ queue::ModifyAtOrder(unsigned _order)
} }
unsigned unsigned
queue::Append(Song *song, uint8_t priority) Queue::Append(Song *song, uint8_t priority)
{ {
assert(!IsFull()); assert(!IsFull());
@ -105,7 +105,7 @@ queue::Append(Song *song, uint8_t priority)
} }
void void
queue::SwapPositions(unsigned position1, unsigned position2) Queue::SwapPositions(unsigned position1, unsigned position2)
{ {
unsigned id1 = items[position1].id; unsigned id1 = items[position1].id;
unsigned id2 = items[position2].id; unsigned id2 = items[position2].id;
@ -120,7 +120,7 @@ queue::SwapPositions(unsigned position1, unsigned position2)
} }
void void
queue::MovePostion(unsigned from, unsigned to) Queue::MovePostion(unsigned from, unsigned to)
{ {
const Item tmp = items[from]; const Item tmp = items[from];
@ -156,7 +156,7 @@ queue::MovePostion(unsigned from, unsigned to)
} }
void void
queue::MoveRange(unsigned start, unsigned end, unsigned to) Queue::MoveRange(unsigned start, unsigned end, unsigned to)
{ {
Item tmp[end - start]; Item tmp[end - start];
// Copy the original block [start,end-1] // Copy the original block [start,end-1]
@ -198,7 +198,7 @@ queue::MoveRange(unsigned start, unsigned end, unsigned to)
} }
void void
queue::MoveOrder(unsigned from_order, unsigned to_order) Queue::MoveOrder(unsigned from_order, unsigned to_order)
{ {
assert(from_order < length); assert(from_order < length);
assert(to_order <= length); assert(to_order <= length);
@ -217,7 +217,7 @@ queue::MoveOrder(unsigned from_order, unsigned to_order)
} }
void void
queue::DeletePosition(unsigned position) Queue::DeletePosition(unsigned position)
{ {
assert(position < length); assert(position < length);
@ -254,7 +254,7 @@ queue::DeletePosition(unsigned position)
} }
void void
queue::Clear() Queue::Clear()
{ {
for (unsigned i = 0; i < length; i++) { for (unsigned i = 0; i < length; i++) {
Item *item = &items[i]; Item *item = &items[i];
@ -270,7 +270,7 @@ queue::Clear()
} }
static void static void
queue_sort_order_by_priority(struct queue *queue, unsigned start, unsigned end) queue_sort_order_by_priority(Queue *queue, unsigned start, unsigned end)
{ {
assert(queue != nullptr); assert(queue != nullptr);
assert(queue->random); assert(queue->random);
@ -278,8 +278,8 @@ queue_sort_order_by_priority(struct queue *queue, unsigned start, unsigned end)
assert(end <= queue->length); assert(end <= queue->length);
auto cmp = [queue](unsigned a_pos, unsigned b_pos){ auto cmp = [queue](unsigned a_pos, unsigned b_pos){
const queue::Item &a = queue->items[a_pos]; const Queue::Item &a = queue->items[a_pos];
const queue::Item &b = queue->items[b_pos]; const Queue::Item &b = queue->items[b_pos];
return a.priority > b.priority; return a.priority > b.priority;
}; };
@ -288,7 +288,7 @@ queue_sort_order_by_priority(struct queue *queue, unsigned start, unsigned end)
} }
void void
queue::ShuffleOrderRange(unsigned start, unsigned end) Queue::ShuffleOrderRange(unsigned start, unsigned end)
{ {
assert(random); assert(random);
assert(start <= end); assert(start <= end);
@ -303,7 +303,7 @@ queue::ShuffleOrderRange(unsigned start, unsigned end)
* priority group. * priority group.
*/ */
void void
queue::ShuffleOrderRangeWithPriority(unsigned start, unsigned end) Queue::ShuffleOrderRangeWithPriority(unsigned start, unsigned end)
{ {
assert(random); assert(random);
assert(start <= end); assert(start <= end);
@ -337,13 +337,13 @@ queue::ShuffleOrderRangeWithPriority(unsigned start, unsigned end)
} }
void void
queue::ShuffleOrder() Queue::ShuffleOrder()
{ {
ShuffleOrderRangeWithPriority(0, length); ShuffleOrderRangeWithPriority(0, length);
} }
void void
queue::ShuffleOrderFirst(unsigned start, unsigned end) Queue::ShuffleOrderFirst(unsigned start, unsigned end)
{ {
rand.AutoCreate(); rand.AutoCreate();
@ -352,7 +352,7 @@ queue::ShuffleOrderFirst(unsigned start, unsigned end)
} }
void void
queue::ShuffleOrderLast(unsigned start, unsigned end) Queue::ShuffleOrderLast(unsigned start, unsigned end)
{ {
rand.AutoCreate(); rand.AutoCreate();
@ -361,7 +361,7 @@ queue::ShuffleOrderLast(unsigned start, unsigned end)
} }
void void
queue::ShuffleRange(unsigned start, unsigned end) Queue::ShuffleRange(unsigned start, unsigned end)
{ {
assert(start <= end); assert(start <= end);
assert(end <= length); assert(end <= length);
@ -377,7 +377,7 @@ queue::ShuffleRange(unsigned start, unsigned end)
} }
unsigned unsigned
queue::FindPriorityOrder(unsigned start_order, uint8_t priority, Queue::FindPriorityOrder(unsigned start_order, uint8_t priority,
unsigned exclude_order) const unsigned exclude_order) const
{ {
assert(random); assert(random);
@ -394,7 +394,7 @@ queue::FindPriorityOrder(unsigned start_order, uint8_t priority,
} }
unsigned unsigned
queue::CountSamePriority(unsigned start_order, uint8_t priority) const Queue::CountSamePriority(unsigned start_order, uint8_t priority) const
{ {
assert(random); assert(random);
assert(start_order <= length); assert(start_order <= length);
@ -410,7 +410,7 @@ queue::CountSamePriority(unsigned start_order, uint8_t priority) const
} }
bool bool
queue::SetPriority(unsigned position, uint8_t priority, int after_order) Queue::SetPriority(unsigned position, uint8_t priority, int after_order)
{ {
assert(position < length); assert(position < length);
@ -468,7 +468,7 @@ queue::SetPriority(unsigned position, uint8_t priority, int after_order)
} }
bool bool
queue::SetPriorityRange(unsigned start_position, unsigned end_position, Queue::SetPriorityRange(unsigned start_position, unsigned end_position,
uint8_t priority, int after_order) uint8_t priority, int after_order)
{ {
assert(start_position <= end_position); assert(start_position <= end_position);

10
src/Queue.hxx
View File

@ -41,7 +41,7 @@ struct Song;
* - the unique id (which stays the same, regardless of moves) * - the unique id (which stays the same, regardless of moves)
* - the order number (which only differs from "position" in random mode) * - the order number (which only differs from "position" in random mode)
*/ */
struct queue { struct Queue {
/** /**
* reserve max_length * HASH_MULT elements in the id * reserve max_length * HASH_MULT elements in the id
* number space * number space
@ -103,16 +103,16 @@ struct queue {
/** random number generator for shuffle and random mode */ /** random number generator for shuffle and random mode */
LazyRandomEngine rand; LazyRandomEngine rand;
explicit queue(unsigned max_length); explicit Queue(unsigned max_length);
/** /**
* Deinitializes a queue object. It does not free the queue * Deinitializes a queue object. It does not free the queue
* pointer itself. * pointer itself.
*/ */
~queue(); ~Queue();
queue(const queue &other) = delete; Queue(const Queue &) = delete;
queue &operator=(const queue &other) = delete; Queue &operator=(const Queue &) = delete;
unsigned GetLength() const { unsigned GetLength() const {
assert(length <= max_length); assert(length <= max_length);

12
src/QueuePrint.cxx
View File

@ -38,7 +38,7 @@ extern "C" {
* @param end the index of the last song (excluding) * @param end the index of the last song (excluding)
*/ */
static void static void
queue_print_song_info(Client &client, const queue &queue, queue_print_song_info(Client &client, const Queue &queue,
unsigned position) unsigned position)
{ {
song_print_info(client, queue.Get(position)); song_print_info(client, queue.Get(position));
@ -51,7 +51,7 @@ queue_print_song_info(Client &client, const queue &queue,
} }
void void
queue_print_info(Client &client, const queue &queue, queue_print_info(Client &client, const Queue &queue,
unsigned start, unsigned end) unsigned start, unsigned end)
{ {
assert(start <= end); assert(start <= end);
@ -62,7 +62,7 @@ queue_print_info(Client &client, const queue &queue,
} }
void void
queue_print_uris(Client &client, const queue &queue, queue_print_uris(Client &client, const Queue &queue,
unsigned start, unsigned end) unsigned start, unsigned end)
{ {
assert(start <= end); assert(start <= end);
@ -75,7 +75,7 @@ queue_print_uris(Client &client, const queue &queue,
} }
void void
queue_print_changes_info(Client &client, const queue &queue, queue_print_changes_info(Client &client, const Queue &queue,
uint32_t version) uint32_t version)
{ {
for (unsigned i = 0; i < queue.GetLength(); i++) { for (unsigned i = 0; i < queue.GetLength(); i++) {
@ -85,7 +85,7 @@ queue_print_changes_info(Client &client, const queue &queue,
} }
void void
queue_print_changes_position(Client &client, const queue &queue, queue_print_changes_position(Client &client, const Queue &queue,
uint32_t version) uint32_t version)
{ {
for (unsigned i = 0; i < queue.GetLength(); i++) for (unsigned i = 0; i < queue.GetLength(); i++)
@ -95,7 +95,7 @@ queue_print_changes_position(Client &client, const queue &queue,
} }
void void
queue_find(Client &client, const queue &queue, queue_find(Client &client, const Queue &queue,
const SongFilter &filter) const SongFilter &filter)
{ {
for (unsigned i = 0; i < queue.GetLength(); i++) { for (unsigned i = 0; i < queue.GetLength(); i++) {

12
src/QueuePrint.hxx
View File

@ -27,28 +27,28 @@
#include <stdint.h> #include <stdint.h>
struct queue; struct Queue;
class SongFilter; class SongFilter;
class Client; class Client;
void void
queue_print_info(Client &client, const queue &queue, queue_print_info(Client &client, const Queue &queue,
unsigned start, unsigned end); unsigned start, unsigned end);
void void
queue_print_uris(Client &client, const queue &queue, queue_print_uris(Client &client, const Queue &queue,
unsigned start, unsigned end); unsigned start, unsigned end);
void void
queue_print_changes_info(Client &client, const queue &queue, queue_print_changes_info(Client &client, const Queue &queue,
uint32_t version); uint32_t version);
void void
queue_print_changes_position(Client &client, const queue &queue, queue_print_changes_position(Client &client, const Queue &queue,
uint32_t version); uint32_t version);
void void
queue_find(Client &client, const queue &queue, queue_find(Client &client, const Queue &queue,
const SongFilter &filter); const SongFilter &filter);
#endif #endif

4
src/QueueSave.cxx
View File

@ -60,7 +60,7 @@ queue_save_song(FILE *fp, int idx, const Song &song)
} }
void void
queue_save(FILE *fp, const queue &queue) queue_save(FILE *fp, const Queue &queue)
{ {
for (unsigned i = 0; i < queue.GetLength(); i++) { for (unsigned i = 0; i < queue.GetLength(); i++) {
uint8_t prio = queue.GetPriorityAtPosition(i); uint8_t prio = queue.GetPriorityAtPosition(i);
@ -72,7 +72,7 @@ queue_save(FILE *fp, const queue &queue)
} }
void void
queue_load_song(TextFile &file, const char *line, queue &queue) queue_load_song(TextFile &file, const char *line, Queue &queue)
{ {
if (queue.IsFull()) if (queue.IsFull())
return; return;

6
src/QueueSave.hxx
View File

@ -27,16 +27,16 @@
#include <stdio.h> #include <stdio.h>
struct queue; struct Queue;
class TextFile; class TextFile;
void void
queue_save(FILE *fp, const queue &queue); queue_save(FILE *fp, const Queue &queue);
/** /**
* Loads one song from the state file and appends it to the queue. * Loads one song from the state file and appends it to the queue.
*/ */
void void
queue_load_song(TextFile &file, const char *line, queue &queue); queue_load_song(TextFile &file, const char *line, Queue &queue);
#endif #endif

4
test/test_queue_priority.cxx
View File

@ -26,7 +26,7 @@ Song::Free()
} }
static void static void
check_descending_priority(const struct queue *queue, check_descending_priority(const Queue *queue,
unsigned start_order) unsigned start_order)
{ {
assert(start_order < queue->GetLength()); assert(start_order < queue->GetLength());
@ -55,7 +55,7 @@ QueuePriorityTest::TestPriority()
{ {
static Song songs[16]; static Song songs[16];
struct queue queue(32); Queue queue(32);
for (unsigned i = 0; i < ARRAY_SIZE(songs); ++i) for (unsigned i = 0; i < ARRAY_SIZE(songs); ++i)
queue.Append(&songs[i], 0); queue.Append(&songs[i], 0);