X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Feditor_routes.cc;h=4b6ca10b7249249acce31c5b9849f3f16e61203e;hb=ce3ca76f96eb97f6d52fe065e6a2800efcbbc0cd;hp=e3f3c9d736ad0c1712ee48603083b0624a4d6a66;hpb=4297071b3f7360b17d81ef9cf36b8d75d46d2818;p=ardour.git

diff --git a/gtk2_ardour/editor_routes.cc b/gtk2_ardour/editor_routes.cc
index e3f3c9d736..4b6ca10b72 100644
--- a/gtk2_ardour/editor_routes.cc
+++ b/gtk2_ardour/editor_routes.cc
@@ -122,11 +122,11 @@ EditorRoutes::on_tv_rec_enable_toggled (Glib::ustring const & path_string)
 	// Get the model row that has been toggled.
 	Gtk::TreeModel::Row row = *_model->get_iter (Gtk::TreeModel::Path (path_string));
 
-	TimeAxisViewPtr tv = row[_columns.tv];
-	AudioTimeAxisViewPtr atv = boost::dynamic_pointer_cast<AudioTimeAxisView> (tv);
+	TimeAxisView *tv = row[_columns.tv];
+	AudioTimeAxisView *atv = dynamic_cast<AudioTimeAxisView*> (tv);
 
 	if (atv != 0 && atv->is_audio_track()){
-	      atv->get_diskstream()->set_record_enabled(!atv->get_diskstream()->record_enabled());
+		atv->reversibly_apply_track_boolean ("rec-enable change", &Track::set_record_enable, !atv->track()->record_enabled(), this);
 	}
 }
 
