audio: Shuffle around the code a bit
Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
parent
21f3f7c828
commit
f84a1dd891
|
@ -15,32 +15,8 @@ static unsigned int _pause_count = 0;
|
||||||
|
|
||||||
static Track *cur_track = NULL;
|
static Track *cur_track = NULL;
|
||||||
static File f_cur_track("cur_track", 0);
|
static File f_cur_track("cur_track", 0);
|
||||||
|
|
||||||
static AudioDriver *cur_driver = NULL;
|
static AudioDriver *cur_driver = NULL;
|
||||||
|
|
||||||
static void _load_track(Track *, bool);
|
|
||||||
static bool continue_playback();
|
|
||||||
|
|
||||||
|
|
||||||
AudioDriver :: AudioDriver()
|
|
||||||
{
|
|
||||||
cur_driver = this;
|
|
||||||
}
|
|
||||||
|
|
||||||
AudioDriver :: ~AudioDriver()
|
|
||||||
{
|
|
||||||
cur_driver = NULL;
|
|
||||||
}
|
|
||||||
|
|
||||||
void AudioDriver :: eos()
|
|
||||||
{
|
|
||||||
if (cur_track) {
|
|
||||||
cur_track->played();
|
|
||||||
library :: get_queue()->updated(cur_track);
|
|
||||||
}
|
|
||||||
|
|
||||||
_load_track(deck :: next(), continue_playback());
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
static void save_state()
|
static void save_state()
|
||||||
|
@ -79,6 +55,30 @@ static bool continue_playback()
|
||||||
return ret;
|
return ret;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
AudioDriver :: AudioDriver()
|
||||||
|
{
|
||||||
|
cur_driver = this;
|
||||||
|
}
|
||||||
|
|
||||||
|
AudioDriver :: ~AudioDriver()
|
||||||
|
{
|
||||||
|
cur_driver = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
void AudioDriver :: eos()
|
||||||
|
{
|
||||||
|
if (cur_track) {
|
||||||
|
cur_track->played();
|
||||||
|
library :: get_queue()->updated(cur_track);
|
||||||
|
}
|
||||||
|
|
||||||
|
_load_track(deck :: next(), continue_playback());
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
void audio :: init()
|
void audio :: init()
|
||||||
{
|
{
|
||||||
unsigned int id;
|
unsigned int id;
|
||||||
|
|
Loading…
Reference in New Issue