diff options
| -rw-r--r-- | gtk2_ardour/editor.cc | 4 | ||||
| -rw-r--r-- | gtk2_ardour/editor_mouse.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor_selection.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor_summary.h | 3 | ||||
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 5 | ||||
| -rw-r--r-- | gtk2_ardour/processor_box.h | 1 |
6 files changed, 6 insertions, 10 deletions
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index f5404f45e9..2806d261e9 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -2719,7 +2719,7 @@ Editor::snap_to_grid (vector<ArdourCanvas::Ruler::Mark> marks, samplepos_t presn samplepos_t before; samplepos_t after; - samplepos_t test; + samplepos_t test = presnap; before = after = max_samplepos; @@ -2742,7 +2742,7 @@ Editor::snap_to_grid (vector<ArdourCanvas::Ruler::Mark> marks, samplepos_t presn } if (before == max_samplepos && after == max_samplepos) { - /* No smpte to snap to, so just don't snap */ + /* No grid to snap to, so just don't snap */ return presnap; } else if (before == max_samplepos) { test = after; diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc index 1a90513f72..6b24acd938 100644 --- a/gtk2_ardour/editor_mouse.cc +++ b/gtk2_ardour/editor_mouse.cc @@ -2237,7 +2237,6 @@ Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event) if (Keyboard::modifier_state_contains (event->state, Keyboard::PrimaryModifier)) { TimeAxisView* tv = &rv.get_time_axis_view(); - RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(tv); samplepos_t where = get_preferred_edit_position(); diff --git a/gtk2_ardour/editor_selection.cc b/gtk2_ardour/editor_selection.cc index 02f44a93fc..95cba60704 100644 --- a/gtk2_ardour/editor_selection.cc +++ b/gtk2_ardour/editor_selection.cc @@ -1816,7 +1816,7 @@ Editor::set_selection_from_region () selection->set (tvl); - if (!get_smart_mode () || !mouse_mode == Editing::MouseObject) { + if (!get_smart_mode () || !(mouse_mode == Editing::MouseObject) ) { set_mouse_mode (Editing::MouseRange, false); } } diff --git a/gtk2_ardour/editor_summary.h b/gtk2_ardour/editor_summary.h index d875c7a382..507295cfff 100644 --- a/gtk2_ardour/editor_summary.h +++ b/gtk2_ardour/editor_summary.h @@ -93,9 +93,6 @@ private: samplepos_t _leftmost; ///< the earliest sample we ever viewed samplepos_t _rightmost; ///< the latest sample we ever viewed - /** fraction of the session length by which the overview size should extend past the start and end markers */ - double _overhang_fraction; - double _x_scale; ///< pixels per sample for the x axis of the pixmap double _track_height; double _last_playhead; diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index c83e1b87ad..481ac039b6 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -1054,14 +1054,15 @@ MidiRegionView::note_diff_add_change (NoteBase* ev, void MidiRegionView::apply_diff (bool as_subcommand, bool was_copy) { - bool add_or_remove; bool commit = false; if (!_note_diff_command) { return; } - if (!was_copy && (add_or_remove = _note_diff_command->adds_or_removes())) { + bool add_or_remove = _note_diff_command->adds_or_removes(); + + if (!was_copy && add_or_remove) { // Mark all selected notes for selection when model reloads for (Selection::iterator i = _selection.begin(); i != _selection.end(); ++i) { _marked_for_selection.insert((*i)->note()); diff --git a/gtk2_ardour/processor_box.h b/gtk2_ardour/processor_box.h index 410e5b91d7..5772e6dbd1 100644 --- a/gtk2_ardour/processor_box.h +++ b/gtk2_ardour/processor_box.h @@ -120,7 +120,6 @@ class PluginPinWindowProxy : public WM::ProxyBase ARDOUR::SessionHandlePtr* session_handle(); private: - ProcessorBox* _processor_box; boost::weak_ptr<ARDOUR::Processor> _processor; void processor_going_away (); |