libsaria: Remove commented out playlist code
I don't think I need any of it anymore. Signed-off-by: Bryan Schumaker <bjschuma@gmail.com>
This commit is contained in:
Bryan Schumaker
parent
7b527bc4e3
commit
e5b91a5de9
|
|
@ -7,15 +7,6 @@
|
|||
|
||||
#include <stdlib.h>
|
||||
|
||||
/*static unsigned int CHECK_RAND_PREF = PL_RANDOM | PL_SEQUENTIAL;
|
||||
|
||||
static inline bool choose_randomly(unsigned int flags)
|
||||
{
|
||||
if ((flags & CHECK_RAND_PREF) == CHECK_RAND_PREF)
|
||||
return true; //libsaria::prefs::get_bool("random");
|
||||
return (flags & PL_RANDOM) == PL_RANDOM;
|
||||
}
|
||||
*/
|
||||
namespace libsaria
|
||||
{
|
||||
|
||||
|
|
@ -45,55 +36,6 @@ namespace libsaria
|
|||
RENDER(remove_index(index));
|
||||
return res;
|
||||
}
|
||||
/*
|
||||
bool Playlist::pick_next(list<Track *>::iterator &it)
|
||||
{
|
||||
incr_iter(it);
|
||||
if (it == cur) {
|
||||
incr_iter(it);
|
||||
return true;
|
||||
}
|
||||
|
||||
if (flags & PL_FILTER) {
|
||||
//sid_t songid = (*it)->get_songid();
|
||||
//return libsaria::index::is_visible(songid);
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void Playlist::sequential_next()
|
||||
{
|
||||
bool found;
|
||||
list<Track *>::iterator it = cur;
|
||||
|
||||
do {
|
||||
found = pick_next(it);
|
||||
} while (!found);
|
||||
|
||||
cur = it;
|
||||
}
|
||||
|
||||
void Playlist::random_next()
|
||||
{
|
||||
unsigned int n, num_visible = apparent_size();
|
||||
|
||||
if (num_visible == 0)
|
||||
return;
|
||||
|
||||
n = rand() % num_visible;
|
||||
|
||||
for (unsigned int i = 0; i < n; i++) {
|
||||
incr_iter(cur);
|
||||
if (flags & PL_FILTER) {*/
|
||||
/*sid_t songid = (*cur)->get_songid();
|
||||
while (!index::is_visible(songid)) {
|
||||
incr_iter(cur);
|
||||
songid = (*cur)->get_songid();
|
||||
}*/
|
||||
/* }
|
||||
}
|
||||
}*/
|
||||
|
||||
Track *Playlist::pick_sequential()
|
||||
{
|
||||
|
|
@ -125,31 +67,4 @@ namespace libsaria
|
|||
return picked_next();
|
||||
}
|
||||
|
||||
/*Track *Playlist::next()
|
||||
{
|
||||
int index;
|
||||
Track *track;
|
||||
|
||||
if (choose_randomly(flags))
|
||||
random_next();
|
||||
else if (flags & PL_SEQUENTIAL)
|
||||
sequential_next();
|
||||
|
||||
track = (*cur);
|
||||
|
||||
if (flags & PL_DRAIN) {
|
||||
index = distance(cur, plist.begin());
|
||||
plist.erase(cur);
|
||||
if (renderer) {
|
||||
renderer->index_removed(index);
|
||||
if (plist.size() == 0)
|
||||
renderer->playlist_empty();
|
||||
}
|
||||
cur = plist.end();
|
||||
save();
|
||||
}
|
||||
|
||||
return track;
|
||||
}*/
|
||||
|
||||
}; /* Namespace: libsaria */
|
||||
|
|
|
|||
|
|
@ -4,41 +4,9 @@
|
|||
#include <libsaria/playlist.h>
|
||||
#include <libsaria/renderer.h>
|
||||
|
||||
/*static bool compare_tracks(libsaria::Track *one, libsaria::Track *two)
|
||||
{*/
|
||||
/* I want to compare tracks and not pointers */
|
||||
//return *one < *two;
|
||||
/* return true;
|
||||
}
|
||||
|
||||
static void advance_iterator(list<libsaria::Track *>::iterator &it, int n)
|
||||
{
|
||||
for (int i = 0; i < n; i++)
|
||||
it++;
|
||||
}
|
||||
|
||||
static void remove_iterator(list<libsaria::Track *> &lst, list<libsaria::Track *>::iterator &it)
|
||||
{
|
||||
it = lst.erase(it);
|
||||
it--;
|
||||
}*/
|
||||
|
||||
namespace libsaria
|
||||
{
|
||||
|
||||
/*void Playlist::init_common(string file, unsigned int options)
|
||||
{
|
||||
filename = file;
|
||||
flags = options;
|
||||
cur = plist.end();
|
||||
load();
|
||||
}
|
||||
|
||||
Playlist::Playlist(string file, unsigned int options)
|
||||
{
|
||||
init_common(file, options);
|
||||
}*/
|
||||
|
||||
Playlist::Playlist(string n, unsigned int f)
|
||||
{
|
||||
name = n;
|
||||
|
|
@ -86,93 +54,4 @@ namespace libsaria
|
|||
renderer = r;
|
||||
}
|
||||
|
||||
/*void Playlist::delete_renderer()
|
||||
{
|
||||
if (del_renderer && renderer)
|
||||
delete renderer;
|
||||
}
|
||||
|
||||
void Playlist::reload()
|
||||
{
|
||||
plist.clear();
|
||||
init_common(filename, flags);
|
||||
}
|
||||
|
||||
void Playlist::add_ids(list<sid_t> &ids)
|
||||
{
|
||||
Track *track;
|
||||
list<sid_t>::iterator it;
|
||||
|
||||
for (it = ids.begin(); it != ids.end(); it++) {
|
||||
//track = library::lookup(*it);
|
||||
plist.push_back(track);
|
||||
if (renderer)
|
||||
renderer->insert(track, plist.size() - 1);
|
||||
}
|
||||
save();
|
||||
}
|
||||
|
||||
void Playlist::add_track(libsaria::Track *track)
|
||||
{
|
||||
plist.push_back(track);
|
||||
save();
|
||||
}
|
||||
|
||||
void Playlist::rm_indices(list<int> &ids)
|
||||
{
|
||||
int removed = 0, cur_index = 0;
|
||||
list<int>::iterator it;
|
||||
list<Track *>::iterator cur = plist.begin();
|
||||
|
||||
ids.sort();
|
||||
for(it = ids.begin(); it != ids.end(); it++) {
|
||||
advance_iterator(cur, (*it) - cur_index);
|
||||
remove_iterator(plist, cur);
|
||||
cur_index = *it;
|
||||
if (renderer)
|
||||
renderer->index_removed(*it - removed);
|
||||
removed++;
|
||||
}
|
||||
save();
|
||||
|
||||
if (renderer && (plist.size() == 0))
|
||||
renderer->playlist_empty();
|
||||
}
|
||||
|
||||
void Playlist::rm_track(Track *track)
|
||||
{
|
||||
plist.remove(track);
|
||||
}
|
||||
|
||||
void Playlist::sort()
|
||||
{
|
||||
plist.sort(compare_tracks);
|
||||
}
|
||||
|
||||
unsigned int Playlist::size()
|
||||
{
|
||||
return plist.size();
|
||||
}
|
||||
|
||||
unsigned int Playlist::apparent_size()
|
||||
{
|
||||
if ( (flags & PL_FILTER) && (index::is_filtered()) )
|
||||
return index::size();
|
||||
return plist.size();
|
||||
}
|
||||
|
||||
void Playlist::for_each_insert()
|
||||
{
|
||||
unsigned int i;
|
||||
list<Track *>::iterator it;
|
||||
|
||||
if (renderer == NULL)
|
||||
return;
|
||||
|
||||
i = 0;
|
||||
for (it = plist.begin(); it != plist.end(); it++) {
|
||||
renderer->insert(*it, i);
|
||||
i++;
|
||||
}
|
||||
}*/
|
||||
}
|
||||
|
|
|
|||
|
|
@ -45,36 +45,4 @@ namespace libsaria
|
|||
{
|
||||
}
|
||||
|
||||
/*void PlaylistRenderer::set_playlist(Playlist *plist, bool del_render)
|
||||
{
|
||||
playlist = plist;
|
||||
playlist->set_renderer(this, del_render);
|
||||
}
|
||||
|
||||
Playlist *PlaylistRenderer::get_playlist()
|
||||
{
|
||||
return playlist;
|
||||
}
|
||||
|
||||
void PlaylistRenderer::fill()
|
||||
{
|
||||
if (playlist == NULL)
|
||||
return;
|
||||
//playlist->for_each_insert();
|
||||
}
|
||||
|
||||
void PlaylistRenderer::playlist_empty()
|
||||
{
|
||||
on_playlist_empty();
|
||||
}
|
||||
|
||||
void PlaylistRenderer::on_playlist_empty()
|
||||
{*/
|
||||
/*
|
||||
* This function is meant to be overridden by
|
||||
* inherited classes so they can do whatever
|
||||
* cleanup is necessary on the UI end.
|
||||
*/
|
||||
//}
|
||||
|
||||
}; /* Namespace: libsaria */
|
||||
|
|
|
|||
|
|
@ -13,11 +13,6 @@ static void (*on_new_playlist)(libsaria::Playlist *) = NULL;
|
|||
|
||||
static list<libsaria::Playlist *> playlist_stack;
|
||||
|
||||
/*static void plist_loaded()
|
||||
{
|
||||
trigger_callback(NEW_PLAYLIST);
|
||||
}*/
|
||||
|
||||
static string get_next_name()
|
||||
{
|
||||
stringstream s;
|
||||
|
|
@ -73,20 +68,6 @@ namespace libsaria
|
|||
next_playlist++;
|
||||
}
|
||||
|
||||
/*void add_to_playlist(list<sid_t> &ids)
|
||||
{
|
||||
Playlist *plist;*/
|
||||
/* Only allow one queue and one library (for now) */
|
||||
/* if (playlist_stack.size() == 1) {
|
||||
plist = new_playlist("queue.q", PL_QUEUE);
|
||||
trigger_callback(NEW_PLAYLIST);
|
||||
plist->add_ids(ids);
|
||||
} else {
|
||||
plist = playlist_stack.front();
|
||||
plist->add_ids(ids);
|
||||
}
|
||||
}*/
|
||||
|
||||
Playlist *stack_top()
|
||||
{
|
||||
return playlist_stack.front();
|
||||
|
|
@ -102,22 +83,4 @@ namespace libsaria
|
|||
}*/
|
||||
}
|
||||
|
||||
/*string next_file()
|
||||
{
|
||||
Playlist *plist = playlist_stack.front();
|
||||
Track *track = plist->next();
|
||||
stack_top_pop();
|
||||
return track->get_filepath();
|
||||
}*/
|
||||
|
||||
void stack_init()
|
||||
{
|
||||
/* IOTask *task;
|
||||
if (exists(get_saria_dir() + "/queue.q")) {
|
||||
new_playlist("queue.q", PL_QUEUE);
|
||||
task = new IOTask(plist_loaded);
|
||||
task->queue();
|
||||
}*/
|
||||
}
|
||||
|
||||
}; /* Namespace: libsaria */
|
||||
|
|
|
|||
Loading…
Reference in New Issue