diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-01-02 21:44:54 +0700 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-16 16:55:17 -0400 |
| commit | 6b019a495359909a3d1a778ca10cd7df7cc302cc (patch) | |
| tree | 75746a1e4a3daecd8c9cd0996b3c63d7d1657be4 /gtk2_ardour/editor_actions.cc | |
| parent | 45d487f16e8be102bfcdefcd950a69c886495b94 (diff) | |
Move UIConfiguration Singleton into UIConfiguration header
This removes the direct dependence on ardour_ui.h from 39 files
Diffstat (limited to 'gtk2_ardour/editor_actions.cc')
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index 1a40ba99b7..50b5480458 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -39,6 +39,7 @@ #include "editor.h" #include "gui_thread.h" #include "time_axis_view.h" +#include "ui_config.h" #include "utils.h" #include "i18n.h" #include "audio_time_axis.h" @@ -1633,10 +1634,10 @@ Editor::toggle_sound_midi_notes () Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("sound-midi-notes")); if (act) { - bool s = ARDOUR_UI::config()->get_sound_midi_notes(); + bool s = UIConfiguration::instance().get_sound_midi_notes(); Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act); if (tact->get_active () != s) { - ARDOUR_UI::config()->set_sound_midi_notes (tact->get_active()); + UIConfiguration::instance().set_sound_midi_notes (tact->get_active()); } } } @@ -1716,13 +1717,13 @@ Editor::parameter_changed (std::string p) update_just_timecode (); } else if (p == "show-zoom-tools") { if (_zoom_tearoff) { - _zoom_tearoff->set_visible (ARDOUR_UI::config()->get_show_zoom_tools(), true); + _zoom_tearoff->set_visible (UIConfiguration::instance().get_show_zoom_tools(), true); } } else if (p == "sound-midi-notes") { Glib::RefPtr<Action> act = ActionManager::get_action (X_("Editor"), X_("sound-midi-notes")); if (act) { - bool s = ARDOUR_UI::config()->get_sound_midi_notes(); + bool s = UIConfiguration::instance().get_sound_midi_notes(); Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act); if (tact->get_active () != s) { tact->set_active (s); @@ -1738,7 +1739,7 @@ Editor::parameter_changed (std::string p) /* this doesn't really belong here but it has to go somewhere */ - if (ARDOUR_UI::config()->get_use_tooltips()) { + if (UIConfiguration::instance().get_use_tooltips()) { Gtkmm2ext::enable_tooltips (); } else { Gtkmm2ext::disable_tooltips (); |