Mostly Cosmetic/Design changes to bring trunk and midi branch closer

git-svn-id: svn://localhost/ardour2/branches/midi@733 d708f5d6-7413-0410-9779-e7cbd77b26cf

37 files changed, 58 insertions, 73 deletions

diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript
index 11cb8fcbce..827fd1ac56 100644
--- a/gtk2_ardour/SConscript
+++ b/gtk2_ardour/SConscript
@@ -162,9 +162,9 @@ redirect_automation_time_axis.cc
 redirect_box.cc
 region_gain_line.cc
 region_selection.cc
-regionview.cc
-audio_regionview.cc
-taperegionview.cc
+region_view.cc
+audio_region_view.cc
+tape_region_view.cc
 route_params_ui.cc
 route_redirect_selection.cc
 route_ui.cc
diff --git a/gtk2_ardour/analysis_window.cc b/gtk2_ardour/analysis_window.cc
index 9d9e928312..551e0b7d6d 100644
--- a/gtk2_ardour/analysis_window.cc
+++ b/gtk2_ardour/analysis_window.cc
@@ -35,7 +35,7 @@
 #include "time_axis_view.h"
 #include "public_editor.h"
 #include "selection.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 
 #include "i18n.h"
 
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc
index 16a9be8faf..58b48d3d15 100644
--- a/gtk2_ardour/ardour_ui.cc
+++ b/gtk2_ardour/ardour_ui.cc
@@ -1201,7 +1201,7 @@ ARDOUR_UI::toggle_record_enable (uint32_t dstream)
 		Track* t;
 
 		if ((t = dynamic_cast<Track*>(r.get())) != 0) {
-			t->diskstream().set_record_enabled (!t->diskstream().record_enabled(), this);
+			t->diskstream().set_record_enabled (!t->diskstream().record_enabled());
 		}
 	}
 	if (session == 0) {
@@ -2186,11 +2186,11 @@ ARDOUR_UI::halt_on_xrun_message ()
 }
 
 void 
