projects
/
ardour.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
666f33b
)
next modifier
author
Paul Davis
<paul@linuxaudiosystems.com>
Mon, 15 Dec 2014 15:11:21 +0000
(10:11 -0500)
committer
Paul Davis
<paul@linuxaudiosystems.com>
Mon, 15 Dec 2014 15:11:21 +0000
(10:11 -0500)
gtk2_ardour/audio_streamview.cc
patch
|
blob
|
history
gtk2_ardour/dark.colors
patch
|
blob
|
history
gtk2_ardour/editor_canvas.cc
patch
|
blob
|
history
gtk2_ardour/ghostregion.cc
patch
|
blob
|
history
diff --git
a/gtk2_ardour/audio_streamview.cc
b/gtk2_ardour/audio_streamview.cc
index 4a9f3bfd84a64a53eb88031d937e9c1f8de99487..e879d4c13e86d98beba6de79bfceda52911492d8 100644
(file)
--- a/
gtk2_ardour/audio_streamview.cc
+++ b/
gtk2_ardour/audio_streamview.cc
@@
-524,7
+524,7
@@
AudioStreamView::color_handler ()
if (Profile->get_sae() && _trackview.route()->is_master()) {
canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("audio master bus base"));
} else {
if (Profile->get_sae() && _trackview.route()->is_master()) {
canvas_rect->set_fill_color (ARDOUR_UI::config()->color ("audio master bus base"));
} else {
- canvas_rect->set_fill_color (ARDOUR_UI::config()->color
(
"audio bus base"));
+ canvas_rect->set_fill_color (ARDOUR_UI::config()->color
_mod ("audio bus base",
"audio bus base"));
}
}
}
}
}
}
diff --git
a/gtk2_ardour/dark.colors
b/gtk2_ardour/dark.colors
index 06b6332229a98e5b22a877cd8f522c94d6952af5..daf5bfe75b8def7167367556ee45ca18dcfa8f3f 100644
(file)
--- a/
gtk2_ardour/dark.colors
+++ b/
gtk2_ardour/dark.colors
@@
-37,9
+37,9
@@
<Color name="color 25" value="0x4a4a4aff"/>
<Color name="color 26" value="0xc7c9d8ff"/>
<Color name="color 27" value="0x191919ff"/>
<Color name="color 25" value="0x4a4a4aff"/>
<Color name="color 26" value="0xc7c9d8ff"/>
<Color name="color 27" value="0x191919ff"/>
- <Color name="color 28" value="0x5d3e7c
c6
"/>
+ <Color name="color 28" value="0x5d3e7c
ff
"/>
<Color name="color 29" value="0x202020ff"/>
<Color name="color 29" value="0x202020ff"/>
- <Color name="color 3" value="0x738299
68
"/>
+ <Color name="color 3" value="0x738299
ff
"/>
<Color name="color 30" value="0xe500cfff"/>
<Color name="color 31" value="0xddddd8ff"/>
<Color name="color 32" value="0xeddc3d77"/>
<Color name="color 30" value="0xe500cfff"/>
<Color name="color 31" value="0xddddd8ff"/>
<Color name="color 32" value="0xeddc3d77"/>
@@
-489,8
+489,9
@@
<Modifier name="mono panner position fill" modifier="= alpha:0.8"/>
<Modifier name="region base" modifier="= alpha:0.8"/>
<Modifier name="gain line inactive" modifier="= alpha:0.7725"/>
<Modifier name="mono panner position fill" modifier="= alpha:0.8"/>
<Modifier name="region base" modifier="= alpha:0.8"/>
<Modifier name="gain line inactive" modifier="= alpha:0.7725"/>
- <Modifier name="modifier 28" modifier="= alpha:0.7764"/>
- <Modifier name="modifier 3" modifier="= alpha:0.4078"/>
+ <Modifier name="ghost track base" modifier="= alpha:0.7764"/>
+ <Modifier name="audio bus base" modifier="= alpha:0.4078"/>
+ <Modifier name="range marker bar" modifier="= alpha:0.4078"/>
<Modifier name="modifier 32" modifier="= alpha:0.4666"/>
<Modifier name="modifier 45" modifier="= alpha:0.4627"/>
<Modifier name="modifier 5" modifier="= alpha:0.4078"/>
<Modifier name="modifier 32" modifier="= alpha:0.4666"/>
<Modifier name="modifier 45" modifier="= alpha:0.4627"/>
<Modifier name="modifier 5" modifier="= alpha:0.4078"/>
diff --git
a/gtk2_ardour/editor_canvas.cc
b/gtk2_ardour/editor_canvas.cc
index 73e97d44db2522136258ca5fbaf58045fc9af17e..f03431e9e815dbbd8ac77a3c4eb9e3fd7ad9cae5 100644
(file)
--- a/
gtk2_ardour/editor_canvas.cc
+++ b/
gtk2_ardour/editor_canvas.cc
@@
-896,7
+896,7
@@
Editor::color_handler()
cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("cd marker bar", "marker_bar"));
cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
cd_marker_bar->set_fill_color (ARDOUR_UI::config()->color_mod ("cd marker bar", "marker_bar"));
cd_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
- range_marker_bar->set_fill_color (ARDOUR_UI::config()->color
(
"range marker bar"));
+ range_marker_bar->set_fill_color (ARDOUR_UI::config()->color
_mod ("range marker bar",
"range marker bar"));
range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("transport marker bar"));
range_marker_bar->set_outline_color (ARDOUR_UI::config()->color ("marker bar separator"));
transport_marker_bar->set_fill_color (ARDOUR_UI::config()->color ("transport marker bar"));
diff --git
a/gtk2_ardour/ghostregion.cc
b/gtk2_ardour/ghostregion.cc
index d1bf1e7aacafb49ba475e5dc7c8d2455eeb7843e..aff64e9845dc2ddfaab05beeef7a1f3015fd285a 100644
(file)
--- a/
gtk2_ardour/ghostregion.cc
+++ b/
gtk2_ardour/ghostregion.cc
@@
-87,7
+87,7
@@
void
GhostRegion::set_colors ()
{
if (is_automation_ghost()) {
GhostRegion::set_colors ()
{
if (is_automation_ghost()) {
- base_rect->set_fill_color (ARDOUR_UI::config()->color
(
"ghost track base"));
+ base_rect->set_fill_color (ARDOUR_UI::config()->color
_mod ("ghost track base",
"ghost track base"));
}
}
}
}