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_regions.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_regions.cc')
| -rw-r--r-- | gtk2_ardour/editor_regions.cc | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_regions.cc b/gtk2_ardour/editor_regions.cc index d029e3fc74..ef6adb844a 100644 --- a/gtk2_ardour/editor_regions.cc +++ b/gtk2_ardour/editor_regions.cc @@ -48,6 +48,7 @@ #include "editor_regions.h" #include "editor_drag.h" #include "main_clock.h" +#include "ui_config.h" #include "i18n.h" @@ -342,14 +343,14 @@ EditorRegions::add_region (boost::shared_ptr<Region> region) if (missing_source) { // c.set_rgb(65535,0,0); // FIXME: error color from style - set_color_from_rgba (c, ARDOUR_UI::config()->color ("region list missing source")); + set_color_from_rgba (c, UIConfiguration::instance().color ("region list missing source")); } else if (region->automatic()){ // c.set_rgb(0,65535,0); // FIXME: error color from style - set_color_from_rgba (c, ARDOUR_UI::config()->color ("region list automatic")); + set_color_from_rgba (c, UIConfiguration::instance().color ("region list automatic")); } else { - set_color_from_rgba (c, ARDOUR_UI::config()->color ("region list whole file")); + set_color_from_rgba (c, UIConfiguration::instance().color ("region list whole file")); } row[_columns.color_] = c; @@ -1245,7 +1246,7 @@ EditorRegions::drag_data_received (const RefPtr<Gdk::DragContext>& context, framepos_t pos = 0; bool copy = ((context->get_actions() & (Gdk::ACTION_COPY | Gdk::ACTION_LINK | Gdk::ACTION_MOVE)) == Gdk::ACTION_COPY); - if (Profile->get_sae() || ARDOUR_UI::config()->get_only_copy_imported_files() || copy) { + if (Profile->get_sae() || UIConfiguration::instance().get_only_copy_imported_files() || copy) { _editor->do_import (paths, Editing::ImportDistinctFiles, Editing::ImportAsRegion, SrcBest, pos); } else { _editor->do_embed (paths, Editing::ImportDistinctFiles, ImportAsRegion, pos); |