diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 47 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui.h | 5 | ||||
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 1 |
3 files changed, 0 insertions, 53 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 17ead6bb69..8ad126a62a 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -299,7 +299,6 @@ ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) , error_alert_button ( ArdourButton::just_led_default_elements ) , editor_meter_peak_display() , editor_meter(0) - , _suspend_editor_meter_callbacks (false) , _numpad_locate_happening (false) , _session_is_new (false) , last_key_press_time (0) @@ -5416,52 +5415,6 @@ ARDOUR_UI::session_format_mismatch (std::string xml_path, std::string backup_pat } void -ARDOUR_UI::add_editor_meter_type_item (Menu_Helpers::MenuList& items, RadioMenuItem::Group& group, string const & name, MeterType type) -{ - using namespace Menu_Helpers; - - items.push_back (RadioMenuElem (group, name, sigc::bind (sigc::mem_fun (editor_meter, &LevelMeterHBox::set_meter_type), type))); - RadioMenuItem* i = dynamic_cast<RadioMenuItem *> (&items.back ()); - i->set_active (editor_meter->meter_type () == type); -} - -void -ARDOUR_UI::popup_editor_meter_menu (GdkEventButton* ev) -{ - using namespace Gtk::Menu_Helpers; - - Gtk::Menu* m = shared_popup_menu (); - MenuList& items = m->items (); - - RadioMenuItem::Group group; - - PBD::Unwinder<bool> uw (_suspend_editor_meter_callbacks, true); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak), MeterPeak); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterPeak0dB), MeterPeak0dB); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterKrms), MeterKrms); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1DIN), MeterIEC1DIN); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC1NOR), MeterIEC1NOR); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC2BBC), MeterIEC2BBC); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterIEC2EBU), MeterIEC2EBU); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK20), MeterK20); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK14), MeterK14); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterK12), MeterK12); - add_editor_meter_type_item (items, group, ArdourMeter::meter_type_string(MeterVU), MeterVU); - - m->popup (ev->button, ev->time); -} - -bool -ARDOUR_UI::editor_meter_button_press (GdkEventButton* ev) -{ - if (ev->button == 3 && editor_meter) { - popup_editor_meter_menu (ev); - return true; - } - return false; -} - -void ARDOUR_UI::reset_peak_display () { if (!_session || !_session->master_out() || !editor_meter) return; diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index 8ff4c3685f..bf1a11c089 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -524,11 +524,6 @@ private: float editor_meter_max_peak; bool editor_meter_peak_button_release (GdkEventButton*); - bool editor_meter_button_press (GdkEventButton* ev); - void popup_editor_meter_menu (GdkEventButton* ev); - void add_editor_meter_type_item (Gtk::Menu_Helpers::MenuList&, Gtk::RadioMenuItem::Group&, std::string const &, ARDOUR::MeterType); - bool _suspend_editor_meter_callbacks; - void blink_handler (bool); sigc::connection blink_connection; diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index 00f2d6f524..ba979240cc 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -233,7 +233,6 @@ ARDOUR_UI::set_session (Session *s) editor_meter->set_meter_type (_session->master_out()->meter_type()); editor_meter->setup_meters (30, 10, 6); editor_meter->show(); - editor_meter->ButtonPress.connect_same_thread (editor_meter_connection, boost::bind (&ARDOUR_UI::editor_meter_button_press, this, _1)); editor_meter_table.set_spacings(3); editor_meter_table.attach(*editor_meter, 0,1, 0,1, FILL, FILL); |