modified patch from lincoln to show/control rec-enable status in track/bus list

git-svn-id: svn://localhost/ardour2/branches/3.0@5216 d708f5d6-7413-0410-9779-e7cbd77b26cf

6 files changed, 83 insertions, 6 deletions

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 8df8881cae..7f2d502d95 100644
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -48,6 +48,7 @@
 #include <gtkmm2ext/utils.h>
 #include <gtkmm2ext/window_title.h>
 #include <gtkmm2ext/choice.h>
+#include <gtkmm2ext/cell_renderer_pixbuf_toggle.h>
 
 #include "ardour/audio_diskstream.h"
 #include "ardour/audio_track.h"
@@ -523,20 +524,38 @@ Editor::Editor ()
 	bottom_hbox.set_border_width (2);
 	bottom_hbox.set_spacing (3);
 
+
+	CellRendererPixbufToggle* rec_col_renderer = Gtk::manage( new CellRendererPixbufToggle() );
+
+	rec_col_renderer->set_active_pixbuf(::get_icon("record_normal_red"));
+	rec_col_renderer->set_inactive_pixbuf(::get_icon("record_disabled_grey"));
+
+	rec_col_renderer->signal_toggled().connect(mem_fun(*this, &Editor::on_tv_rec_enable_toggled));
+
+	Gtk::TreeViewColumn* rec_state_column = Gtk::manage(new Gtk::TreeViewColumn("Rec", *rec_col_renderer));
+	rec_state_column->add_attribute(rec_col_renderer->property_active(), route_display_columns.rec_enabled);
+	rec_state_column->add_attribute(rec_col_renderer->property_visible(), route_display_columns.is_track);
+
 	route_display_model = ListStore::create(route_display_columns);
 	route_list_display.set_model (route_display_model);
+	
+	route_list_display.append_column (*rec_state_column);
 	route_list_display.append_column (_("Show"), route_display_columns.visible);
 	route_list_display.append_column (_("Name"), route_display_columns.text);
+	
 	route_list_display.get_column (0)->set_data (X_("colnum"), GUINT_TO_POINTER(0));
 	route_list_display.get_column (1)->set_data (X_("colnum"), GUINT_TO_POINTER(1));
+	route_list_display.get_column (2)->set_data (X_("colnum"), GUINT_TO_POINTER(2));
+	
 	route_list_display.set_headers_visible (true);
 	route_list_display.set_name ("TrackListDisplay");
-	route_list_display.get_selection()->set_mode (SELECTION_SINGLE);
+	route_list_display.get_selection()->set_mode (SELECTION_NONE);
 	route_list_display.set_reorderable (true);
 	route_list_display.set_size_request (100,-1);
 	route_list_display.add_object_drag (route_display_columns.route.index(), "routes");
 
-	CellRendererToggle* route_list_visible_cell = dynamic_cast<CellRendererToggle*>(route_list_display.get_column_cell_renderer (0));
+	CellRendererToggle* route_list_visible_cell = dynamic_cast<CellRendererToggle*>(route_list_display.get_column_cell_renderer (1));
+	
 	route_list_visible_cell->property_activatable() = true;
 	route_list_visible_cell->property_radio() = false;
 
@@ -871,6 +890,21 @@ Editor::~Editor()
 	delete _drag;
 }
 
