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

gui/gst: Use C-style gtk widgets 

Signed-off-by: Anna Schumaker <Anna@OcarinaProject.net>
This commit is contained in:
Anna Schumaker 2015-12-24 12:03:23 -05:00
parent 44d7f9a853
commit f31a67f644
1 changed files with 56 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

110
gui/gst.cpp
View File

@ -15,29 +15,31 @@ extern "C" {
#include <gst/gst.h> #include <gst/gst.h>
static Gtk::Button *o_next; static GtkButton *o_next;
static Gtk::Button *o_pause; static GtkButton *o_pause;
static Gtk::Button *o_play; static GtkButton *o_play;
static Gtk::Button *o_prev; static GtkButton *o_prev;
static Gtk::Scale *o_seek; static GtkScale *o_seek;
static Gtk::Button *o_stop; static GtkButton *o_stop;
static Gtk::SpinButton *o_count; static GtkSpinButton *o_count;
static Gtk::CheckButton *o_enabled; static GtkToggleButton *o_enabled;
static Gtk::Label *o_album; static GtkLabel *o_album;
static Gtk::Label *o_artist; static GtkLabel *o_artist;
static Gtk::Label *o_duration; static GtkLabel *o_duration;
static Gtk::Label *o_position; static GtkLabel *o_position;
static Gtk::Label *o_title; static GtkLabel *o_title;
static Glib::RefPtr<Gtk::Adjustment> o_progress; static GtkAdjustment *o_progress;
static void set_markup(Gtk::Label *label, const std::string &size, static void set_markup(GtkLabel *label, const std::string &size,
const std::string &text) const std::string &text)
{ {
label->set_markup("<span size='" + size + "'>" + gchar *markup = g_markup_printf_escaped("<span size='%s'>%s</span>",
Glib::Markup::escape_text(text) + "</span>"); size.c_str(), text.c_str());
gtk_label_set_markup(label, markup);
g_free(markup);
} }
static void on_load(struct track *track) static void on_load(struct track *track)
@ -55,7 +57,7 @@ static void on_load(struct track *track)
set_markup(o_title, "xx-large", track->tr_title); set_markup(o_title, "xx-large", track->tr_title);
str = string_sec2str(track->tr_length); str = string_sec2str(track->tr_length);
o_duration->set_text(str); gtk_label_set_text(o_duration, str);
g_free(str); g_free(str);
toggle = Glib :: wrap(GTK_TOGGLE_BUTTON(gui_builder_widget("o_ban")), false); toggle = Glib :: wrap(GTK_TOGGLE_BUTTON(gui_builder_widget("o_ban")), false);
@ -68,21 +70,21 @@ static void on_load(struct track *track)
static void on_change_state(GstState state) static void on_change_state(GstState state)
{ {
if (state == GST_STATE_PLAYING) { if (state == GST_STATE_PLAYING) {
o_play->hide(); gtk_widget_hide(GTK_WIDGET(o_play));
o_pause->show(); gtk_widget_show(GTK_WIDGET(o_pause));
} else { } else {
o_play->show(); gtk_widget_show(GTK_WIDGET(o_play));
o_pause->hide(); gtk_widget_hide(GTK_WIDGET(o_pause));
} }
} }
static void on_config_pause(int n) static void on_config_pause(int n)
{ {
if (n == -1) if (n == -1)
o_enabled->set_active(false); gtk_toggle_button_set_active(o_enabled, false);
else { else {
o_count->set_value(n); gtk_spin_button_set_value(o_count, n);
o_enabled->set_active(true); gtk_toggle_button_set_active(o_enabled, true);
} }
} }
@ -102,25 +104,25 @@ static bool on_seek(Gtk::ScrollType type, double value)
static void on_pause_count() static void on_pause_count()
{ {
o_enabled->set_active(true); gtk_toggle_button_set_active(o_enabled, true);
audio_pause_after(o_count->get_value()); audio_pause_after(gtk_spin_button_get_value(o_count));
} }
static void on_pause_enabled() static void on_pause_enabled()
{ {
if (!o_enabled->get_active()) if (!gtk_toggle_button_get_active(o_enabled))
audio_pause_after(-1); audio_pause_after(-1);
else else
audio_pause_after(o_count->get_value()); audio_pause_after(gtk_spin_button_get_value(o_count));
} }
static bool on_timeout() static bool on_timeout()
{ {
gchar *pos = string_sec2str(audio_position() / GST_SECOND); gchar *pos = string_sec2str(audio_position() / GST_SECOND);
o_progress->set_upper(audio_duration()); gtk_adjustment_set_upper(o_progress, audio_duration());
o_progress->set_value(audio_position()); gtk_adjustment_set_value(o_progress, audio_position());
o_position->set_text(pos); gtk_label_set_text(o_position, pos);
g_free(pos); g_free(pos);
return true; return true;
} }
@ -141,32 +143,32 @@ void gst :: toggle()
void gst :: init_pre() void gst :: init_pre()
{ {
o_next = Glib :: wrap(GTK_BUTTON(gui_builder_widget("o_next")), false); o_next = GTK_BUTTON(gui_builder_widget("o_next"));
o_pause = Glib :: wrap(GTK_BUTTON(gui_builder_widget("o_pause")), false); o_pause = GTK_BUTTON(gui_builder_widget("o_pause"));
o_play = Glib :: wrap(GTK_BUTTON(gui_builder_widget("o_play")), false); o_play = GTK_BUTTON(gui_builder_widget("o_play"));
o_prev = Glib :: wrap(GTK_BUTTON(gui_builder_widget("o_prev")), false); o_prev = GTK_BUTTON(gui_builder_widget("o_prev"));
o_stop = Glib :: wrap(GTK_BUTTON(gui_builder_widget("o_stop")), false); o_stop = GTK_BUTTON(gui_builder_widget("o_stop"));
o_seek = Glib :: wrap(GTK_SCALE(gui_builder_widget("o_seek")), false); o_seek = GTK_SCALE(gui_builder_widget("o_seek"));
o_count = Glib :: wrap(GTK_SPIN_BUTTON(gui_builder_widget("o_pause_count")), false); o_count = GTK_SPIN_BUTTON(gui_builder_widget("o_pause_count"));
o_enabled = Glib :: wrap(GTK_CHECK_BUTTON(gui_builder_widget("o_pause_enabled")), false); o_enabled = GTK_TOGGLE_BUTTON(gui_builder_widget("o_pause_enabled"));
o_album = Glib :: wrap(GTK_LABEL(gui_builder_widget("o_album")), false); o_album = GTK_LABEL(gui_builder_widget("o_album"));
o_artist = Glib :: wrap(GTK_LABEL(gui_builder_widget("o_artist")), false); o_artist = GTK_LABEL(gui_builder_widget("o_artist"));
o_duration = Glib :: wrap(GTK_LABEL(gui_builder_widget("o_duration")), false); o_duration = GTK_LABEL(gui_builder_widget("o_duration"));
o_position = Glib :: wrap(GTK_LABEL(gui_builder_widget("o_position")), false); o_position = GTK_LABEL(gui_builder_widget("o_position"));
o_title = Glib ::wrap(GTK_LABEL(gui_builder_widget("o_title")), false); o_title = GTK_LABEL(gui_builder_widget("o_title"));
o_progress = Glib :: wrap(GTK_ADJUSTMENT(gui_builder_object("o_progress")), false); o_progress = GTK_ADJUSTMENT(gui_builder_object("o_progress"));
o_next->signal_clicked().connect(sigc::ptr_fun(next)); g_signal_connect(o_next, "clicked", gst :: next, NULL);
o_pause->signal_clicked().connect(sigc::ptr_fun(gst :: pause)); g_signal_connect(o_pause, "clicked", gst :: pause, NULL);
o_play->signal_clicked().connect(sigc::ptr_fun(gst :: play)); g_signal_connect(o_play, "clicked", gst :: play, NULL);
o_prev->signal_clicked().connect(sigc::ptr_fun(gst :: prev)); g_signal_connect(o_prev, "clicked", gst :: prev, NULL);
o_seek->signal_change_value().connect(sigc::ptr_fun(on_seek)); g_signal_connect(o_seek, "change-value", G_CALLBACK(on_seek), NULL);
o_stop->signal_clicked().connect(sigc::ptr_fun(gst :: stop)); g_signal_connect(o_stop, "clicked", gst :: stop, NULL);
o_count->signal_changed().connect(sigc::ptr_fun(on_pause_count)); g_signal_connect(o_count, "changed", G_CALLBACK(on_pause_count), NULL);
o_enabled->signal_toggled().connect(sigc::ptr_fun(on_pause_enabled)); g_signal_connect(o_enabled, "toggled", G_CALLBACK(on_pause_enabled), NULL);
} }
void gst :: init() void gst :: init()