gui: Updates for the recent audio changes
Now the gui compiles again, yay! Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
parent
1bfa299e08
commit
06b36afec6
22
gui/gui.cpp
22
gui/gui.cpp
|
@ -4,6 +4,7 @@
|
||||||
#include <audio.h>
|
#include <audio.h>
|
||||||
#include <callback.h>
|
#include <callback.h>
|
||||||
#include <deck.h>
|
#include <deck.h>
|
||||||
|
#include <driver.h>
|
||||||
#include <idle.h>
|
#include <idle.h>
|
||||||
#include <playlist.h>
|
#include <playlist.h>
|
||||||
|
|
||||||
|
@ -107,9 +108,9 @@ static void on_ban_toggled()
|
||||||
Gtk::ToggleButton *ban = get_widget<Gtk::ToggleButton>("o_ban");
|
Gtk::ToggleButton *ban = get_widget<Gtk::ToggleButton>("o_ban");
|
||||||
|
|
||||||
if (ban->get_active() == true)
|
if (ban->get_active() == true)
|
||||||
playlist :: add(tagdb :: lookup(audio :: current_trackid()), "Banned");
|
playlist :: add(audio :: current_track(), "Banned");
|
||||||
else
|
else
|
||||||
playlist :: del(tagdb :: lookup(audio::current_trackid()), "Banned");
|
playlist :: del(audio::current_track(), "Banned");
|
||||||
}
|
}
|
||||||
|
|
||||||
static void on_fav_toggled()
|
static void on_fav_toggled()
|
||||||
|
@ -117,9 +118,9 @@ static void on_fav_toggled()
|
||||||
Gtk::ToggleButton *fav = get_widget<Gtk::ToggleButton>("o_favorite");
|
Gtk::ToggleButton *fav = get_widget<Gtk::ToggleButton>("o_favorite");
|
||||||
|
|
||||||
if (fav->get_active() == true)
|
if (fav->get_active() == true)
|
||||||
playlist :: add(tagdb :: lookup(audio::current_trackid()), "Favorites");
|
playlist :: add(audio::current_track(), "Favorites");
|
||||||
else
|
else
|
||||||
playlist :: del(tagdb :: lookup(audio::current_trackid()), "Favorites");
|
playlist :: del(audio::current_track(), "Favorites");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
@ -155,7 +156,7 @@ static bool on_window_key_pressed(GdkEventKey *event)
|
||||||
else if (key == "n")
|
else if (key == "n")
|
||||||
on_next();
|
on_next();
|
||||||
else if (key == "N")
|
else if (key == "N")
|
||||||
audio :: previous();
|
audio :: prev();
|
||||||
else if (key == "p")
|
else if (key == "p")
|
||||||
notebook->set_current_page(deck::get_queues().size() + 2);
|
notebook->set_current_page(deck::get_queues().size() + 2);
|
||||||
else
|
else
|
||||||
|
@ -167,9 +168,12 @@ static bool on_window_key_released(GdkEventKey *event)
|
||||||
{
|
{
|
||||||
std::string key = gdk_keyval_name(event->keyval);
|
std::string key = gdk_keyval_name(event->keyval);
|
||||||
|
|
||||||
if (key == "space")
|
if (key == "space") {
|
||||||
audio :: toggle_play();
|
if (driver :: get_driver()->is_playing())
|
||||||
else
|
audio :: pause();
|
||||||
|
else
|
||||||
|
audio :: play();
|
||||||
|
} else
|
||||||
return false;
|
return false;
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
@ -255,7 +259,7 @@ Gtk::Window *setup_gui()
|
||||||
connect_button("o_play", audio::play);
|
connect_button("o_play", audio::play);
|
||||||
connect_button("o_pause", audio::pause);
|
connect_button("o_pause", audio::pause);
|
||||||
connect_button("o_stop", audio::stop);
|
connect_button("o_stop", audio::stop);
|
||||||
connect_button("o_prev", audio::previous);
|
connect_button("o_prev", audio::prev);
|
||||||
connect_button("o_next", on_next);
|
connect_button("o_next", on_next);
|
||||||
|
|
||||||
count->signal_changed().connect(sigc::ptr_fun(on_config_pause));
|
count->signal_changed().connect(sigc::ptr_fun(on_config_pause));
|
||||||
|
|
|
@ -30,14 +30,13 @@ Gtk::Window *ocarina_init(int *argc, char ***argv)
|
||||||
Gtk::Window *window = setup_gui();
|
Gtk::Window *window = setup_gui();
|
||||||
tagdb :: init();
|
tagdb :: init();
|
||||||
library::init();
|
library::init();
|
||||||
audio::init(argc, argv);
|
|
||||||
deck::init();
|
|
||||||
playlist::init();
|
playlist::init();
|
||||||
|
deck::init();
|
||||||
|
audio::init(argc, argv);
|
||||||
|
|
||||||
playlist :: select("Favorites");
|
playlist :: select("Favorites");
|
||||||
share_file("ocarina6.glade");
|
share_file("ocarina6.glade");
|
||||||
post_init_tabs();
|
post_init_tabs();
|
||||||
audio::load_state();
|
|
||||||
return window;
|
return window;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -57,7 +57,7 @@ void QueueModel::on_row_changed(unsigned int row)
|
||||||
|
|
||||||
void QueueModel::on_path_selected(const Gtk::TreePath &path)
|
void QueueModel::on_path_selected(const Gtk::TreePath &path)
|
||||||
{
|
{
|
||||||
audio :: load_trackid(path_to_id(path));
|
audio :: load_track(tagdb :: lookup(path_to_id(path)));
|
||||||
queue->track_selected(path[0]);
|
queue->track_selected(path[0]);
|
||||||
audio :: play();
|
audio :: play();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue