smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-16 03:36:32 +01:00
Code Issues Projects Releases Wiki Activity

Move UIConfiguration Singleton into UIConfiguration header

Browse source 
This removes the direct dependence on ardour_ui.h from 39 files
This commit is contained in:
Tim Mayberry 2015-01-02 21:44:54 +07:00 • committed by Paul Davis
parent 45d487f16e
commit 6b019a4953
84 changed files with 726 additions and 712 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/editor_regions.cc
View file

@ -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);