+void 
+Editor::on_tv_rec_enable_toggled(const Glib::ustring& path_string){
+
+	// Get the model row that has been toggled.
+	Gtk::TreeModel::Row row = *route_display_model->get_iter(Gtk::TreeModel::Path(path_string));
+
+	TimeAxisView *tv = row[route_display_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());
+	}
+}
+
+
 void
 Editor::add_toplevel_controls (Container& cont)
 {
diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h
index a1b173fe40..81f8eab5aa 100644
--- a/gtk2_ardour/editor.h
+++ b/gtk2_ardour/editor.h
@@ -399,6 +399,8 @@ class Editor : public PublicEditor
 	void goto_visual_state (uint32_t);
 	void save_visual_state (uint32_t);
 
+	void update_rec_display ();
+
   protected:
 	void map_transport_state ();
 	void map_position_change (nframes64_t);
@@ -1761,22 +1763,30 @@ public:
 	void reposition_zoom_rect (nframes64_t start, nframes64_t end);
 	
 	/* diskstream/route display management */
+	Glib::RefPtr<Gdk::Pixbuf> rec_enabled_icon;
+	Glib::RefPtr<Gdk::Pixbuf> rec_disabled_icon;
 
 	struct RouteDisplayModelColumns : public Gtk::TreeModel::ColumnRecord {
 	    RouteDisplayModelColumns() { 
 		    add (text);
 		    add (visible);
+		    add (rec_enabled);
 		    add (temporary_visible);
+		    add (is_track);
 		    add (tv);
 		    add (route);
 	    }
 	    Gtk::TreeModelColumn<Glib::ustring>  text;
 	    Gtk::TreeModelColumn<bool>           visible;
+	    Gtk::TreeModelColumn<bool>           rec_enabled;
 	    Gtk::TreeModelColumn<bool>           temporary_visible;
+	    Gtk::TreeModelColumn<bool>           is_track;
 	    Gtk::TreeModelColumn<TimeAxisView*>  tv;
 	    Gtk::TreeModelColumn<boost::shared_ptr<ARDOUR::Route> >  route;
 	};
 
+	void on_tv_rec_enable_toggled(const Glib::ustring& path_string);
+
 	RouteDisplayModelColumns         route_display_columns;
 	Glib::RefPtr<Gtk::ListStore>     route_display_model;
 	Glib::RefPtr<Gtk::TreeSelection> route_display_selection;
diff --git a/gtk2_ardour/editor_route_list.cc b/gtk2_ardour/editor_route_list.cc
index ae1688b1bc..56cc3f5cf1 100644
--- a/gtk2_ardour/editor_route_list.cc
+++ b/gtk2_ardour/editor_route_list.cc
@@ -32,6 +32,7 @@
 #include "mixer_strip.h"
 #include "gui_thread.h"
 #include "actions.h"
+#include "utils.h"
 
 #include "pbd/unknown_type.h"
 
@@ -114,6 +115,7 @@ Editor::handle_new_route (RouteList& routes)
 		row[route_display_columns.visible] = tv->marked_for_display();
 		row[route_display_columns.tv] = tv;
 		row[route_display_columns.route] = route;
+		row[route_display_columns.is_track] = (boost::dynamic_pointer_cast<Track>(route) != 0);
 
 		track_views.push_back (tv);
 		
@@ -381,9 +383,8 @@ Editor::redisplay_route_list ()
 			tv->set_marked_for_display (false);
 			tv->hide ();
 		}
-
-		n++;
 		
+		n++;
 	}
 
 	/* whenever we go idle, update the track view list to reflect the new order.
@@ -395,6 +396,7 @@ Editor::redisplay_route_list ()
 	
 	full_canvas_height = position + canvas_timebars_vsize;
 	vertical_adjustment.set_upper (full_canvas_height);
+
 	if ((vertical_adjustment.get_value() + _canvas_height) > vertical_adjustment.get_upper()) {
 		/* 
 		   We're increasing the size of the canvas while the bottom is visible.
@@ -595,7 +597,11 @@ Editor::route_list_display_button_press (GdkEventButton* ev)
 	}
 
 	switch (GPOINTER_TO_UINT (column->get_data (X_("colnum")))) {
+
 	case 0:
+		/* allow normal processing to occur */
+		return false;
+	case 1:
 		if ((iter = route_display_model->get_iter (path))) {
 			TimeAxisView* tv = (*iter)[route_display_columns.tv];
 			if (tv) {
@@ -605,7 +611,7 @@ Editor::route_list_display_button_press (GdkEventButton* ev)
 		}
 		return true;
 
-	case 1:
+	case 2:
 		/* allow normal processing to occur */
 		return false;
 
@@ -688,6 +694,7 @@ Editor::route_list_delete (const Gtk::TreeModel::Path& path)
 	ignore_route_list_reorder = false;
 }
 
