r269@gandalf: fugalh | 2006-08-03 20:18:05 -0600

 Trunk merge conflicts resolved


git-svn-id: svn://localhost/ardour2/branches/undo@756 d708f5d6-7413-0410-9779-e7cbd77b26cf

1 files changed, 219 insertions, 194 deletions

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index c7199984a8..f7abe7fdea 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -18,6 +18,7 @@
     $Id$
 */
 
+#include <cassert>
 #include <cstdlib>
 #include <stdint.h>
 #include <cmath>
@@ -33,7 +34,7 @@
 #include "editor.h"
 #include "time_axis_view.h"
 #include "audio_time_axis.h"
-#include "regionview.h"
+#include "audio_region_view.h"
 #include "marker.h"
 #include "streamview.h"
 #include "region_gain_line.h"
@@ -183,7 +184,7 @@ Editor::set_mouse_mode (MouseMode m, bool force)
 		   show the object (region) selection.
 		*/
 
-		for (AudioRegionSelection::iterator i = selection->audio_regions.begin(); i != selection->audio_regions.end(); ++i) {
+		for (RegionSelection::iterator i = selection->regions.begin(); i != selection->regions.end(); ++i) {
 			(*i)->set_should_show_selection (true);
 		}
 		for (TrackViewList::iterator i = track_views.begin(); i != track_views.end(); ++i) {
@@ -320,8 +321,8 @@ Editor::button_selection (ArdourCanvas::Item* item, GdkEvent* event, ItemType it
 		commit = (c1 || c2);
 		break;
 		
-	case AudioRegionViewNameHighlight:
-	case AudioRegionViewName:
+	case RegionViewNameHighlight:
+	case RegionViewName:
 		c1 = set_selected_track_from_click (press, op, true, true);
 		c2 = set_selected_regionview_from_click (press, op, true);
 		commit = (c1 || c2);
@@ -522,12 +523,12 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
 					}
 					break;
 					
-				case AudioRegionViewNameHighlight:
+				case RegionViewNameHighlight:
 					start_trim (item, event);
 					return true;
 					break;
 					
-				case AudioRegionViewName:
+				case RegionViewName:
 					/* rename happens on edit clicks */
 						start_trim (clicked_regionview->get_name_highlight(), event);
 						return true;
@@ -693,12 +694,12 @@ Editor::button_press_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemTyp
 			
 			
 			switch (item_type) {
-			case AudioRegionViewNameHighlight:
+			case RegionViewNameHighlight:
 				start_trim (item, event);
 				return true;
 				break;
 				
-			case AudioRegionViewName:
+			case RegionViewName:
 				start_trim (clicked_regionview->get_name_highlight(), event);
 				return true;
 				break;
@@ -854,7 +855,7 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 			edit_meter_marker (item);
 			break;
 			
-		case AudioRegionViewName:
+		case RegionViewName:
 			if (clicked_regionview->name_active()) {
 				return mouse_rename_region (item, event);
 			}
@@ -889,8 +890,8 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 				break;
 				
 			case RegionItem:
-			case AudioRegionViewNameHighlight:
-			case AudioRegionViewName:
+			case RegionViewNameHighlight:
+			case RegionViewName:
 				popup_track_context_menu (1, event->button.time, item_type, false, where);
 				break;
 				
@@ -1048,9 +1049,13 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 			break;
 
 		case MouseGain:
+			// Gain only makes sense for audio regions
+			if ( ! dynamic_cast<AudioRegionView*>(clicked_regionview))
+				break;
+
 			switch (item_type) {
 			case RegionItem:
-				clicked_regionview->add_gain_point_event (item, event);
+				dynamic_cast<AudioRegionView*>(clicked_regionview)->add_gain_point_event (item, event);
 				return true;
 				break;
 				
@@ -1204,7 +1209,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 		}
 		break;
 		
-	case AudioRegionViewNameHighlight:
+	case RegionViewNameHighlight:
 		if (is_drawable() && mouse_mode == MouseObject) {
 			track_canvas.get_window()->set_cursor (*trimmer_cursor);
 		}
@@ -1231,11 +1236,11 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 		}
 		break;
 
-	case AudioRegionViewName:
+	case RegionViewName:
 		
 		/* when the name is not an active item, the entire name highlight is for trimming */
 
-		if (!reinterpret_cast<AudioRegionView *> (item->get_data ("regionview"))->name_active()) {
+		if (!reinterpret_cast<RegionView *> (item->get_data ("regionview"))->name_active()) {
 			if (mouse_mode == MouseObject && is_drawable()) {
 				track_canvas.get_window()->set_cursor (*trimmer_cursor);
 			}
@@ -1340,7 +1345,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 	ControlPoint* cp;
 	Marker *marker;
 	Location *loc;
-	AudioRegionView* rv;
+	RegionView* rv;
 	bool is_start;
 
 	switch (item_type) {
@@ -1362,7 +1367,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 		hide_verbose_canvas_cursor ();
 		break;
 		
-	case AudioRegionViewNameHighlight:
+	case RegionViewNameHighlight:
 	case StartSelectionTrimItem:
 	case EndSelectionTrimItem:
 	case EditCursorItem:
@@ -1393,9 +1398,9 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 		}
 		break;
 
-	case AudioRegionViewName:
+	case RegionViewName:
 		/* see enter_handler() for notes */
-		if (!reinterpret_cast<AudioRegionView *> (item->get_data ("regionview"))->name_active()) {
+		if (!reinterpret_cast<RegionView *> (item->get_data ("regionview"))->name_active()) {
 			if (is_drawable() && mouse_mode == MouseObject) {
 				track_canvas.get_window()->set_cursor (*current_canvas_cursor);
 			}
@@ -1430,7 +1435,7 @@ Editor::leave_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
 
 	case FadeInHandleItem:
 	case FadeOutHandleItem:
-		rv = static_cast<AudioRegionView*>(item->get_data ("regionview"));
+		rv = static_cast<RegionView*>(item->get_data ("regionview"));
 		{
 			ArdourCanvas::SimpleRect *rect = dynamic_cast<ArdourCanvas::SimpleRect *> (item);
 			if (rect) {
@@ -1525,7 +1530,7 @@ Editor::motion_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item
 	case PanAutomationControlPointItem:
 	case TempoMarkerItem:
 	case MeterMarkerItem:
-	case AudioRegionViewNameHighlight:
+	case RegionViewNameHighlight:
 	case StartSelectionTrimItem:
 	case EndSelectionTrimItem:
 	case SelectionItem:
@@ -1746,7 +1751,7 @@ Editor::start_fade_in_grab (ArdourCanvas::Item* item, GdkEvent* event)
 
 	AudioRegionView* arv = static_cast<AudioRegionView*>(drag_info.data);
 
-	drag_info.pointer_frame_offset = drag_info.grab_frame - ((jack_nframes_t) arv->region.fade_in().back()->when + arv->region.position());	
+	drag_info.pointer_frame_offset = drag_info.grab_frame - ((jack_nframes_t) arv->audio_region().fade_in().back()->when + arv->region().position());	
 }
 
 void
@@ -1767,17 +1772,17 @@ Editor::fade_in_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 		snap_to (pos);
 	}
 	
-	if (pos < (arv->region.position() + 64)) {
+	if (pos < (arv->region().position() + 64)) {
 		fade_length = 64; // this should be a minimum defined somewhere
-	} else if (pos > arv->region.last_frame()) {
-		fade_length = arv->region.length();
+	} else if (pos > arv->region().last_frame()) {
+		fade_length = arv->region().length();
 	} else {
-		fade_length = pos - arv->region.position();
+		fade_length = pos - arv->region().position();
 	}
 	
 	arv->reset_fade_in_shape_width (fade_length);
 
-	show_verbose_duration_cursor (arv->region.position(),  arv->region.position() + fade_length, 10);
+	show_verbose_duration_cursor (arv->region().position(),  arv->region().position() + fade_length, 10);
 
 	drag_info.first_move = false;
 }
@@ -1802,23 +1807,23 @@ Editor::fade_in_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* even
 		snap_to (pos);
 	}
 
-	if (pos < (arv->region.position() + 64)) {
+	if (pos < (arv->region().position() + 64)) {
 		fade_length = 64; // this should be a minimum defined somewhere
 	}
-	else if (pos > arv->region.last_frame()) {
-		fade_length = arv->region.length();
+	else if (pos > arv->region().last_frame()) {
+		fade_length = arv->region().length();
 	}
 	else {
-		fade_length = pos - arv->region.position();
+		fade_length = pos - arv->region().position();
 	}
 
 	begin_reversible_command (_("change fade in length"));
-        XMLNode &before = arv->region.get_state();
+        XMLNode &before = arv->audio_region().get_state();
 
-	arv->region.set_fade_in_length (fade_length);
+	arv->audio_region().set_fade_in_length (fade_length);
 
-        XMLNode &after = arv->region.get_state();
-        session->add_command(new MementoCommand<ARDOUR::AudioRegion>(arv->region,
+        XMLNode &after = arv->audio_region().get_state();
+        session->add_command(new MementoCommand<ARDOUR::AudioRegion>(arv->audio_regio(),
                                                                      before,
                                                                      after));
 	commit_reversible_command ();
@@ -1841,7 +1846,7 @@ Editor::start_fade_out_grab (ArdourCanvas::Item* item, GdkEvent* event)
 
 	AudioRegionView* arv = static_cast<AudioRegionView*>(drag_info.data);
 
-	drag_info.pointer_frame_offset = drag_info.grab_frame - (arv->region.length() - (jack_nframes_t) arv->region.fade_out().back()->when + arv->region.position());	
+	drag_info.pointer_frame_offset = drag_info.grab_frame - (arv->region().length() - (jack_nframes_t) arv->audio_region().fade_out().back()->when + arv->region().position());	
 }
 
 void
@@ -1862,19 +1867,19 @@ Editor::fade_out_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event
 		snap_to (pos);
 	}
 
-	if (pos > (arv->region.last_frame() - 64)) {
+	if (pos > (arv->region().last_frame() - 64)) {
 		fade_length = 64; // this should really be a minimum fade defined somewhere
 	}
-	else if (pos < arv->region.position()) {
-		fade_length = arv->region.length();
+	else if (pos < arv->region().position()) {
+		fade_length = arv->region().length();
 	}
 	else {
-		fade_length = arv->region.last_frame() - pos;
+		fade_length = arv->region().last_frame() - pos;
 	}
 	
 	arv->reset_fade_out_shape_width (fade_length);
 
-	show_verbose_duration_cursor (arv->region.last_frame() - fade_length, arv->region.last_frame(), 10);
+	show_verbose_duration_cursor (arv->region().last_frame() - fade_length, arv->region().last_frame(), 10);
 
 	drag_info.first_move = false;
 }
@@ -1899,23 +1904,23 @@ Editor::fade_out_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* eve
 		snap_to (pos);
 	}
 
-	if (pos > (arv->region.last_frame() - 64)) {
+	if (pos > (arv->region().last_frame() - 64)) {
 		fade_length = 64; // this should really be a minimum fade defined somewhere
 	}
-	else if (pos < arv->region.position()) {
-		fade_length = arv->region.length();
+	else if (pos < arv->region().position()) {
+		fade_length = arv->region().length();
 	}
 	else {
-		fade_length = arv->region.last_frame() - pos;
+		fade_length = arv->region().last_frame() - pos;
 	}
 
 	begin_reversible_command (_("change fade out length"));
-        XMLNode &before = arv->region.get_state();
+        XMLNode &before = arv->region().get_state();
 
-	arv->region.set_fade_out_length (fade_length);
+	arv->audio_region().set_fade_out_length (fade_length);
 
-        XMLNode &after = arv->region.get_state();
-        session->add_command(new MementoCommand<ARDOUR::AudioRegion>(arv->region, before, after));
+        XMLNode &after = arv->region().get_state();
+        session->add_command(new MementoCommand<ARDOUR::AudioRegion>(arv->region(), before, after));
 	commit_reversible_command ();
 
 	fade_out_drag_motion_callback (item, event);
@@ -2038,7 +2043,7 @@ Editor::start_marker_grab (ArdourCanvas::Item* item, GdkEvent* event)
 
 	drag_info.copied_location = new Location (*location);
 	drag_info.pointer_frame_offset = drag_info.grab_frame - (is_start ? location->start() : location->end());	
-	
+
 	update_marker_drag_item (location);
 
 	if (location->is_mark()) {
@@ -2097,31 +2102,39 @@ Editor::marker_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 		move_both = true;
 	}
 
-	if (is_start) { // start marker
+	if (copy_location->is_mark()) {
+		/* just move it */
 
-		if (move_both) {
-			copy_location->set_start (newframe);
-			copy_location->set_end (newframe + f_delta);
-		} else 	if (newframe < copy_location->end()) {
-			copy_location->set_start (newframe);
-		} else { 
-			snap_to (next, 1, true);
-			copy_location->set_end (next);
-			copy_location->set_start (newframe);
-		}
+		copy_location->set_start (newframe);
 
-	} else { // end marker
+	} else {
 
-		if (move_both) {
-			copy_location->set_end (newframe);
-			copy_location->set_start (newframe - f_delta);
-		} else if (newframe > copy_location->start()) {
-			copy_location->set_end (newframe);
+		if (is_start) { // start-of-range marker
 			
-		} else if (newframe > 0) {
-			snap_to (next, -1, true);
-			copy_location->set_start (next);
-			copy_location->set_end (newframe);
+			if (move_both) {
+				copy_location->set_start (newframe);
+				copy_location->set_end (newframe + f_delta);
+			} else 	if (newframe < copy_location->end()) {
+				copy_location->set_start (newframe);
+			} else { 
+				snap_to (next, 1, true);
+				copy_location->set_end (next);
+				copy_location->set_start (newframe);
+			}
+			
+		} else { // end marker
+			
+			if (move_both) {
+				copy_location->set_end (newframe);
+				copy_location->set_start (newframe - f_delta);
+			} else if (newframe > copy_location->start()) {
+				copy_location->set_end (newframe);
+				
+			} else if (newframe > 0) {
+				snap_to (next, -1, true);
+				copy_location->set_start (next);
+				copy_location->set_end (newframe);
+			}
 		}
 	}
 
@@ -2154,7 +2167,11 @@ Editor::marker_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 	Location * location = find_location_from_marker (marker, is_start);
 	
 	if (location) {
-		location->set (drag_info.copied_location->start(), drag_info.copied_location->end());
+		if (location->is_mark()) {
+			location->set_start (drag_info.copied_location->start());
+		} else {
+			location->set (drag_info.copied_location->start(), drag_info.copied_location->end());
+		}
 	}
 
 	XMLNode &after = session->locations()->get_state();
@@ -2553,7 +2570,8 @@ Editor::start_line_grab_from_regionview (ArdourCanvas::Item* item, GdkEvent* eve
 {
 	switch (mouse_mode) {
 	case MouseGain:
-		start_line_grab (clicked_regionview->get_gain_line(), event);
+		assert(dynamic_cast<AudioRegionView*>(clicked_regionview));
+		start_line_grab (dynamic_cast<AudioRegionView*>(clicked_regionview)->get_gain_line(), event);
 		break;
 	default:
 		break;
@@ -2647,7 +2665,7 @@ Editor::line_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event)
 void
 Editor::start_region_grab (ArdourCanvas::Item* item, GdkEvent* event)
 {
-	if (selection->audio_regions.empty() || clicked_regionview == 0) {
+	if (selection->regions.empty() || clicked_regionview == 0) {
 		return;
 	}
 
@@ -2661,13 +2679,13 @@ Editor::start_region_grab (ArdourCanvas::Item* item, GdkEvent* event)
 
 	double speed = 1.0;
 	TimeAxisView* tvp = clicked_trackview;
-	AudioTimeAxisView* tv = dynamic_cast<AudioTimeAxisView*>(tvp);
+	RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*>(tvp);
 
 	if (tv && tv->is_audio_track()) {
 		speed = tv->get_diskstream()->speed();
 	}
 	
-	drag_info.last_frame_position = (jack_nframes_t) (clicked_regionview->region.position() / speed);
+	drag_info.last_frame_position = (jack_nframes_t) (clicked_regionview->region().position() / speed);
 	drag_info.pointer_frame_offset = drag_info.grab_frame - drag_info.last_frame_position;
 	drag_info.last_trackview = &clicked_regionview->get_time_axis_view();
 	// we want a move threshold
@@ -2681,7 +2699,7 @@ Editor::start_region_grab (ArdourCanvas::Item* item, GdkEvent* event)
 void
 Editor::start_region_copy_grab (ArdourCanvas::Item* item, GdkEvent* event)
 {
-	if (selection->audio_regions.empty() || clicked_regionview == 0) {
+	if (selection->regions.empty() || clicked_regionview == 0) {
 		return;
 	}
 
@@ -2692,7 +2710,7 @@ Editor::start_region_copy_grab (ArdourCanvas::Item* item, GdkEvent* event)
 	start_grab(event);
 
 	TimeAxisView* tv = &clicked_regionview->get_time_axis_view();
-	AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(tv);
+	RouteTimeAxisView* atv = dynamic_cast<RouteTimeAxisView*>(tv);
 	double speed = 1.0;
 
 	if (atv && atv->is_audio_track()) {
@@ -2700,7 +2718,7 @@ Editor::start_region_copy_grab (ArdourCanvas::Item* item, GdkEvent* event)
 	}
 	
 	drag_info.last_trackview = &clicked_regionview->get_time_axis_view();
-	drag_info.last_frame_position = (jack_nframes_t) (clicked_regionview->region.position() / speed);
+	drag_info.last_frame_position = (jack_nframes_t) (clicked_regionview->region().position() / speed);
 	drag_info.pointer_frame_offset = drag_info.grab_frame - drag_info.last_frame_position;
 	// we want a move threshold
 	drag_info.want_move_threshold = true;
@@ -2711,7 +2729,7 @@ Editor::start_region_copy_grab (ArdourCanvas::Item* item, GdkEvent* event)
 void
 Editor::start_region_brush_grab (ArdourCanvas::Item* item, GdkEvent* event)
 {
-	if (selection->audio_regions.empty() || clicked_regionview == 0) {
+	if (selection->regions.empty() || clicked_regionview == 0) {
 		return;
 	}
 
@@ -2725,13 +2743,13 @@ Editor::start_region_brush_grab (ArdourCanvas::Item* item, GdkEvent* event)
 
 	double speed = 1.0;
 	TimeAxisView* tvp = clicked_trackview;
-	AudioTimeAxisView* tv = dynamic_cast<AudioTimeAxisView*>(tvp);
+	RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*>(tvp);
 
 	if (tv && tv->is_audio_track()) {
 		speed = tv->get_diskstream()->speed();
 	}
 	
-	drag_info.last_frame_position = (jack_nframes_t) (clicked_regionview->region.position() / speed);
+	drag_info.last_frame_position = (jack_nframes_t) (clicked_regionview->region().position() / speed);
 	drag_info.pointer_frame_offset = drag_info.grab_frame - drag_info.last_frame_position;
 	drag_info.last_trackview = &clicked_regionview->get_time_axis_view();
 	// we want a move threshold
@@ -2746,7 +2764,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 {
 	double x_delta;
 	double y_delta = 0;
-	AudioRegionView *rv = reinterpret_cast<AudioRegionView*> (drag_info.data); 
+	RegionView* rv = reinterpret_cast<RegionView*> (drag_info.data); 
 	jack_nframes_t pending_region_position = 0;
 	int32_t pointer_y_span = 0, canvas_pointer_y_span = 0, original_pointer_order;
 	int32_t visible_y_high = 0, visible_y_low = 512;  //high meaning higher numbered.. not the height on the screen
@@ -2766,18 +2784,18 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 		
 		/* duplicate the region(s) */
 		
-		vector<AudioRegionView*> new_regionviews;
+		vector<RegionView*> new_regionviews;
 		
 		set<Playlist*> affected_playlists;
 		pair<set<Playlist*>::iterator,bool> insert_result;
 		
-		for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin(); i != selection->audio_regions.by_layer().end(); ++i) {
-			AudioRegionView* rv;
+		for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
+			RegionView* rv;
 			
 			rv = (*i);
 			
-			Playlist* to_playlist = rv->region.playlist();
-			AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(&rv->get_time_axis_view());
+			Playlist* to_playlist = rv->region().playlist();
+			RouteTimeAxisView* atv = dynamic_cast<RouteTimeAxisView*>(&rv->get_time_axis_view());
 			
 			insert_result = affected_playlists.insert (to_playlist);
 			if (insert_result.second) {
@@ -2786,18 +2804,21 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 			
 			latest_regionview = 0;
 			
-			sigc::connection c = atv->view->AudioRegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
-			
-			/* create a new region with the same name.
-			 */
+			sigc::connection c = atv->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
 			
-			AudioRegion* newregion = new AudioRegion (rv->region);
+			/* create a new region with the same name. */
 			
+			// FIXME: ew.  need a (virtual) Region::duplicate() or something?
+			Region* newregion = NULL;
+			if (dynamic_cast<AudioRegion*>(&rv->region()))
+				newregion = new AudioRegion (dynamic_cast<AudioRegion&>(rv->region()));
+			assert(newregion);
+
 			/* if the original region was locked, we don't care */
 			
 			newregion->set_locked (false);
 			
-			to_playlist->add_region (*newregion, (jack_nframes_t) (rv->region.position() * atv->get_diskstream()->speed()));
+			to_playlist->add_region (*newregion, (jack_nframes_t) (rv->region().position() * atv->get_diskstream()->speed()));
 			
 			c.disconnect ();
 			
@@ -2909,16 +2930,15 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 			}
 		}
 
-		for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin(); i != selection->audio_regions.by_layer().end(); ++i) {
-			AudioRegionView* rv2;
-			rv2 = (*i);
+		for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
+			RegionView* rv2 = (*i);
 			double ix1, ix2, iy1, iy2;
 			int32_t n = 0;
 
 			rv2->get_canvas_frame()->get_bounds (ix1, iy1, ix2, iy2);
 			rv2->get_canvas_group()->i2w (ix1, iy1);
 			TimeAxisView* tvp2 = trackview_by_y_position (iy1);
-			AudioTimeAxisView* atv2 = dynamic_cast<AudioTimeAxisView*>(tvp2);
+			RouteTimeAxisView* atv2 = dynamic_cast<RouteTimeAxisView*>(tvp2);
 
 			if (atv2->order != original_pointer_order) {	
 				/* this isn't the pointer track */	
@@ -3013,8 +3033,8 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 	    
 			pending_region_position = drag_info.current_pointer_frame - drag_info.pointer_frame_offset;
 	    
-			sync_offset = rv->region.sync_offset (sync_dir);
-			sync_frame = rv->region.adjust_to_sync (pending_region_position);
+			sync_offset = rv->region().sync_offset (sync_dir);
+			sync_frame = rv->region().adjust_to_sync (pending_region_position);
 
 			/* we snap if the snap modifier is not enabled.
 			 */
@@ -3033,7 +3053,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 			pending_region_position = 0;
 		}
 	  
-		if (pending_region_position > max_frames - rv->region.length()) {
+		if (pending_region_position > max_frames - rv->region().length()) {
 			pending_region_position = drag_info.last_frame_position;
 		}
 	  
@@ -3075,14 +3095,11 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 	} 
 
 	if (x_delta < 0) {
-		for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin(); i != selection->audio_regions.by_layer().end(); ++i) {
+		for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
 
-			AudioRegionView* rv2;
-			rv2 = (*i);
+			RegionView* rv2 = (*i);
 
-			/* if any regionview is at zero, we need to know so we can 
-			   stop further leftward motion.
-			*/
+			// If any regionview is at zero, we need to know so we can stop further leftward motion.
 			
 			double ix1, ix2, iy1, iy2;
 			rv2->get_canvas_frame()->get_bounds (ix1, iy1, ix2, iy2);
@@ -3100,12 +3117,11 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 	************************************************************/
 
 	pair<set<Playlist*>::iterator,bool> insert_result;
-	const list<AudioRegionView*>& layered_regions = selection->audio_regions.by_layer();
+	const list<RegionView*>& layered_regions = selection->regions.by_layer();
 
-	for (list<AudioRegionView*>::const_iterator i = layered_regions.begin(); i != layered_regions.end(); ++i) {
+	for (list<RegionView*>::const_iterator i = layered_regions.begin(); i != layered_regions.end(); ++i) {
 	    
-		AudioRegionView* rv;
-		rv = (*i);
+		RegionView* rv = (*i);
 		double ix1, ix2, iy1, iy2;
 		int32_t temp_pointer_y_span = pointer_y_span;
 
@@ -3186,8 +3202,8 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 			if (-x_delta > ix1) {
 				x_delta = -ix1;
 			}
-		} else if ((x_delta > 0) &&(rv->region.last_frame() > max_frames - x_delta)) {
-			x_delta = max_frames - rv->region.last_frame();
+		} else if ((x_delta > 0) &&(rv->region().last_frame() > max_frames - x_delta)) {
+			x_delta = max_frames - rv->region().last_frame();
 		}
 			
 		if (drag_info.first_move) {
@@ -3212,7 +3228,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 
 			AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*> (&rv->get_time_axis_view());
 			if (atv && atv->is_audio_track()) {
-				AudioPlaylist* pl = atv->get_diskstream()->playlist();
+				AudioPlaylist* pl = dynamic_cast<AudioPlaylist*>(atv->get_diskstream()->playlist());
 				if (pl) {
 					/* only freeze and capture state once */
 
@@ -3248,11 +3264,11 @@ void
 Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event)
 {
 	jack_nframes_t where;
-	AudioRegionView* rv = reinterpret_cast<AudioRegionView *> (drag_info.data);
+	RegionView* rv = reinterpret_cast<RegionView *> (drag_info.data);
 	pair<set<Playlist*>::iterator,bool> insert_result;
 	bool nocommit = true;
 	double speed;
-	AudioTimeAxisView* atv;
+	RouteTimeAxisView* atv;
 	bool regionview_y_movement;
 	bool regionview_x_movement;
 
@@ -3286,7 +3302,7 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 		speed = atv->get_diskstream()->speed();
 	}
 	
-	regionview_x_movement = (drag_info.last_frame_position != (jack_nframes_t) (rv->region.position()/speed));
+	regionview_x_movement = (drag_info.last_frame_position != (jack_nframes_t) (rv->region().position()/speed));
 	regionview_y_movement = (drag_info.last_trackview != &rv->get_time_axis_view());
 
 	//printf ("last_frame: %s position is %lu  %g\n", rv->get_time_axis_view().name().c_str(), drag_info.last_frame_position, speed); 
@@ -3296,13 +3312,13 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 
 		/* motion between tracks */
 
-		list<AudioRegionView*> new_selection;
+		list<RegionView*> new_selection;
 	
 		/* moved to a different audio track. */
 
-		for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin(); i != selection->audio_regions.by_layer().end(); ) {
+		for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ) {
 	    
-			AudioRegionView* rv2 = (*i);	    	    
+			RegionView* rv2 = (*i);	    	    
 	    
 			/* the region that used to be in the old playlist is not
 			   moved to the new one - we make a copy of it. as a result,
@@ -3319,7 +3335,7 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 
 		/* first, freeze the target tracks */
 
-		for (list<AudioRegionView*>::const_iterator i = new_selection.begin(); i != new_selection.end();i++ ) {
+		for (list<RegionView*>::const_iterator i = new_selection.begin(); i != new_selection.end();i++ ) {
 
 			Playlist* from_playlist;
 			Playlist* to_playlist;
@@ -3331,7 +3347,7 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 			TimeAxisView* tvp2 = trackview_by_y_position (iy1);
 			AudioTimeAxisView* atv2 = dynamic_cast<AudioTimeAxisView*>(tvp2);
 	    
-			from_playlist = (*i)->region.playlist();
+			from_playlist = (*i)->region().playlist();
 			to_playlist = atv2->playlist();
 
 			/* the from_playlist was frozen in the "first_move" case 
@@ -3354,7 +3370,7 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 
 		/* now do it again with the actual operations */
 
-		for (list<AudioRegionView*>::const_iterator i = new_selection.begin(); i != new_selection.end();i++ ) {
+		for (list<RegionView*>::const_iterator i = new_selection.begin(); i != new_selection.end();i++ ) {
 
 			Playlist* from_playlist;
 			Playlist* to_playlist;
@@ -3366,17 +3382,17 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 			TimeAxisView* tvp2 = trackview_by_y_position (iy1);
 			AudioTimeAxisView* atv2 = dynamic_cast<AudioTimeAxisView*>(tvp2);
 	    
-			from_playlist = (*i)->region.playlist();
+			from_playlist = (*i)->region().playlist();
 			to_playlist = atv2->playlist();
 
 			latest_regionview = 0;
 	    
 			where = (jack_nframes_t) (unit_to_frame (ix1) * speed);
-			Region* new_region = createRegion ((*i)->region);
+			Region* new_region = createRegion ((*i)->region());
 
-			from_playlist->remove_region (&((*i)->region));
+			from_playlist->remove_region (&((*i)->region()));
 	  
-			sigc::connection c = atv2->view->AudioRegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
+			sigc::connection c = atv2->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
 			to_playlist->add_region (*new_region, where);
 			c.disconnect ();
 			
@@ -3389,11 +3405,11 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 
 		/* motion within a single track */
 		
-		for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin(); i != selection->audio_regions.by_layer().end(); ++i) {
+		for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
 
 			rv = (*i);
 
-			if (rv->region.locked()) {
+			if (rv->region().locked()) {
 				continue;
 			}
 			
@@ -3415,14 +3431,14 @@ Editor::region_drag_finished_callback (ArdourCanvas::Item* item, GdkEvent* event
 				
 			} else {
 				
-				where = rv->region.position();
+				where = rv->region().position();
 			}
 
 			rv->get_time_axis_view().reveal_dependent_views (*rv);
 
 			/* no need to add an undo here, we did that when we added this playlist to motion_frozen playlists */
 			
-			rv->region.set_position (where, (void *) this);
+			rv->region().set_position (where, (void *) this);
 		}
 	}
 
@@ -3456,15 +3472,15 @@ Editor::region_view_item_click (AudioRegionView& rv, GdkEventButton* event)
 
 		if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::Control|Keyboard::Alt))) {
 
-			align_region (rv.region, SyncPoint, (jack_nframes_t) (edit_cursor->current_frame * speed));
+			align_region (rv.region(), SyncPoint, (jack_nframes_t) (edit_cursor->current_frame * speed));
 
 		} else if (Keyboard::modifier_state_equals (event->state, Keyboard::ModifierMask (Keyboard::Control|Keyboard::Shift))) {
 
-			align_region (rv.region, End, (jack_nframes_t) (edit_cursor->current_frame * speed));
+			align_region (rv.region(), End, (jack_nframes_t) (edit_cursor->current_frame * speed));
 
 		} else {
 
-			align_region (rv.region, Start, (jack_nframes_t) (edit_cursor->current_frame * speed));
+			align_region (rv.region(), Start, (jack_nframes_t) (edit_cursor->current_frame * speed));
 		}
 	}
 }
@@ -3581,7 +3597,7 @@ Editor::show_verbose_duration_cursor (jack_nframes_t start, jack_nframes_t end,
 }
 
 void
-Editor::collect_new_region_view (AudioRegionView* rv)
+Editor::collect_new_region_view (RegionView* rv)
 {
 	latest_regionview = rv;
 }
@@ -3614,7 +3630,7 @@ Editor::start_selection_grab (ArdourCanvas::Item* item, GdkEvent* event)
 	*/
 	
 	latest_regionview = 0;
-	sigc::connection c = clicked_audio_trackview->view->AudioRegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
+	sigc::connection c = clicked_audio_trackview->view()->RegionViewAdded.connect (mem_fun(*this, &Editor::collect_new_region_view));
 	
 	/* A selection grab currently creates two undo/redo operations, one for 
 	   creating the new region and another for moving it.
@@ -3650,7 +3666,7 @@ Editor::start_selection_grab (ArdourCanvas::Item* item, GdkEvent* event)
 	start_grab (event);
 	
 	drag_info.last_trackview = clicked_trackview;
-	drag_info.last_frame_position = latest_regionview->region.position();
+	drag_info.last_frame_position = latest_regionview->region().position();
 	drag_info.pointer_frame_offset = drag_info.grab_frame - drag_info.last_frame_position;
 	
 	show_verbose_time_cursor (drag_info.last_frame_position, 10);
@@ -3891,9 +3907,9 @@ Editor::start_trim (ArdourCanvas::Item* item, GdkEvent* event)
 		speed = tv->get_diskstream()->speed();
 	}
 	
-	jack_nframes_t region_start = (jack_nframes_t) (clicked_regionview->region.position() / speed);
-	jack_nframes_t region_end = (jack_nframes_t) (clicked_regionview->region.last_frame() / speed);
-	jack_nframes_t region_length = (jack_nframes_t) (clicked_regionview->region.length() / speed);
+	jack_nframes_t region_start = (jack_nframes_t) (clicked_regionview->region().position() / speed);
+	jack_nframes_t region_end = (jack_nframes_t) (clicked_regionview->region().last_frame() / speed);
+	jack_nframes_t region_length = (jack_nframes_t) (clicked_regionview->region().length() / speed);
 
 	motion_frozen_playlists.clear();
 	
@@ -3933,7 +3949,7 @@ Editor::start_trim (ArdourCanvas::Item* item, GdkEvent* event)
 void
 Editor::trim_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 {
-	AudioRegionView* rv = clicked_regionview;
+	RegionView* rv = clicked_regionview;
 	jack_nframes_t frame_delta = 0;
 	bool left_direction;
 	bool obey_snap = !Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier());
@@ -3945,7 +3961,7 @@ Editor::trim_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 
 	double speed = 1.0;
 	TimeAxisView* tvp = clicked_trackview;
-	AudioTimeAxisView* tv = dynamic_cast<AudioTimeAxisView*>(tvp);
+	RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*>(tvp);
 	pair<set<Playlist*>::iterator,bool> insert_result;
 
 	if (tv && tv->is_audio_track()) {
@@ -3984,11 +4000,14 @@ Editor::trim_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 
 		begin_reversible_command (trim_type);
 
-		for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin(); i != selection->audio_regions.by_layer().end(); ++i) {
-			(*i)->region.freeze ();
-			(*i)->temporarily_hide_envelope ();
+		for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
+			(*i)->region().freeze ();
+		
+			AudioRegionView* const arv = dynamic_cast<AudioRegionView*>(*i);
+			if (arv)
+				arv->temporarily_hide_envelope ();
 
-			Playlist * pl = (*i)->region.playlist();
+			Playlist * pl = (*i)->region().playlist();
 			insert_result = motion_frozen_playlists.insert (pl);
 			if (insert_result.second) {
                                 session->add_command(new MementoUndoCommand<Playlist>(*pl, pl->get_state()));
@@ -4004,20 +4023,20 @@ Editor::trim_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 
 	switch (trim_op) {		
 	case StartTrim:
-		if ((left_direction == false) && (drag_info.current_pointer_frame <= rv->region.first_frame()/speed)) {
+		if ((left_direction == false) && (drag_info.current_pointer_frame <= rv->region().first_frame()/speed)) {
 			break;
                 } else {
-			for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin(); i != selection->audio_regions.by_layer().end(); ++i) {
+			for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
 				single_start_trim (**i, frame_delta, left_direction, obey_snap);
 			}
 			break;
 		}
 		
 	case EndTrim:
-		if ((left_direction == true) && (drag_info.current_pointer_frame > (jack_nframes_t) (rv->region.last_frame()/speed))) {
+		if ((left_direction == true) && (drag_info.current_pointer_frame > (jack_nframes_t) (rv->region().last_frame()/speed))) {
 			break;
 		} else {
-			for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin(); i != selection->audio_regions.by_layer().end(); ++i) {
+			for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i) {
 				single_end_trim (**i, frame_delta, left_direction, obey_snap);
 			}
 			break;
@@ -4031,8 +4050,8 @@ Editor::trim_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 				swap_direction = true;
 			}
 			
-			for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin();
-			     i != selection->audio_regions.by_layer().end(); ++i)
+			for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin();
+			     i != selection->regions.by_layer().end(); ++i)
 			{
 				single_contents_trim (**i, frame_delta, left_direction, swap_direction, obey_snap);
 			}
@@ -4042,10 +4061,10 @@ Editor::trim_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 
 	switch (trim_op) {
 	case StartTrim:
-		show_verbose_time_cursor((jack_nframes_t) (rv->region.position()/speed), 10);	
+		show_verbose_time_cursor((jack_nframes_t) (rv->region().position()/speed), 10);	
 		break;
 	case EndTrim:
-		show_verbose_time_cursor((jack_nframes_t) (rv->region.last_frame()/speed), 10);	
+		show_verbose_time_cursor((jack_nframes_t) (rv->region().last_frame()/speed), 10);	
 		break;
 	case ContentsTrim:
 		show_verbose_time_cursor(drag_info.current_pointer_frame, 10);	
@@ -4057,9 +4076,9 @@ Editor::trim_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 }
 
 void
-Editor::single_contents_trim (AudioRegionView& rv, jack_nframes_t frame_delta, bool left_direction, bool swap_direction, bool obey_snap)
+Editor::single_contents_trim (RegionView& rv, jack_nframes_t frame_delta, bool left_direction, bool swap_direction, bool obey_snap)
 {
-	Region& region (rv.region);
+	Region& region (rv.region());
 
 	if (region.locked()) {
 		return;
@@ -4069,7 +4088,7 @@ Editor::single_contents_trim (AudioRegionView& rv, jack_nframes_t frame_delta, b
 
 	double speed = 1.0;
 	TimeAxisView* tvp = clicked_trackview;
-	AudioTimeAxisView* tv = dynamic_cast<AudioTimeAxisView*>(tvp);
+	RouteTimeAxisView* tv = dynamic_cast<RouteTimeAxisView*>(tvp);
 
 	if (tv && tv->is_audio_track()) {
 		speed = tv->get_diskstream()->speed();
@@ -4097,9 +4116,9 @@ Editor::single_contents_trim (AudioRegionView& rv, jack_nframes_t frame_delta, b
 }
 
 void
-Editor::single_start_trim (AudioRegionView& rv, jack_nframes_t frame_delta, bool left_direction, bool obey_snap)
+Editor::single_start_trim (RegionView& rv, jack_nframes_t frame_delta, bool left_direction, bool obey_snap)
 {
-	Region& region (rv.region);	
+	Region& region (rv.region());	
 
 	if (region.locked()) {
 		return;
@@ -4131,9 +4150,9 @@ Editor::single_start_trim (AudioRegionView& rv, jack_nframes_t frame_delta, bool
 }
 
 void
-Editor::single_end_trim (AudioRegionView& rv, jack_nframes_t frame_delta, bool left_direction, bool obey_snap)
+Editor::single_end_trim (RegionView& rv, jack_nframes_t frame_delta, bool left_direction, bool obey_snap)
 {
-	Region& region (rv.region);
+	Region& region (rv.region());
 
 	if (region.locked()) {
 		return;
@@ -4172,8 +4191,8 @@ Editor::trim_finished_callback (ArdourCanvas::Item* item, GdkEvent* event)
 			thaw_region_after_trim (*clicked_regionview);		
 		} else {
 			
-			for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin();
-			     i != selection->audio_regions.by_layer().end(); ++i)
+			for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin();
+			     i != selection->regions.by_layer().end(); ++i)
 			{
 				thaw_region_after_trim (**i);
 			}
@@ -4196,7 +4215,7 @@ Editor::trim_finished_callback (ArdourCanvas::Item* item, GdkEvent* event)
 void
 Editor::point_trim (GdkEvent* event)
 {
-	AudioRegionView* rv = clicked_regionview;
+	RegionView* rv = clicked_regionview;
 	jack_nframes_t new_bound = drag_info.current_pointer_frame;
 
 	if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
@@ -4211,13 +4230,13 @@ Editor::point_trim (GdkEvent* event)
 
 		if (rv->get_selected()) {
 
-			for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin();
-			     i != selection->audio_regions.by_layer().end(); ++i)
+			for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin();
+			     i != selection->regions.by_layer().end(); ++i)
 			{
-				if (!(*i)->region.locked()) {
+				if (!(*i)->region().locked()) {
                                         Playlist *pl = (*i)->region.playlist();
                                         XMLNode &before = pl->get_state();
-					(*i)->region.trim_front (new_bound, this);	
+					(*i)->region().trim_front (new_bound, this);	
                                         XMLNode &after = pl->get_state();
                                         session->add_command(new MementoCommand<Playlist>(*pl, before, after));
 				}
@@ -4225,10 +4244,10 @@ Editor::point_trim (GdkEvent* event)
 
 		} else {
 
-			if (!rv->region.locked()) {
-                                Playlist *pl = rv->region.playlist();
+			if (!rv->region().locked()) {
+                                Playlist *pl = rv->region().playlist();
 				XMLNode &before = pl->get_state();
-				rv->region.trim_front (new_bound, this);	
+				rv->region().trim_front (new_bound, this);	
                                 XMLNode &after = pl->get_state();
 				session->add_command(new MementoCommand<Playlist>(*pl, before, after));
 			}
@@ -4243,12 +4262,12 @@ Editor::point_trim (GdkEvent* event)
 
 		if (rv->get_selected()) {
 			
-			for (list<AudioRegionView*>::const_iterator i = selection->audio_regions.by_layer().begin(); i != selection->audio_regions.by_layer().end(); ++i)
+			for (list<RegionView*>::const_iterator i = selection->regions.by_layer().begin(); i != selection->regions.by_layer().end(); ++i)
 			{
-				if (!(*i)->region.locked()) {
-                                        Playlist *pl = (*i)->region.playlist();
+				if (!(*i)->region().locked()) {
+                                        Playlist *pl = (*i)->region().playlist();
 					XMLNode &before = pl->get_state();
-					(*i)->region.trim_end (new_bound, this);
+					(*i)->region().trim_end (new_bound, this);
 					XMLNode &after = pl->get_state();
 					session->add_command(new MementoCommand<Playlist>(*pl, before, after));
 				}
@@ -4256,10 +4275,10 @@ Editor::point_trim (GdkEvent* event)
 
 		} else {
 
-			if (!rv->region.locked()) {
-                                Playlist *pl = rv->region.playlist();
+			if (!rv->region().locked()) {
+                                Playlist *pl = rv->region().playlist();
 				XMLNode &before = pl->get_state();
-				rv->region.trim_end (new_bound, this);
+				rv->region().trim_end (new_bound, this);
                                 XMLNode &after = pl->get_state();
 				session->add_command (new MementoCommand<Playlist>(*pl, before, after));
 			}
@@ -4274,9 +4293,9 @@ Editor::point_trim (GdkEvent* event)
 }
 
 void
-Editor::thaw_region_after_trim (AudioRegionView& rv)
+Editor::thaw_region_after_trim (RegionView& rv)
 {
-	Region& region (rv.region);
+	Region& region (rv.region());
 
 	if (region.locked()) {
 		return;
@@ -4286,7 +4305,9 @@ Editor::thaw_region_after_trim (AudioRegionView& rv)
         XMLNode &after = region.playlist()->get_state();
 	session->add_command (new MementoRedoCommand<Playlist>(*(region.playlist()), after));
 
-	rv.unhide_envelope ();
+	AudioRegionView* arv = dynamic_cast<AudioRegionView*>(&rv);
+	if (arv)
+		arv->unhide_envelope ();
 }
 
 void
@@ -4679,7 +4700,7 @@ Editor::end_rubberband_select (ArdourCanvas::Item* item, GdkEvent* event)
 		}
 		
 	} else {
-		selection->clear_audio_regions();
+		selection->clear_regions();
 		selection->clear_points ();
 		selection->clear_lines ();
 	}
@@ -4696,7 +4717,7 @@ Editor::mouse_rename_region (ArdourCanvas::Item* item, GdkEvent* event)
 	ArdourPrompter prompter (false);
 
 	prompter.set_prompt (_("Name for region:"));
-	prompter.set_initial_text (clicked_regionview->region.name());
+	prompter.set_initial_text (clicked_regionview->region().name());
 	prompter.add_button (_("Rename"), Gtk::RESPONSE_ACCEPT);
 	prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false);
 	prompter.show_all ();
@@ -4705,7 +4726,7 @@ Editor::mouse_rename_region (ArdourCanvas::Item* item, GdkEvent* event)
         string str;
 		prompter.get_result(str);
 		if (str.length()) {
-	        clicked_regionview->region.set_name (str);
+	        clicked_regionview->region().set_name (str);
 		}
 		break;
 	}
@@ -4727,7 +4748,7 @@ Editor::start_time_fx (ArdourCanvas::Item* item, GdkEvent* event)
 void
 Editor::time_fx_motion (ArdourCanvas::Item *item, GdkEvent* event)
 {
-	AudioRegionView* rv = clicked_regionview;
+	RegionView* rv = clicked_regionview;
 
 	if (!Keyboard::modifier_state_contains (event->button.state, Keyboard::snap_modifier())) {
 		snap_to (drag_info.current_pointer_frame);
@@ -4737,8 +4758,8 @@ Editor::time_fx_motion (ArdourCanvas::Item *item, GdkEvent* event)
 		return;
 	}
 
-	if (drag_info.current_pointer_frame > rv->region.position()) {
-		rv->get_time_axis_view().show_timestretch (rv->region.position(), drag_info.current_pointer_frame);
+	if (drag_info.current_pointer_frame > rv->region().position()) {
+		rv->get_time_axis_view().show_timestretch (rv->region().position(), drag_info.current_pointer_frame);
 	}
 
 	drag_info.last_pointer_frame = drag_info.current_pointer_frame;
@@ -4756,21 +4777,25 @@ Editor::end_time_fx (ArdourCanvas::Item* item, GdkEvent* event)
 		return;
 	}
 	
-	jack_nframes_t newlen = drag_info.last_pointer_frame - clicked_regionview->region.position();
-	float percentage = (float) ((double) newlen - (double) clicked_regionview->region.length()) / ((double) newlen) * 100.0f;
+	jack_nframes_t newlen = drag_info.last_pointer_frame - clicked_regionview->region().position();
+	float percentage = (float) ((double) newlen - (double) clicked_regionview->region().length()) / ((double) newlen) * 100.0f;
 	
 	begin_reversible_command (_("timestretch"));
 
-	if (run_timestretch (selection->audio_regions, percentage) == 0) {
+	if (run_timestretch (selection->regions, percentage) == 0) {
 		session->commit_reversible_command ();
 	}
 }
 
 void
-Editor::mouse_brush_insert_region (AudioRegionView* rv, jack_nframes_t pos)
+Editor::mouse_brush_insert_region (RegionView* rv, jack_nframes_t pos)
 {
 	/* no brushing without a useful snap setting */
 
+	// FIXME
+	AudioRegionView* arv = dynamic_cast<AudioRegionView*>(rv);
+	assert(arv);
+
 	switch (snap_mode) {
 	case SnapMagnetic:
 		return; /* can't work because it allows region to be placed anywhere */
@@ -4790,11 +4815,11 @@ Editor::mouse_brush_insert_region (AudioRegionView* rv, jack_nframes_t pos)
 
 	/* don't brush a copy over the original */
 	
-	if (pos == rv->region.position()) {
+	if (pos == rv->region().position()) {
 		return;
 	}
 
-	AudioTimeAxisView* atv = dynamic_cast<AudioTimeAxisView*>(&rv->get_time_axis_view());
+	RouteTimeAxisView* atv = dynamic_cast<RouteTimeAxisView*>(&arv->get_time_axis_view());
 
 	if (atv == 0 || !atv->is_audio_track()) {
 		return;
@@ -4804,7 +4829,7 @@ Editor::mouse_brush_insert_region (AudioRegionView* rv, jack_nframes_t pos)
 	double speed = atv->get_diskstream()->speed();
 	
         XMLNode &before = playlist->get_state();
-	playlist->add_region (*(new AudioRegion (rv->region)), (jack_nframes_t) (pos * speed));
+	playlist->add_region (*(new AudioRegion (arv->audio_region)), (jack_nframes_t) (pos * speed));
         XMLNode &after = playlist->get_state();
 	session->add_command(new MementoCommand<Playlist>(*playlist, before, after));