diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-10 18:10:07 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-06-10 18:10:07 +0000 |
| commit | 6e9b9294e1e7a22f31eabbafa39cee5844b3449a (patch) | |
| tree | 67285ddc9b3cb0fa656ed711cc7d78cff35075d9 /gtk2_ardour | |
| parent | ff26317d4f7904c071d7ecfb96fd84e71728f6d0 (diff) | |
nick m's fix for markers etc ; several tweaks for mute/solo ; rename run_in_place() as run()
git-svn-id: svn://localhost/ardour2/branches/3.0@5155 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_canvas.cc | 7 | ||||
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 14 |
2 files changed, 14 insertions, 7 deletions
diff --git a/gtk2_ardour/editor_canvas.cc b/gtk2_ardour/editor_canvas.cc index 0c10ebf8c3..146f756225 100644 --- a/gtk2_ardour/editor_canvas.cc +++ b/gtk2_ardour/editor_canvas.cc @@ -776,16 +776,17 @@ Editor::scroll_canvas_horizontally () nframes64_t time_origin = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); /* horizontal scrolling only */ - double x_delta; + double x1, y1, x2, y2, x_delta; + _master_group->get_bounds (x1, y1, x2, y2); - x_delta = (leftmost_frame - time_origin) / frames_per_unit; + x_delta = - (x1 + horizontal_adjustment.get_value()); _master_group->move (x_delta, 0); timebar_group->move (x_delta, 0); time_line_group->move (x_delta, 0); cursor_group->move (x_delta, 0); - leftmost_frame = time_origin; + leftmost_frame = (nframes64_t) floor (horizontal_adjustment.get_value() * frames_per_unit); update_fixed_rulers (); redisplay_tempo (true); diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index b62229a70c..c5e11e5aab 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -1127,7 +1127,7 @@ RouteUI::toggle_polarity () ENSURE_GUI_THREAD(mem_fun (*this, &RouteUI::toggle_polarity)); if ((x = polarity_menu_item->get_active()) != _route->phase_invert()) { - _route->set_phase_invert (x, this); + _route->set_phase_invert (x); if (x) { name_label.set_text (X_("Ø ") + name_label.get_text()); } else { @@ -1140,7 +1140,11 @@ RouteUI::toggle_polarity () void RouteUI::polarity_changed () { - /* no signal for this yet */ + if (_route->phase_invert()) { + name_label.set_text (X_("Ø ") + name_label.get_text()); + } else { + name_label.set_text (_route->name()); + } } void @@ -1153,7 +1157,7 @@ RouteUI::toggle_denormal_protection () ENSURE_GUI_THREAD(mem_fun (*this, &RouteUI::toggle_denormal_protection)); if ((x = denormal_menu_item->get_active()) != _route->denormal_protection()) { - _route->set_denormal_protection (x, this); + _route->set_denormal_protection (x); } } } @@ -1161,7 +1165,9 @@ RouteUI::toggle_denormal_protection () void RouteUI::denormal_protection_changed () { - /* no signal for this yet */ + if (denormal_menu_item) { + denormal_menu_item->set_active (_route->denormal_protection()); + } } void |