+
 void  
 Editor::route_list_display_drag_data_received (const RefPtr<Gdk::DragContext>& context,
 						int x, int y, 
@@ -836,3 +843,23 @@ Editor::move_selected_tracks (bool up)
 
 	session->sync_order_keys (_order_key);
 }
+
+void
+Editor::update_rec_display ()
+{
+	TreeModel::Children rows = route_display_model->children();
+	TreeModel::Children::iterator i;
+	
+	for (i = rows.begin(); i != rows.end(); ++i) {
+		boost::shared_ptr<Route> route = (*i)[route_display_columns.route];
+
+		if (boost::dynamic_pointer_cast<Track>(route)) {
+
+			if (route->record_enabled()){
+				(*i)[route_display_columns.rec_enabled] = true;
+			} else {
+				(*i)[route_display_columns.rec_enabled] = false;
+			}
+		} 
+	}
+}
diff --git a/gtk2_ardour/icons/record_disabled_grey.png b/gtk2_ardour/icons/record_disabled_grey.png
new file mode 100644
index 0000000000..bb3f4c9c70
--- /dev/null
+++ b/gtk2_ardour/icons/record_disabled_grey.png
diff --git a/gtk2_ardour/public_editor.h b/gtk2_ardour/public_editor.h
index ed73f59258..dbb845274c 100644
--- a/gtk2_ardour/public_editor.h
+++ b/gtk2_ardour/public_editor.h
@@ -322,6 +322,8 @@ class PublicEditor : public Gtk::Window, public PBD::StatefulThingWithGoingAway
 	virtual bool canvas_markerview_end_handle_event(GdkEvent* event, ArdourCanvas::Item*,MarkerView*) = 0;
 #endif
 
+	virtual void update_rec_display () = 0;
+
 	static const int window_border_width;
 	static const int container_border_width;
 	static const int vertical_spacing;
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc
index 6c56ab132c..8829967ac8 100644
--- a/gtk2_ardour/route_ui.cc
+++ b/gtk2_ardour/route_ui.cc
@@ -32,6 +32,7 @@
 #include "pbd/controllable.h"
 
 #include "ardour_ui.h"
+#include "editor.h"
 #include "route_ui.h"
 #include "keyboard.h"
 #include "utils.h"
@@ -201,6 +202,7 @@ RouteUI::set_route (boost::shared_ptr<Route> rp)
 		boost::shared_ptr<Track> t = boost::dynamic_pointer_cast<Track>(_route);
 
 		connections.push_back (t->diskstream()->RecordEnableChanged.connect (mem_fun (*this, &RouteUI::route_rec_enable_changed)));
+		connections.push_back (t->diskstream()->RecordEnableChanged.connect (mem_fun (PublicEditor::instance(), &PublicEditor::update_rec_display)));
 		connections.push_back (_session.RecordStateChanged.connect (mem_fun (*this, &RouteUI::session_rec_enable_changed)));
 
 		rec_enable_button->show();
@@ -501,7 +503,6 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
 			set_mix_group_rec_enable (_route, !_route->record_enabled());
 
 		} else {
-
 			reversibly_apply_track_boolean ("rec-enable change", &Track::set_record_enable, !track()->record_enabled(), this);
 			check_rec_enable_sensitivity ();
 		}
@@ -715,6 +716,9 @@ RouteUI::update_rec_display ()
 		rec_enable_button->set_active (model);
 		ignore_toggle = false;
 	}
+	else {
+		return;
+	}
 	
 	/* now make sure its color state is correct */