X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=806359e2ab36f2e7b05935accc919f8d2f054060;hb=ae6dbb836cc1ab1bcbc21883f282361c43f10883;hp=151f3edb72f53b7bd9957abf4d0a28b3cfbdad14;hpb=8048f0309f83a10e35deffa54dbfd2fd742af78a;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index 151f3edb72..806359e2ab 100644
--- a/gtk2_ardour/automation_time_axis.cc
+++ b/gtk2_ardour/automation_time_axis.cc
@@ -18,10 +18,11 @@
 */
 
 #include <utility>
-#include <ardour/route.h>
-#include <ardour/automation_control.h>
-#include <pbd/memento_command.h>
 #include <gtkmm2ext/barcontroller.h>
+#include "pbd/memento_command.h"
+#include "ardour/automation_control.h"
+#include "ardour/event_type_map.h"
+#include "ardour/route.h"
 
 #include "ardour_ui.h"
 #include "automation_time_axis.h"
@@ -39,6 +40,7 @@
 
 #include "i18n.h"
 
+using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 using namespace Gtk;
@@ -68,7 +70,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	  _base_rect (0),
 	  _view (show_regions ? new AutomationStreamView(*this) : NULL),
 	  _name (nom),
-	  clear_button (_("clear")),
 	  auto_button (X_("")) /* force addition of a label */
 {
 	if (!have_name_font) {
@@ -99,25 +100,23 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	
 	_base_rect->set_data ("trackview", this);
 
-	_base_rect->signal_event().connect (bind (mem_fun (_editor, &PublicEditor::canvas_automation_track_event),
-						 _base_rect, this));
+	_base_rect->signal_event().connect (bind (
+			mem_fun (_editor, &PublicEditor::canvas_automation_track_event),
+			_base_rect, this));
 
-	_base_rect->lower_to_bottom();
+	// _base_rect->lower_to_bottom();
 
 	hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
 
 	auto_button.set_name ("TrackVisualButton");
-	clear_button.set_name ("TrackVisualButton");
 	hide_button.set_name ("TrackRemoveButton");
 
 	auto_button.unset_flags (Gtk::CAN_FOCUS);
-	clear_button.unset_flags (Gtk::CAN_FOCUS);
 	hide_button.unset_flags (Gtk::CAN_FOCUS);
 
 	controls_table.set_no_show_all();
 
 	ARDOUR_UI::instance()->tooltips().set_tip(auto_button, _("automation state"));
-	ARDOUR_UI::instance()->tooltips().set_tip(clear_button, _("clear track"));
 	ARDOUR_UI::instance()->tooltips().set_tip(hide_button, _("hide track"));
 
 	/* rearrange the name display */
@@ -178,14 +177,12 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 
 	controls_table.attach (auto_button, 5, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-	controls_table.attach (clear_button, 5, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 	
 	/* add bar controller */
-	controls_table.attach (*_controller.get(), 0, 8, 2, 3, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+	controls_table.attach (*_controller.get(), 0, 8, 1, 2, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
 
 	controls_table.show_all ();
 
-	clear_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::clear_clicked));
 	hide_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::hide_clicked));
 	auto_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::auto_clicked));
 
@@ -193,8 +190,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	controls_base_unselected_name = X_("AutomationTrackControlsBase");
 	controls_ebox.set_name (controls_base_unselected_name);
 
-	controls_frame.set_shadow_type (Gtk::SHADOW_ETCHED_OUT);
-
 	XMLNode* xml_node = get_parent_with_state()->get_automation_child_xml_node (
 			_control->parameter());
 
@@ -210,7 +205,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	
 	/* no regions, just a single line for the entire track (e.g. bus gain) */
 	} else {
-	
 		boost::shared_ptr<AutomationLine> line(new AutomationLine (
 					ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter()),
 					*this,
@@ -259,15 +253,20 @@ void
 AutomationTimeAxisView::set_automation_state (AutoState state)
 {
 	if (!ignore_state_request) {
+		_automatable->set_parameter_automation_state (_control->parameter(), state);
+#if 0
 		if (_route == _automatable) { // This is a time axis for route (not region) automation
 			_route->set_parameter_automation_state (_control->parameter(), state);
 		}
 
 		if (_control->list())
 			_control->alist()->set_automation_state(state);
+#endif
 	}
-	if (_view)
+
+	if (_view) {
 		_view->set_automation_state (state);
+	}
 }
 
 void
@@ -378,10 +377,8 @@ AutomationTimeAxisView::set_height (uint32_t h)
 {
 	bool changed = (height != (uint32_t) h) || first_call_to_set_height;
 	bool changed_between_small_and_normal = ( 
-		(height < hNormal && h >= hNormal) || 
-		(height >= hNormal || 
-		h < hNormal)
-	);
+		   (height < hNormal && h >= hNormal)
+		|| (height >= hNormal || h < hNormal) );
 
 	TimeAxisView* state_parent = get_parent_with_state ();
 	assert(state_parent);
@@ -427,7 +424,6 @@ AutomationTimeAxisView::set_height (uint32_t h)
 			name_hbox.show_all ();
 			
 			auto_button.show();
-			clear_button.show();
 			hide_button.show_all();
 
 		} else if (h >= hSmall) {
@@ -445,7 +441,6 @@ AutomationTimeAxisView::set_height (uint32_t h)
 			name_hbox.show_all ();
 			
 			auto_button.hide();
-			clear_button.hide();
 			hide_button.hide();
 		}
 	} else if (h >= hNormal){
@@ -512,20 +507,24 @@ AutomationTimeAxisView::build_display_menu ()
 	auto_state_menu->set_name ("ArdourContextMenu");
 	MenuList& as_items = auto_state_menu->items();
 	
-	as_items.push_back (CheckMenuElem (_("Manual"), 
-					   bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Off)));
+	as_items.push_back (CheckMenuElem (_("Manual"), bind (
+			mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
+			(AutoState) Off)));
 	auto_off_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
