X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fexport_timespan_selector.cc;h=9a294aff1baa35312b962778d39074a894a08b68;hb=5c41043a2d2578984746fa0082f8df6b8c3eecfd;hp=53b7dc9fe02287078d6121e04a15f0e95fee32c4;hpb=52003be3695ab703b936163d7284e208790d5363;p=ardour.git diff --git a/gtk2_ardour/export_timespan_selector.cc b/gtk2_ardour/export_timespan_selector.cc index 53b7dc9fe0..9a294aff1b 100644 --- a/gtk2_ardour/export_timespan_selector.cc +++ b/gtk2_ardour/export_timespan_selector.cc @@ -20,8 +20,6 @@ #include "export_timespan_selector.h" -#include "ardour_ui.h" - #include "ardour/location.h" #include "ardour/types.h" #include "ardour/session.h" @@ -50,15 +48,15 @@ ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, Profi option_hbox.pack_start (time_format_label, false, false, 0); option_hbox.pack_start (time_format_combo, false, false, 6); - Gtk::Button* b = manage (new Gtk::Button (_("Select All"))); + Gtk::Button* b = Gtk::manage (new Gtk::Button (_("Select All"))); b->signal_clicked().connect ( sigc::bind ( sigc::mem_fun (*this, &ExportTimespanSelector::set_selection_state_of_all_timespans), true ) ); option_hbox.pack_start (*b, false, false, 6); - - b = manage (new Gtk::Button (_("Deselect All"))); + + b = Gtk::manage (new Gtk::Button (_("Deselect All"))); b->signal_clicked().connect ( sigc::bind ( sigc::mem_fun (*this, &ExportTimespanSelector::set_selection_state_of_all_timespans), false @@ -80,7 +78,6 @@ ExportTimespanSelector::ExportTimespanSelector (ARDOUR::Session * session, Profi time_format_list = Gtk::ListStore::create (time_format_cols); time_format_combo.set_model (time_format_list); - time_format_combo.set_name ("PaddedButton"); iter = time_format_list->append(); row = *iter; @@ -324,7 +321,7 @@ ExportTimespanSelector::ms_str (framecnt_t frames) const mins = (int) floor (left / (_session->frame_rate() * 60.0f)); left -= (framecnt_t) floor (mins * _session->frame_rate() * 60.0f); secs = (int) floor (left / (float) _session->frame_rate()); - left -= (framecnt_t) floor (secs * _session->frame_rate()); + left -= (framecnt_t) floor ((double)(secs * _session->frame_rate())); sec_promilles = (int) (left * 1000 / (float) _session->frame_rate() + 0.5); oss << std::setfill('0') << std::right <<