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

callbacks: Add callbacks for playqueue size modifications

Browse Source 
Signed-off-by: Anna Schumaker <schumaker.anna@gmail.com>
This commit is contained in:
Anna Schumaker 2014-01-19 11:03:14 -05:00 committed by Anna Schumaker
parent ea687408aa
commit 42d57567e0
3 changed files with 15 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
include/callback.h
View File

@ -5,13 +5,19 @@
#define OCARINA_CALLBACK_H #define OCARINA_CALLBACK_H
#include <library.h> #include <library.h>
#include <playqueue.h>
struct Callbacks { struct Callbacks {
/* Library callbacks */
void (*on_library_add)(unsigned int, library :: Library *); void (*on_library_add)(unsigned int, library :: Library *);
void (*on_library_update)(unsigned int, library :: Library *); void (*on_library_update)(unsigned int, library :: Library *);
void (*on_library_track_add)(unsigned int); void (*on_library_track_add)(unsigned int);
void (*on_library_track_del)(unsigned int); void (*on_library_track_del)(unsigned int);
/* Playqueue callbacks */
void (*on_queue_track_add)(Playqueue *);
void (*on_queue_track_del)(Playqueue *);
}; };

4
lib/callback.cpp
View File

@ -6,6 +6,7 @@
static void no_op(unsigned int) {} static void no_op(unsigned int) {}
static void no_op(unsigned int id, library :: Library *path) {} static void no_op(unsigned int id, library :: Library *path) {}
static void no_op(Playqueue *) {}
static struct Callbacks callbacks = { static struct Callbacks callbacks = {
@ -13,6 +14,9 @@ static struct Callbacks callbacks = {
.on_library_update = no_op, .on_library_update = no_op,
.on_library_track_add = no_op, .on_library_track_add = no_op,
.on_library_track_del = no_op, .on_library_track_del = no_op,
.on_queue_track_add = no_op,
.on_queue_track_del = no_op,
}; };

5
lib/playqueue.cpp
View File

@ -1,6 +1,7 @@
/* /*
* Copyright 2013 (c) Anna Schumaker. * Copyright 2013 (c) Anna Schumaker.
*/ */
#include <callback.h>
#include <library.h> #include <library.h>
#include <playqueue.h> #include <playqueue.h>
#include <stdlib.h> #include <stdlib.h>
@ -62,6 +63,7 @@ unsigned int Playqueue :: add(unsigned int track_id)
library :: lookup(track_id, &song); library :: lookup(track_id, &song);
length += song.track->length; length += song.track->length;
get_callbacks()->on_queue_track_add(this);
return tracks.size() - 1; return tracks.size() - 1;
} }
@ -72,6 +74,7 @@ unsigned int Playqueue :: add_front(unsigned int track_id)
library :: lookup(track_id, &song); library :: lookup(track_id, &song);
length += song.track->length; length += song.track->length;
get_callbacks()->on_queue_track_add(this);
return 0; return 0;
} }
@ -83,6 +86,7 @@ void Playqueue :: del(unsigned int plist_id)
tracks.erase(tracks.begin() + plist_id); tracks.erase(tracks.begin() + plist_id);
library :: lookup(track_id, &song); library :: lookup(track_id, &song);
length -= song.track->length; length -= song.track->length;
get_callbacks()->on_queue_track_del(this);
} }
void Playqueue :: del_track(unsigned int track_id) void Playqueue :: del_track(unsigned int track_id)
@ -94,6 +98,7 @@ void Playqueue :: del_track(unsigned int track_id)
else else
i++; i++;
} }
get_callbacks()->on_queue_track_del(this);
} }
unsigned int Playqueue :: size() unsigned int Playqueue :: size()