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

gui: Move o_next() into the controls.cpp file 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2014-09-10 08:04:53 -04:00
parent 78624a6d98
commit 922830a2ab
3 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gui/controls.cpp
View File

@ -68,3 +68,9 @@ void o_toggle()
else
o_play();
}
void o_next()
{
audio :: next();
o_play();
}

12
gui/gui.cpp
View File

@ -31,12 +31,6 @@ static void on_config_pause()
audio :: pause_after(enabled->get_active(), count->get_value());
}
static void on_next()
{
audio :: next();
audio :: play();
}
static bool on_seek(Gtk::ScrollType type, double value)
{
audio :: seek_to(value);
@ -94,7 +88,7 @@ static void on_ban_toggled()
if (ban->get_active() == true) {
playlist :: add(audio :: current_track(), "Banned");
on_next();
o_next();
} else
playlist :: del(audio::current_track(), "Banned");
}
@ -140,7 +134,7 @@ static bool on_window_key_pressed(GdkEventKey *event)
else if (key == "m")
notebook->set_current_page(deck::get_queues().size() + 3);
else if (key == "n")
on_next();
o_next();
else if (key == "N")
audio :: prev();
else if (key == "p")
@ -213,7 +207,7 @@ Gtk::Window *setup_gui()
connect_button("o_pause", o_pause);
connect_button("o_stop", audio::stop);
connect_button("o_prev", audio::prev);
connect_button("o_next", on_next);
connect_button("o_next", o_next);
count->signal_changed().connect(sigc::ptr_fun(on_config_pause));
enabled->signal_toggled().connect(sigc::ptr_fun(on_config_pause));

1
include/gui/controls.h
View File

@ -9,5 +9,6 @@ void o_fix_buttons();
void o_play();
void o_pause();
void o_toggle();
void o_next();
#endif /* OCARINA_GUI_CONTROLS_H */