projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Tweak/fix splash screen event-loop
[ardour.git]
/
gtk2_ardour
/
automation_streamview.cc
diff --git
a/gtk2_ardour/automation_streamview.cc
b/gtk2_ardour/automation_streamview.cc
index 7eaec7cae461709ba62694a9b0a7d39460bbab46..8cb19c2e3980d0e95f123730f114c341b346b55c 100644
(file)
--- a/
gtk2_ardour/automation_streamview.cc
+++ b/
gtk2_ardour/automation_streamview.cc
@@
-30,19
+30,18
@@
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
#include "ardour/midi_region.h"
#include "ardour/midi_source.h"
-#include "ardour_ui.h"
#include "automation_region_view.h"
#include "automation_streamview.h"
#include "automation_time_axis.h"
#include "automation_region_view.h"
#include "automation_streamview.h"
#include "automation_time_axis.h"
-#include "global_signals.h"
#include "gui_thread.h"
#include "public_editor.h"
#include "region_selection.h"
#include "region_view.h"
#include "rgb_macros.h"
#include "selection.h"
#include "gui_thread.h"
#include "public_editor.h"
#include "region_selection.h"
#include "region_view.h"
#include "rgb_macros.h"
#include "selection.h"
+#include "ui_config.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace ARDOUR;
using namespace std;
using namespace ARDOUR;
@@
-61,7
+60,7
@@
AutomationStreamView::AutomationStreamView (AutomationTimeAxisView& tv)
color_handler ();
color_handler ();
- ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler));
+
UIConfiguration::instance().
ColorsChanged.connect(sigc::mem_fun(*this, &AutomationStreamView::color_handler));
}
AutomationStreamView::~AutomationStreamView ()
}
AutomationStreamView::~AutomationStreamView ()
@@
-203,9
+202,9
@@
void
AutomationStreamView::color_handler ()
{
if (_trackview.is_midi_track()) {
AutomationStreamView::color_handler ()
{
if (_trackview.is_midi_track()) {
- canvas_rect->set_fill_color (
ARDOUR_UI::config()->
color_mod ("midi track base", "midi track base"));
+ canvas_rect->set_fill_color (
UIConfiguration::instance().
color_mod ("midi track base", "midi track base"));
} else {
} else {
- canvas_rect->set_fill_color (
ARDOUR_UI::config()->
color ("midi bus base"));
+ canvas_rect->set_fill_color (
UIConfiguration::instance().
color ("midi bus base"));
}
}
}
}