diff options
| author | Carl Hetherington <carl@carlh.net> | 2009-06-09 15:46:33 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2009-06-09 15:46:33 +0000 |
| commit | 7f3e6769b3efe815bd5354b82c119c8503a7eb05 (patch) | |
| tree | 3f13002629444ab457d79cbc40e9c0310ffee4f2 /gtk2_ardour | |
| parent | a71daf6a0645f50a46af764a2da6257f7f38e599 (diff) | |
Fix a drag crash and some warnings.
git-svn-id: svn://localhost/ardour2/branches/3.0@5135 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/editor_drag.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/midi_region_view.cc | 2 |
2 files changed, 1 insertions, 4 deletions
diff --git a/gtk2_ardour/editor_drag.cc b/gtk2_ardour/editor_drag.cc index 7aa4e3804b..c16705a140 100644 --- a/gtk2_ardour/editor_drag.cc +++ b/gtk2_ardour/editor_drag.cc @@ -728,7 +728,6 @@ RegionMoveDrag::finished (GdkEvent* event, bool movement_occurred) { bool nocommit = true; vector<RegionView*> copies; - RouteTimeAxisView* source_tv; boost::shared_ptr<Diskstream> ds; boost::shared_ptr<Playlist> from_playlist; list<RegionView*> new_views; @@ -2462,7 +2461,7 @@ ControlPointDrag::ControlPointDrag (Editor* e, ArdourCanvas::Item* i) _cumulative_x_drag (0), _cumulative_y_drag (0) { - ControlPoint* _point = reinterpret_cast<ControlPoint*> (_item->get_data ("control_point")); + _point = reinterpret_cast<ControlPoint*> (_item->get_data ("control_point")); assert (_point); } diff --git a/gtk2_ardour/midi_region_view.cc b/gtk2_ardour/midi_region_view.cc index 4ec2698e67..8c20c02237 100644 --- a/gtk2_ardour/midi_region_view.cc +++ b/gtk2_ardour/midi_region_view.cc @@ -764,9 +764,7 @@ MidiRegionView::apply_note_range (uint8_t min, uint8_t max, bool force) GhostRegion* MidiRegionView::add_ghost (TimeAxisView& tv) { - RouteTimeAxisView* rtv = dynamic_cast<RouteTimeAxisView*>(&trackview); CanvasNote* note; - assert(rtv); double unit_position = _region->position () / samples_per_unit; MidiTimeAxisView* mtv = dynamic_cast<MidiTimeAxisView*>(&tv); |