diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-04-11 14:06:50 +0000 |
| commit | cb413146428ce5db5e281d70f2b3b7df27c1aaab (patch) | |
| tree | 4961e9dcb107f2ca1f0a4298faf5135ba8611d92 /gtk2_ardour/editor.cc | |
| parent | 9aa8af5a28abbb86c9ae86c6991838eb6828d0a9 (diff) | |
merge 3.0 from 2.0-ongoing@3243
git-svn-id: svn://localhost/ardour2/branches/3.0@3248 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/editor.cc')
| -rw-r--r-- | gtk2_ardour/editor.cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 9138fe392a..dff2271a80 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -281,6 +281,8 @@ Editor::Editor () bbt_beat_subdivision = 4; canvas_width = 0; canvas_height = 0; + last_autoscroll_x = 0; + last_autoscroll_y = 0; autoscroll_active = false; autoscroll_timeout_tag = -1; interthread_progress_window = 0; @@ -1840,8 +1842,9 @@ Editor::add_region_context_items (StreamView* sv, boost::shared_ptr<Region> regi items.push_back (MenuElem (_("Bounce"), mem_fun(*this, &Editor::bounce_region_selection))); #ifdef FFT_ANALYSIS - if (ar) - items.push_back (MenuElem (_("Analyze region"), mem_fun(*this, &Editor::analyze_region_selection))); + if (ar) { + items.push_back (MenuElem (_("Spectral Analysis"), mem_fun(*this, &Editor::analyze_region_selection))); + } #endif items.push_back (SeparatorElem()); @@ -2020,7 +2023,7 @@ Editor::add_selection_context_items (Menu_Helpers::MenuList& edit_items) #ifdef FFT_ANALYSIS items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Analyze range"), mem_fun(*this, &Editor::analyze_range_selection))); + items.push_back (MenuElem (_("Spectral Analysis"), mem_fun(*this, &Editor::analyze_range_selection))); #endif items.push_back (SeparatorElem()); @@ -2305,6 +2308,15 @@ Editor::set_edit_point_preference (EditPoint ep, bool force) Glib::RefPtr<RadioAction>::cast_dynamic(act)->set_active (true); } + nframes64_t foo; + bool in_track_canvas; + + if (!mouse_frame (foo, in_track_canvas)) { + in_track_canvas = false; + } + + reset_canvas_action_sensitivity (in_track_canvas); + instant_save (); } |