-	as_items.push_back (CheckMenuElem (_("Play"),
-					   bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Play)));
+	as_items.push_back (CheckMenuElem (_("Play"), bind (
+			mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
+			(AutoState) Play)));
 	auto_play_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
-	as_items.push_back (CheckMenuElem (_("Write"),
-					   bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Write)));
+	as_items.push_back (CheckMenuElem (_("Write"), bind (
+			mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
+			(AutoState) Write)));
 	auto_write_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
-	as_items.push_back (CheckMenuElem (_("Touch"),
-					   bind (mem_fun(*this, &AutomationTimeAxisView::set_automation_state), (AutoState) Touch)));
+	as_items.push_back (CheckMenuElem (_("Touch"), bind (
+			mem_fun(*this, &AutomationTimeAxisView::set_automation_state),
+			(AutoState) Touch)));
 	auto_touch_item = dynamic_cast<CheckMenuItem*>(&as_items.back());
 
 	items.push_back (MenuElem (_("State"), *auto_state_menu));
@@ -565,7 +564,7 @@ AutomationTimeAxisView::build_display_menu ()
 }
 
 void
-AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, nframes_t when, double y)
+AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* /*item*/, GdkEvent* /*event*/, nframes_t when, double y)
 {
 	if (!_line)
 		return;
@@ -580,7 +579,7 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent
 
 	/* map using line */
 
-	_line->view_to_model_y (y);
+	_line->view_to_model_coord (x, y);
 
 	_session.begin_reversible_command (_("add automation event"));
 	XMLNode& before = _control->alist()->get_state();
@@ -633,9 +632,11 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
 
 	if (what_we_got) {
 		for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) {
-			double foo = (*x)->value;
-			line.model_to_view_y (foo);
-			(*x)->value = foo;
+			double when = (*x)->when;
+			double val  = (*x)->value;
+			line.model_to_view_coord (when, val);
+			(*x)->when = when;
+			(*x)->value = val;
 		}
 	}
 
@@ -713,9 +714,11 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 
 	if (what_we_got) {
 		for (AutomationList::iterator x = what_we_got->begin(); x != what_we_got->end(); ++x) {
-			double foo = (*x)->value;
-			line.model_to_view_y (foo);
-			(*x)->value = foo;
+			double when = (*x)->when;
+			double val  = (*x)->value;
+			line.model_to_view_coord (when, val);
+			(*x)->when = when;
+			(*x)->value = val;
 		}
 	}
 
@@ -734,7 +737,7 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti
 	AutomationSelection::iterator p;
 	boost::shared_ptr<AutomationList> alist(line.the_list());
 	
-	for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth);
+	for (p = selection.lines.begin(); p != selection.lines.end() && nth; ++p, --nth) {}
 
 	if (p == selection.lines.end()) {
 		return false;
@@ -748,9 +751,11 @@ AutomationTimeAxisView::paste_one (AutomationLine& line, nframes_t pos, float ti
 	AutomationList copy (**p);
 
 	for (AutomationList::iterator x = copy.begin(); x != copy.end(); ++x) {
-		double foo = (*x)->value;
-		line.view_to_model_y (foo);
-		(*x)->value = foo;
+		double when = (*x)->when;
+		double val  = (*x)->value;
+		line.view_to_model_coord (when, val);
+		(*x)->when = when;
+		(*x)->value = val;
 	}
 
 	XMLNode &before = alist->get_state();
@@ -851,17 +856,6 @@ AutomationTimeAxisView::exited ()
 		_line->track_exited();
 }
 
-/*void
-AutomationTimeAxisView::set_colors ()
-{
-    for (list<GhostRegion*>::iterator i=ghosts.begin(); i != ghosts.end(); i++ ) {
-		(*i)->set_colors();
-    }
-    
-	if (_line)
-		_line->set_colors();
-		}*/
-
 void
 AutomationTimeAxisView::color_handler () 
 {