-ARDOUR_UI::delete_sources_in_the_right_thread (list<ARDOUR::AudioFileSource*>* deletion_list)
+ARDOUR_UI::delete_sources_in_the_right_thread (list<ARDOUR::Source*>* deletion_list)
 {
 	ENSURE_GUI_THREAD (bind (mem_fun(*this, &ARDOUR_UI::delete_sources_in_the_right_thread), deletion_list));
 
-	for (list<AudioFileSource*>::iterator i = deletion_list->begin(); i != deletion_list->end(); ++i) {
+	for (list<Source*>::iterator i = deletion_list->begin(); i != deletion_list->end(); ++i) {
 		delete *i;
 	}
 
diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h
index ab2db06090..0af88eec18 100644
--- a/gtk2_ardour/ardour_ui.h
+++ b/gtk2_ardour/ardour_ui.h
@@ -647,7 +647,7 @@ class ARDOUR_UI : public Gtkmm2ext::UI
 	struct timeval last_peak_grab;
 	struct timeval last_shuttle_request;
 
-	void delete_sources_in_the_right_thread (list<ARDOUR::AudioFileSource*>*);
+	void delete_sources_in_the_right_thread (list<ARDOUR::Source*>*);
 
 	void editor_display_control_changed (Editing::DisplayControl c);
 
diff --git a/gtk2_ardour/audio_region_editor.cc b/gtk2_ardour/audio_region_editor.cc
index b3e2edb126..194f358b42 100644
--- a/gtk2_ardour/audio_region_editor.cc
+++ b/gtk2_ardour/audio_region_editor.cc
@@ -25,7 +25,7 @@
 #include <cmath>
 
 #include "audio_region_editor.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "ardour_ui.h"
 #include "utils.h"
 #include "gui_thread.h"
diff --git a/gtk2_ardour/audio_regionview.cc b/gtk2_ardour/audio_region_view.cc
index f22028f33e..1aa214f52c 100644
--- a/gtk2_ardour/audio_regionview.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -14,8 +14,6 @@
     You should have received a copy of the GNU General Public License
     along with this program; if not, write to the Free Software
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
-
-    $Id: regionview.cc 682 2006-07-14 03:43:32Z drobilla $
 */
 
 #include <cmath>
@@ -32,7 +30,7 @@
 #include <ardour/audio_diskstream.h>
 
 #include "streamview.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "audio_time_axis.h"
 #include "simplerect.h"
 #include "simpleline.h"
diff --git a/gtk2_ardour/audio_regionview.h b/gtk2_ardour/audio_region_view.h
index b59f5f4791..29b3f9d904 100644
--- a/gtk2_ardour/audio_regionview.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -26,7 +26,7 @@
 #include <sigc++/signal.h>
 #include <ardour/region.h>
 
-#include "regionview.h"
+#include "region_view.h"
 #include "route_time_axis.h"
 #include "time_axis_view_item.h"
 #include "automation_line.h"
diff --git a/gtk2_ardour/audio_streamview.cc b/gtk2_ardour/audio_streamview.cc
index 0d0cd7889c..68df5ffe43 100644
--- a/gtk2_ardour/audio_streamview.cc
+++ b/gtk2_ardour/audio_streamview.cc
@@ -32,8 +32,8 @@
 #include <ardour/source.h>
 
 #include "audio_streamview.h"
-#include "audio_regionview.h"
-#include "taperegionview.h"
+#include "audio_region_view.h"
+#include "tape_region_view.h"
 #include "audio_time_axis.h"
 #include "canvas-waveview.h"
 #include "canvas-simplerect.h"
diff --git a/gtk2_ardour/audio_time_axis.cc b/gtk2_ardour/audio_time_axis.cc
index 13383fa6a4..376e05aa4c 100644
--- a/gtk2_ardour/audio_time_axis.cc
+++ b/gtk2_ardour/audio_time_axis.cc
@@ -63,7 +63,7 @@
 #include "plugin_ui.h"
 #include "prompter.h"
 #include "public_editor.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "simplerect.h"
 #include "audio_streamview.h"
 #include "utils.h"
diff --git a/gtk2_ardour/crossfade_view.cc b/gtk2_ardour/crossfade_view.cc
index bb9ee08861..087af25e73 100644
--- a/gtk2_ardour/crossfade_view.cc
+++ b/gtk2_ardour/crossfade_view.cc
@@ -29,7 +29,7 @@
 #include "rgb_macros.h"
 #include "audio_time_axis.h"
 #include "public_editor.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "utils.h"
 #include "canvas_impl.h"
 
diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index fcd17cdb4c..518ef7217a 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -56,7 +56,7 @@
 #include "keyboard.h"
 #include "marker.h"
 #include "playlist_selector.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "rgb_macros.h"
 #include "selection.h"
 #include "audio_streamview.h"
diff --git a/gtk2_ardour/editor_audiotrack.cc b/gtk2_ardour/editor_audiotrack.cc
index cc6a36c95a..00a8e1db9f 100644
--- a/gtk2_ardour/editor_audiotrack.cc
+++ b/gtk2_ardour/editor_audiotrack.cc
@@ -4,7 +4,7 @@
 #include "editor.h"
 #include "editing.h"
 #include "audio_time_axis.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "selection.h"
 
 using namespace ARDOUR;
diff --git a/gtk2_ardour/editor_canvas_events.cc b/gtk2_ardour/editor_canvas_events.cc
index 090d3aa591..d52c71442f 100644
--- a/gtk2_ardour/editor_canvas_events.cc
+++ b/gtk2_ardour/editor_canvas_events.cc
@@ -26,7 +26,7 @@
 
 #include "editor.h"
 #include "public_editor.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "audio_streamview.h"
 #include "crossfade_view.h"
 #include "audio_time_axis.h"
@@ -216,8 +216,6 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Reg
 {
 	gint ret = FALSE;
 
-	/* FIXME: type specific */
-
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 	case GDK_2BUTTON_PRESS:
@@ -255,8 +253,6 @@ Editor::canvas_region_view_event (GdkEvent *event, ArdourCanvas::Item* item, Reg
 bool
 Editor::canvas_stream_view_event (GdkEvent *event, ArdourCanvas::Item* item, RouteTimeAxisView *tv)
 {
-	/* FIXME: type specific */
-
 	bool ret = FALSE;
 	
 	switch (event->type) {
@@ -707,8 +703,6 @@ Editor::canvas_region_view_name_highlight_event (GdkEvent* event, ArdourCanvas::
 {
 	bool ret = false;
 	
-	/* FIXME: type specific (audio only) */
-
 	switch (event->type) {
 	case GDK_BUTTON_PRESS:
 	case GDK_2BUTTON_PRESS:
diff --git a/gtk2_ardour/editor_export_audio.cc b/gtk2_ardour/editor_export_audio.cc
index 2575c99c67..7e26ba37b2 100644
--- a/gtk2_ardour/editor_export_audio.cc
+++ b/gtk2_ardour/editor_export_audio.cc
@@ -31,7 +31,7 @@
 #include "selection.h"
 #include "time_axis_view.h"
 #include "audio_time_axis.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 
 #include <pbd/pthread_utils.h>
 #include <ardour/types.h>
diff --git a/gtk2_ardour/editor_keyboard.cc b/gtk2_ardour/editor_keyboard.cc
index 5258e6a70a..d2b7c1160e 100644
--- a/gtk2_ardour/editor_keyboard.cc
+++ b/gtk2_ardour/editor_keyboard.cc
@@ -22,7 +22,7 @@
 #include <ardour/playlist.h>
 
 #include "editor.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "selection.h"
 
 #include "i18n.h"
diff --git a/gtk2_ardour/editor_keys.cc b/gtk2_ardour/editor_keys.cc
index f18c5f164c..1bcaafd279 100644
--- a/gtk2_ardour/editor_keys.cc
+++ b/gtk2_ardour/editor_keys.cc
@@ -30,7 +30,7 @@
 #include "ardour_ui.h"
 #include "editor.h"
 #include "time_axis_view.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "selection.h"
 
 #include "i18n.h"
diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 10d791a606..9b7ad99acb 100644
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -33,7 +33,7 @@
 #include "editor.h"
 #include "time_axis_view.h"
 #include "audio_time_axis.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "marker.h"
 #include "streamview.h"
 #include "region_gain_line.h"
@@ -1049,8 +1049,10 @@ Editor::button_release_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemT
 			break;
 
 		case MouseGain:
-			// FIXME
-			assert(dynamic_cast<AudioRegionView*>(clicked_regionview));
+			// Gain only makes sense for audio regions
+			if ( ! dynamic_cast<AudioRegionView*>(clicked_regionview))
+				break;
+
 			switch (item_type) {
 			case RegionItem:
 				dynamic_cast<AudioRegionView*>(clicked_regionview)->add_gain_point_event (item, event);
@@ -2747,12 +2749,9 @@ Editor::start_region_brush_grab (ArdourCanvas::Item* item, GdkEvent* event)
 void
 Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 {
-	/* FIXME: type specific (audio only) */
-
 	double x_delta;
 	double y_delta = 0;
-	AudioRegionView *rv = reinterpret_cast<AudioRegionView*> (drag_info.data); 
-	assert(rv);
+	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
@@ -2796,7 +2795,7 @@ Editor::region_drag_motion_callback (ArdourCanvas::Item* item, GdkEvent* event)
 			
 			/* create a new region with the same name. */
 			
-			// FIXME: ew
+			// 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()));
diff --git a/gtk2_ardour/editor_ops.cc b/gtk2_ardour/editor_ops.cc
index 91409b3429..af366e18d0 100644
--- a/gtk2_ardour/editor_ops.cc
+++ b/gtk2_ardour/editor_ops.cc
@@ -51,7 +51,7 @@
 #include "audio_time_axis.h"
 #include "automation_time_axis.h"
 #include "streamview.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "rgb_macros.h"
 #include "selection_templates.h"
 #include "selection.h"
@@ -2117,20 +2117,14 @@ Editor::audition_selected_region ()
 {
 	if (!selection->regions.empty()) {
 		RegionView* rv = *(selection->regions.begin());
-		// FIXME
-		AudioRegion* const ar = dynamic_cast<AudioRegion*>(&rv->region());
-		assert(ar);
-		session->audition_region (*ar);
+		session->audition_region (rv->region());
 	}
 }
 
 void
 Editor::audition_playlist_region_standalone (Region& region)
 {
-	// FIXME
-	AudioRegion* const ar = dynamic_cast<AudioRegion*>(&region);
-	assert(ar);
-	session->audition_region (*ar);
+	session->audition_region (region);
 }
 
 void
@@ -2195,12 +2189,12 @@ Editor::region_from_selection ()
 			continue;
 		}
 
-		if ((current = dynamic_cast<AudioRegion*> (current_r)) != 0) {
+		current = dynamic_cast<AudioRegion*> (current_r);
+		assert(current); // FIXME
+		if (current != 0) {
 			internal_start = start - current->position();
 			session->region_name (new_name, current->name(), true);
 			region = new AudioRegion (*current, internal_start, selection_cnt, new_name);
-		} else {
-			assert(false); // FIXME
 		}
 	}
 }	
diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index 7863b0c1a1..eb994d06b9 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -54,10 +54,10 @@ Editor::handle_new_route (boost::shared_ptr<Route> route)
 	}
 
 	// FIXME
-	Buffer::Type type = route->default_type();
-	assert(type == Buffer::AUDIO || type == Buffer::MIDI);
+	DataType type = route->default_type();
+	assert(type == ARDOUR::AUDIO || type == ARDOUR::MIDI);
 	
-	if (type == Buffer::AUDIO)
+	if (type == ARDOUR::AUDIO)
 		tv = new AudioTimeAxisView (*this, *session, route, track_canvas);
 	else
 		tv = new MidiTimeAxisView (*this, *session, route, track_canvas);
diff --git a/gtk2_ardour/editor_timefx.cc b/gtk2_ardour/editor_timefx.cc
index 5fbc3d3a3a..79772090f6 100644
--- a/gtk2_ardour/editor_timefx.cc
+++ b/gtk2_ardour/editor_timefx.cc
@@ -28,7 +28,7 @@
 
 #include "editor.h"
 #include "audio_time_axis.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "region_selection.h"
 
 #include <ardour/session.h>
diff --git a/gtk2_ardour/midi_streamview.cc b/gtk2_ardour/midi_streamview.cc
index 9be0c8dfdd..60372e640f 100644
--- a/gtk2_ardour/midi_streamview.cc
+++ b/gtk2_ardour/midi_streamview.cc
@@ -32,7 +32,7 @@
 #include <ardour/source.h>
 
 #include "midi_streamview.h"
-#include "regionview.h"
+#include "region_view.h"
 //#include "midi_regionview.h"
 #include "midi_time_axis.h"
 #include "canvas-simplerect.h"
diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index 543cb8bb10..041eebff10 100644
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -61,7 +61,7 @@
 #include "public_editor.h"
 #include "redirect_automation_line.h"
 #include "redirect_automation_time_axis.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "rgb_macros.h"
 #include "selection.h"
 #include "simplerect.h"
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc
index cd2b2c15ba..8258eb3c00 100644
--- a/gtk2_ardour/mixer_strip.cc
+++ b/gtk2_ardour/mixer_strip.cc
@@ -744,7 +744,7 @@ MixerStrip::fast_update ()
 }
 
 void
-MixerStrip::diskstream_changed (void *src)
+MixerStrip::diskstream_changed ()
 {
 	Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &MixerStrip::update_diskstream_display));
 }	
diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h
index 5460134f5e..2819917568 100644
--- a/gtk2_ardour/mixer_strip.h
+++ b/gtk2_ardour/mixer_strip.h
@@ -177,7 +177,7 @@ class MixerStrip : public RouteUI, public Gtk::EventBox
 	void edit_input_configuration ();
 	void edit_output_configuration ();
 
-	void diskstream_changed (void *src);
+	void diskstream_changed ();
 
 	Gtk::Menu *send_action_menu;
 	void build_send_action_menu ();
diff --git a/gtk2_ardour/region_gain_line.cc b/gtk2_ardour/region_gain_line.cc
index ee966a064f..a542be054e 100644
--- a/gtk2_ardour/region_gain_line.cc
+++ b/gtk2_ardour/region_gain_line.cc
@@ -2,7 +2,7 @@
 #include <ardour/audioregion.h>
 
 #include "region_gain_line.h"
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 #include "utils.h"
 
 #include "time_axis_view.h"
diff --git a/gtk2_ardour/region_selection.cc b/gtk2_ardour/region_selection.cc
index aadedce423..f8c9f384a9 100644
--- a/gtk2_ardour/region_selection.cc
+++ b/gtk2_ardour/region_selection.cc
@@ -20,7 +20,7 @@
 
 #include <ardour/region.h>
 
-#include "regionview.h"
+#include "region_view.h"
 #include "region_selection.h"
 
 using namespace ARDOUR;
diff --git a/gtk2_ardour/regionview.cc b/gtk2_ardour/region_view.cc
index 411117b1af..80d38a3cac 100644
--- a/gtk2_ardour/regionview.cc
+++ b/gtk2_ardour/region_view.cc
@@ -32,7 +32,7 @@
 #include <ardour/audio_diskstream.h>
 
 #include "streamview.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "route_time_axis.h"
 #include "simplerect.h"
 #include "simpleline.h"
diff --git a/gtk2_ardour/regionview.h b/gtk2_ardour/region_view.h
index d2d2c22760..d2d2c22760 100644
--- a/gtk2_ardour/regionview.h
+++ b/gtk2_ardour/region_view.h
diff --git a/gtk2_ardour/route_time_axis.cc b/gtk2_ardour/route_time_axis.cc
index 1eba885b44..cb9883b8e6 100644
--- a/gtk2_ardour/route_time_axis.cc
+++ b/gtk2_ardour/route_time_axis.cc
@@ -65,7 +65,7 @@
 #include "point_selection.h"
 #include "prompter.h"
 #include "public_editor.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "rgb_macros.h"
 #include "selection.h"
 #include "simplerect.h"
@@ -815,7 +815,7 @@ RouteTimeAxisView::speed_changed ()
 }
 
 void
-RouteTimeAxisView::diskstream_changed (void *src)
+RouteTimeAxisView::diskstream_changed ()
 {
 	Gtkmm2ext::UI::instance()->call_slot (mem_fun(*this, &RouteTimeAxisView::update_diskstream_display));
 }	
diff --git a/gtk2_ardour/route_time_axis.h b/gtk2_ardour/route_time_axis.h
index 476a135c39..d673f646a4 100644
--- a/gtk2_ardour/route_time_axis.h
+++ b/gtk2_ardour/route_time_axis.h
@@ -128,7 +128,7 @@ protected:
 	};
 	
 
-	void diskstream_changed (void *src);
+	void diskstream_changed ();
 	void update_diskstream_display ();
 	
 	gint edit_click  (GdkEventButton *);
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 5ba143ad21..f4b602d39c 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -353,7 +353,7 @@ RouteUI::update_mute_display ()
 }
 
 void
-RouteUI::route_rec_enable_changed (void *src)
+RouteUI::route_rec_enable_changed ()
 {
 	Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &RouteUI::update_rec_display));
 }
diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h
index 2cb46eb16d..643c39b960 100644
--- a/gtk2_ardour/route_ui.h
+++ b/gtk2_ardour/route_ui.h
@@ -99,7 +99,7 @@ class RouteUI : public virtual AxisView
 	void solo_changed(void*);
 	void mute_changed(void*);
 	virtual void redirects_changed (void *) {}
-	void route_rec_enable_changed(void*);
+	void route_rec_enable_changed();
 	void session_rec_enable_changed();
 
 	void build_solo_menu (void);
diff --git a/gtk2_ardour/selection.cc b/gtk2_ardour/selection.cc
index dce8d9e1c6..086d878994 100644
--- a/gtk2_ardour/selection.cc
+++ b/gtk2_ardour/selection.cc
@@ -24,7 +24,7 @@
 
 #include <ardour/playlist.h>
 
-#include "regionview.h"
+#include "region_view.h"
 #include "selection.h"
 #include "selection_templates.h"
 #include "time_axis_view.h"
diff --git a/gtk2_ardour/streamview.cc b/gtk2_ardour/streamview.cc
index c94184272e..31452e315b 100644
--- a/gtk2_ardour/streamview.cc
+++ b/gtk2_ardour/streamview.cc
@@ -29,7 +29,7 @@
 #include <ardour/track.h>
 
 #include "streamview.h"