@@ -173,7 +173,7 @@ EditorRoutes::redisplay ()
 	}
 
 	for (n = 0, position = 0, i = rows.begin(); i != rows.end(); ++i) {
-		TimeAxisViewPtr tv = (*i)[_columns.tv];
+		TimeAxisView *tv = (*i)[_columns.tv];
 		boost::shared_ptr<Route> route = (*i)[_columns.route];
 
 		if (tv == 0) {
@@ -192,7 +192,7 @@ EditorRoutes::redisplay ()
 
 		bool visible = (*i)[_columns.visible];
 
-		/* show or hide the TimeAxisViewPtr */
+		/* show or hide the TimeAxisView */
 		if (visible) {
 			tv->set_marked_for_display (true);
 			position += tv->show_at (position, n, &_editor->edit_controls_vbox);
@@ -229,7 +229,7 @@ EditorRoutes::redisplay ()
 }
 
 void
-EditorRoutes::route_deleted (Gtk::TreeModel::Path const & path)
+EditorRoutes::route_deleted (Gtk::TreeModel::Path const &)
 {
 	/* this could require an order reset & sync */
 	_session->set_remote_control_ids();
@@ -240,7 +240,7 @@ EditorRoutes::route_deleted (Gtk::TreeModel::Path const & path)
 
 
 void
-EditorRoutes::changed (Gtk::TreeModel::Path const & path, Gtk::TreeModel::iterator const & iter)
+EditorRoutes::changed (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const &)
 {
 	/* never reset order keys because of a property change */
 	_redisplay_does_not_reset_order_keys = true;
@@ -250,14 +250,14 @@ EditorRoutes::changed (Gtk::TreeModel::Path const & path, Gtk::TreeModel::iterat
 }
 
 void
-EditorRoutes::routes_added (list<RouteTimeAxisViewPtr> routes)
+EditorRoutes::routes_added (list<RouteTimeAxisView*> routes)
 {
 	TreeModel::Row row;
 
 	_redisplay_does_not_sync_order_keys = true;
 	suspend_redisplay ();
 
-	for (list<RouteTimeAxisViewPtr>::iterator x = routes.begin(); x != routes.end(); ++x) {
+	for (list<RouteTimeAxisView*>::iterator x = routes.begin(); x != routes.end(); ++x) {
 
 		row = *(_model->append ());
 
@@ -310,7 +310,7 @@ EditorRoutes::handle_gui_changes (string const & what, void *src)
 }
 
 void
-EditorRoutes::route_removed (TimeAxisViewPtr tv)
+EditorRoutes::route_removed (TimeAxisView *tv)
 {
 	ENSURE_GUI_THREAD (bind (mem_fun(*this, &EditorRoutes::route_removed), tv));
 
@@ -324,8 +324,7 @@ EditorRoutes::route_removed (TimeAxisViewPtr tv)
 	_redisplay_does_not_sync_order_keys = true;
 
 	for (ri = rows.begin(); ri != rows.end(); ++ri) {
-		TimeAxisViewPtr t = (*ri)[_columns.tv];
-		if (t == tv) {
+		if ((*ri)[_columns.tv] == tv) {
 			_model->erase (ri);
 			break;
 		}
@@ -365,7 +364,7 @@ EditorRoutes::update_visibility ()
 	suspend_redisplay ();
 
 	for (i = rows.begin(); i != rows.end(); ++i) {
-		TimeAxisViewPtr tv = (*i)[_columns.tv];
+		TimeAxisView *tv = (*i)[_columns.tv];
 		(*i)[_columns.visible] = tv->marked_for_display ();
 		cerr << "marked " << tv->name() << " for display = " << tv->marked_for_display() << endl;
 	}
@@ -374,14 +373,13 @@ EditorRoutes::update_visibility ()
 }
 
 void
-EditorRoutes::hide_track_in_display (TimeAxisViewPtr tv)
+EditorRoutes::hide_track_in_display (TimeAxisView& tv)
 {
 	TreeModel::Children rows = _model->children();
 	TreeModel::Children::iterator i;
 
 	for (i = rows.begin(); i != rows.end(); ++i) {
-		TimeAxisViewPtr t = (*i)[_columns.tv];
-		if (t == tv) { 
+		if ((*i)[_columns.tv] == &tv) { 
 			(*i)[_columns.visible] = false;
 			break;
 		}
@@ -389,14 +387,13 @@ EditorRoutes::hide_track_in_display (TimeAxisViewPtr tv)
 }
 
 void
-EditorRoutes::show_track_in_display (TimeAxisViewPtr tv)
+EditorRoutes::show_track_in_display (TimeAxisView& tv)
 {
 	TreeModel::Children rows = _model->children();
 	TreeModel::Children::iterator i;
 	
 	for (i = rows.begin(); i != rows.end(); ++i) {
-		TimeAxisViewPtr t = (*i)[_columns.tv];
-		if (t == tv) { 
+		if ((*i)[_columns.tv] == &tv) { 
 			(*i)[_columns.visible] = true;
 			break;
 		}
@@ -404,7 +401,7 @@ EditorRoutes::show_track_in_display (TimeAxisViewPtr tv)
 }
 
 void
-EditorRoutes::reordered (TreeModel::Path const & path, TreeModel::iterator const & iter, int* what)
+EditorRoutes::reordered (TreeModel::Path const &, TreeModel::iterator const &, int* /*what*/)
 {
 	redisplay ();
 }
@@ -419,7 +416,7 @@ EditorRoutes::sync_order_keys (string const & src)
 	TreeModel::Children rows = _model->children();
 	TreeModel::Children::iterator ri;
 
-	if (src != N_ ("editor") || !_session || (_session->state_of_the_state() & Session::Loading) || rows.empty()) {
+	if (src == N_ ("editor") || !_session || (_session->state_of_the_state() & Session::Loading) || rows.empty()) {
 		return;
 	}
 
@@ -452,7 +449,7 @@ EditorRoutes::sync_order_keys (string const & src)
 
 
 void
-EditorRoutes::hide_all_tracks (bool with_select)
+EditorRoutes::hide_all_tracks (bool /*with_select*/)
 {
 	TreeModel::Children rows = _model->children();
 	TreeModel::Children::iterator i;
@@ -462,7 +459,7 @@ EditorRoutes::hide_all_tracks (bool with_select)
 	for (i = rows.begin(); i != rows.end(); ++i) {
 		
 		TreeModel::Row row = (*i);
-		TimeAxisViewPtr tv = row[_columns.tv];
+		TimeAxisView *tv = row[_columns.tv];
 
 		if (tv == 0) {
 			continue;
@@ -491,7 +488,7 @@ EditorRoutes::set_all_tracks_visibility (bool yn)
 	for (i = rows.begin(); i != rows.end(); ++i) {
 
 		TreeModel::Row row = (*i);
-		TimeAxisViewPtr tv = row[_columns.tv];
+		TimeAxisView* tv = row[_columns.tv];
 
 		if (tv == 0) {
 			continue;
@@ -513,14 +510,14 @@ EditorRoutes::set_all_audio_visibility (int tracks, bool yn)
 
 	for (i = rows.begin(); i != rows.end(); ++i) {
 		TreeModel::Row row = (*i);
-		TimeAxisViewPtr tv = row[_columns.tv];
-		AudioTimeAxisViewPtr atv;
+		TimeAxisView* tv = row[_columns.tv];
+		AudioTimeAxisView* atv;
 
 		if (tv == 0) {
 			continue;
 		}
 
-		if ((atv = boost::dynamic_pointer_cast<AudioTimeAxisView>(tv)) != 0) {
+		if ((atv = dynamic_cast<AudioTimeAxisView*>(tv)) != 0) {
 			switch (tracks) {
 			case 0:
 				(*i)[_columns.visible] = yn;
@@ -603,7 +600,7 @@ EditorRoutes::button_press (GdkEventButton* ev)
 		return false;
 	case 1:
 		if ((iter = _model->get_iter (path))) {
-			TimeAxisViewPtr tv = (*iter)[_columns.tv];
+			TimeAxisView* tv = (*iter)[_columns.tv];
 			if (tv) {
 				bool visible = (*iter)[_columns.visible];
 				(*iter)[_columns.visible] = !visible;
@@ -659,10 +656,10 @@ EditorRoutes::initial_display ()
 		_no_redisplay = true;
 		
 		for (i = rows.begin(); i != rows.end(); ++i) {
-			TimeAxisViewPtr tv =  (*i)[_columns.tv];
-			RouteTimeAxisViewPtr rtv;
+			TimeAxisView *tv =  (*i)[_columns.tv];
+			RouteTimeAxisView *rtv;
 			
-			if ((rtv = boost::dynamic_pointer_cast<RouteTimeAxisView>(tv)) != 0) {
+			if ((rtv = dynamic_cast<RouteTimeAxisView*>(tv)) != 0) {
 				if (rtv->route()->is_master()) {
 					_display.get_selection()->unselect (i);
 				}
@@ -677,7 +674,7 @@ EditorRoutes::initial_display ()
 }
 
 void
-EditorRoutes::track_list_reorder (Gtk::TreeModel::Path const & path, Gtk::TreeModel::iterator const & iter, int* new_order)
+EditorRoutes::track_list_reorder (Gtk::TreeModel::Path const &, Gtk::TreeModel::iterator const &, int* /*new_order*/)
 {
 	_redisplay_does_not_sync_order_keys = true;
 	_session->set_remote_control_ids();
@@ -706,14 +703,14 @@ EditorRoutes::move_selected_tracks (bool up)
 		return;
 	}
 
-	typedef std::pair<TimeAxisViewPtr,boost::shared_ptr<Route> > ViewRoute;
+	typedef std::pair<TimeAxisView*,boost::shared_ptr<Route> > ViewRoute;
 	std::list<ViewRoute> view_routes;
 	std::vector<int> neworder;
 	TreeModel::Children rows = _model->children();
 	TreeModel::Children::iterator ri;
 
 	for (ri = rows.begin(); ri != rows.end(); ++ri) {
-		TimeAxisViewPtr tv = (*ri)[_columns.tv];
+		TimeAxisView* tv = (*ri)[_columns.tv];
 		boost::shared_ptr<Route> route = (*ri)[_columns.route];
 
 		view_routes.push_back (ViewRoute (tv, route));
@@ -831,10 +828,10 @@ EditorRoutes::update_rec_display ()
 	}
 }
 
-list<TimeAxisViewPtr>
+list<TimeAxisView*>
 EditorRoutes::views () const
 {
-	list<TimeAxisViewPtr> v;
+	list<TimeAxisView*> v;
 	for (TreeModel::Children::iterator i = _model->children().begin(); i != _model->children().end(); ++i) {
 		v.push_back ((*i)[_columns.tv]);
 	}