diff --git a/gui/gst.cpp b/gui/gst.cpp index 794d18bb..54e8960c 100644 --- a/gui/gst.cpp +++ b/gui/gst.cpp @@ -21,7 +21,7 @@ static Gtk::Scale *o_seek; static Gtk::Button *o_stop; static Gtk::Label *o_position; -static Glib::RefPtr o_pos_bar; +static Glib::RefPtr o_progress; static bool gst_change_state(GstState state) @@ -156,8 +156,8 @@ static bool on_seek(Gtk::ScrollType type, double value) static bool on_timeout() { o_position->set_text(audio :: position_str()); - o_pos_bar->set_upper(audio :: duration()); - o_pos_bar->set_value(audio :: position()); + o_progress->set_upper(audio :: duration()); + o_progress->set_value(audio :: position()); return true; } @@ -185,8 +185,8 @@ void init_gst(int *argc, char ***argv) o_seek = lib :: get_widget("o_seek"); o_stop = lib :: get_widget("o_stop"); - o_position = lib :: get_widget("o_cur_position"); - o_pos_bar = lib :: get_object("o_progress"); + o_position = lib :: get_widget("o_position"); + o_progress = lib :: get_object("o_progress"); o_next->signal_clicked().connect(sigc::ptr_fun(on_next)); o_pause->signal_clicked().connect(sigc::ptr_fun(audio :: pause)); diff --git a/gui/gui.cpp b/gui/gui.cpp index 3ed9307f..a1723332 100644 --- a/gui/gui.cpp +++ b/gui/gui.cpp @@ -45,7 +45,7 @@ void on_track_loaded(Track *track) Gtk::Label *title = lib :: get_widget("o_title"); Gtk::Label *artist = lib :: get_widget("o_artist"); Gtk::Label *album = lib :: get_widget("o_album"); - Gtk::Label *duration = lib :: get_widget("o_total_time"); + Gtk::Label *duration = lib :: get_widget("o_duration"); set_label_text(title, "xx-large", track->name()); set_label_text(artist, "x-large", "By: " + track->artist()->name()); diff --git a/share/ocarina/ocarina6.glade b/share/ocarina/ocarina6.glade index 9f389549..d7cb90e3 100644 --- a/share/ocarina/ocarina6.glade +++ b/share/ocarina/ocarina6.glade @@ -1338,7 +1338,7 @@ Manager True False - + True False 0:00 @@ -1365,7 +1365,7 @@ Manager - + True False 0:00