-#include "regionview.h"
+#include "region_view.h"
 #include "route_time_axis.h"
 #include "canvas-waveview.h"
 #include "canvas-simplerect.h"
@@ -260,7 +260,7 @@ StreamView::playlist_state_changed (Change ignored)
 }
 
 void
-StreamView::diskstream_changed (void *src_ignored)
+StreamView::diskstream_changed ()
 {
 	Track *t;
 
@@ -309,7 +309,7 @@ StreamView::region_layered (RegionView* rv)
 }
 
 void
-StreamView::rec_enable_changed (void *src)
+StreamView::rec_enable_changed ()
 {
 	Gtkmm2ext::UI::instance()->call_slot (mem_fun (*this, &StreamView::setup_rec_box));
 }
diff --git a/gtk2_ardour/streamview.h b/gtk2_ardour/streamview.h
index baa779ba67..0bec319758 100644
--- a/gtk2_ardour/streamview.h
+++ b/gtk2_ardour/streamview.h
@@ -101,7 +101,7 @@ protected:
 //private: (FIXME?)
 
 	void         transport_changed();
-	void         rec_enable_changed(void*  src = 0);
+	void         rec_enable_changed();
 	void         sess_rec_enable_changed();
 	virtual void setup_rec_box () = 0;
 	void         update_rec_box ();
