diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-28 01:29:06 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-04-28 01:29:06 +0000 |
| commit | 6dac4da98344ed8ce609a4e7d567ef2f9fbb9b31 (patch) | |
| tree | 2c21aa7d3af2a0c56edab1ccfd5b6d42ce649f76 /gtk2_ardour | |
| parent | f0db054a07ecc9d49fede8fcc9175a85c635369f (diff) | |
more solo/mute architecture work. NOTE: changes to mute points are ignored right now
git-svn-id: svn://localhost/ardour2/branches/3.0@7009 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour3_ui_dark.rc.in | 8 | ||||
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 7 |
2 files changed, 7 insertions, 8 deletions
diff --git a/gtk2_ardour/ardour3_ui_dark.rc.in b/gtk2_ardour/ardour3_ui_dark.rc.in index 8458d46316..bfef1d0a65 100644 --- a/gtk2_ardour/ardour3_ui_dark.rc.in +++ b/gtk2_ardour/ardour3_ui_dark.rc.in @@ -348,10 +348,10 @@ style "solo_button_alternate2" = "small_button" # this is the "half-bright" solo theme # - bg[NORMAL] = { 0.91, 0.97, 0.82 } - bg[ACTIVE] = { 0.91, 0.97, 0.82 } - bg[SELECTED] = { 0.91, 0.97, 0.82 } - bg[PRELIGHT] = { 0.91, 0.97, 0.82 } + bg[NORMAL] = { 0.752, 0.886, 0.752 } + bg[ACTIVE] = { 0.752, 0.886, 0.752 } + bg[SELECTED] = { 0.752, 0.886, 0.752 } + bg[PRELIGHT] = { 0.752, 0.886, 0.752 } fg[ACTIVE] = { 0, 0, 0 } fg[SELECTED] = { 0, 0, 0 } diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index ae36ccba86..657c2ab1e7 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -247,7 +247,6 @@ RouteUI::set_route (boost::shared_ptr<Route> rp) void RouteUI::invert_toggled () { - cerr << this << " button state = " << invert_button->get_active() << " PI = " << _route->phase_invert() << endl; _route->set_phase_invert (invert_button->get_active()); } @@ -833,9 +832,9 @@ RouteUI::mute_visual_state (Session* s, boost::shared_ptr<Route> r) if (r->is_master() || r->is_monitor()) { return 0; } - + if (Config->get_show_solo_mutes()) { - + if (r->self_muted ()) { /* full mute */ return 2; @@ -867,7 +866,7 @@ RouteUI::update_mute_display () return; } - bool model = _route->muted(); + bool model = _route->self_muted(); bool view = mute_button->get_active(); /* first make sure the button's "depressed" visual |