anna
/
ocarina
1
0
Fork 0
Code Issues 7 Pull Requests Releases Wiki Activity

libsaria: Remove old queue code 

With Playlists this code is no longer needed.  I'll remove more of this
code once I've updated the UI.

Signed-off-by: Bryan Schumaker <bjschuma@gmail.com>
This commit is contained in:
Bryan Schumaker 2012-02-18 12:10:02 -05:00 committed by Bryan Schumaker
parent 57c8fcf030
commit 2813481dff
4 changed files with 26 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
libsaria/queue/file.cpp
View File

@ -1,50 +0,0 @@
// Copyright (c) 2011 Bryan Schumaker.
#include <libsaria/idle.h>
#include <libsaria/callback.h>
#include <libsaria/queue.h>
#include "queue.h"
static void do_load()
{
unsigned int size;
sid_t songid;
InFile in("queue.q");
if (!in.good())
return;
in >> size;
for (unsigned int i = 0; i < size; i++) {
in >> songid;
playqueue.push_back(songid);
}
trigger_callback(QUEUE_REFRESH);
}
static void do_save()
{
OutFile out("queue.q");
list<sid_t>::iterator it;
out << playqueue.size() << "\n";
for (it = playqueue.begin(); it != playqueue.end(); it++)
out << (*it) << "\n";
}
namespace libsaria
{
void queue::load()
{
LoadTask *task = new LoadTask(do_load);
task->queue();
}
void queue::save()
{
SaveTask *task = new SaveTask(do_save);
task->queue_front();
}
}

29
libsaria/queue/iter.cpp
View File

@ -1,29 +0,0 @@
// Copyright (c) 2011 Bryan Schumaker.
#include <libsaria/library.h>
#include <libsaria/queue.h>
#include "queue.h"
static list<sid_t>::iterator it;
namespace libsaria
{
namespace queue
{
void iter::reset()
{
q_queue.iter_reset();
}
libsaria::Track *iter::next()
{
return q_queue.iter_next();
}
bool iter::end()
{
return q_queue.iter_end();
}
}; /* Namespace: queue */
} /* Namespace: libsaria */

38
libsaria/queue/queue.cpp
View File

@ -6,12 +6,10 @@ using namespace std;
#include <libsaria/library.h>
#include <libsaria/callback.h>
#include <libsaria/playlist.h>
#include "queue.h"
list<sid_t> playqueue;
libsaria::Playlist q_queue("queue.q");
static libsaria::Playlist q_queue("queue.q");
static void save_and_refresh()
static void refresh()
{
trigger_callback(QUEUE_REFRESH);
}
@ -21,18 +19,14 @@ namespace libsaria
void queue::add_ids(list<sid_t> &ids)
{
playqueue.insert(playqueue.end(), ids.begin(), ids.end());
q_queue.add_ids(ids);
save_and_refresh();
refresh();
}
void queue::rm_ids(list<sid_t> &ids)
{
list<sid_t>::iterator it;
for (it = ids.begin(); it != ids.end(); it++)
playqueue.remove(*it);
q_queue.rm_ids(ids);
save_and_refresh();
refresh();
}
unsigned int queue::size()
@ -43,9 +37,29 @@ namespace libsaria
string queue::next_file()
{
sid_t inode = q_queue.next();
playqueue.pop_front();
save_and_refresh();
refresh();
return library::find_filepath(inode);
}
void queue::load()
{
LoadTask *task = new LoadTask(refresh);
task->queue();
}
void queue::iter::reset()
{
q_queue.iter_reset();
}
libsaria::Track *queue::iter::next()
{
return q_queue.iter_next();
}
bool queue::iter::end()
{
return q_queue.iter_end();
}
} /* Namespace: libsaria */

13
libsaria/queue/queue.h
View File

@ -1,13 +0,0 @@
#ifndef LIBSARIA_QUEUE_INTERNAL_H
#define LIBSARIA_QUEUE_INTERNAL_H
#include <libsaria/playlist.h>
#include <libsaria/track.h>
#include <list>
using namespace std;
extern list<sid_t> playqueue;
extern libsaria::Playlist q_queue;
#endif /* LIBSARIA_QUEUE_INTERNAL_H */