@@ -114,7 +114,7 @@ protected:
 	void         display_diskstream (ARDOUR::Diskstream* );
 	virtual void undisplay_diskstream ();
 	virtual void redisplay_diskstream () = 0;
-	void         diskstream_changed (void* );
+	void         diskstream_changed ();
 	
 	void         playlist_state_changed (ARDOUR::Change);
 	virtual void playlist_changed (ARDOUR::Diskstream* );
diff --git a/gtk2_ardour/taperegionview.cc b/gtk2_ardour/tape_region_view.cc
index 19e6ba3ad3..bd5ce8af02 100644
--- a/gtk2_ardour/taperegionview.cc
+++ b/gtk2_ardour/tape_region_view.cc
@@ -30,7 +30,7 @@
 #include <ardour/audiosource.h>
 #include <ardour/audio_diskstream.h>
 
-#include "taperegionview.h"
+#include "tape_region_view.h"
 #include "audio_time_axis.h"
 #include "gui_thread.h"
 
diff --git a/gtk2_ardour/taperegionview.h b/gtk2_ardour/tape_region_view.h
index c16e7a6916..ed3852e3a9 100644
--- a/gtk2_ardour/taperegionview.h
+++ b/gtk2_ardour/tape_region_view.h
@@ -23,7 +23,7 @@
 
 #include <vector>
 
-#include "audio_regionview.h"
+#include "audio_region_view.h"
 
 class TapeAudioRegionView : public AudioRegionView
 {