X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Fautomation_time_axis.cc;h=78faf66944652dde94376979067c903a0269f686;hb=73a6b8ef25bb90ad6c66b25b17da5962a38291d2;hp=acb0921b7f8c00c6b8a817abb0122ce5071b9708;hpb=b5ec66ae6cb60fa43c343d3d29340b2370d0b9d1;p=ardour.git

diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc
index acb0921b7f..78faf66944 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;
@@ -49,6 +51,7 @@ Pango::FontDescription* AutomationTimeAxisView::name_font = 0;
 bool AutomationTimeAxisView::have_name_font = false;
 const string AutomationTimeAxisView::state_node_name = "AutomationChild";
 
+
 /** \a a the automatable object this time axis is to display data for.
  * For route/track automation (e.g. gain) pass the route for both \r and \a.
  * For route child (e.g. plugin) automation, pass the child for \a.
@@ -67,8 +70,6 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	  _base_rect (0),
 	  _view (show_regions ? new AutomationStreamView(*this) : NULL),
 	  _name (nom),
-	  height_button (_("h")),
-	  clear_button (_("clear")),
 	  auto_button (X_("")) /* force addition of a label */
 {
 	if (!have_name_font) {
@@ -87,10 +88,10 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	ignore_state_request = false;
 	first_call_to_set_height = true;
 	
-	_base_rect = new SimpleRect(*canvas_display);
+	_base_rect = new SimpleRect(*_canvas_display);
 	_base_rect->property_x1() = 0.0;
 	_base_rect->property_y1() = 0.0;
-	_base_rect->property_x2() = editor.frame_to_pixel (max_frames);
+	_base_rect->property_x2() = LONG_MAX - 2;
 	_base_rect->property_outline_color_rgba() = ARDOUR_UI::config()->canvasvar_AutomationTrackOutline.get();
 	
 	/* outline ends and bottom */
@@ -99,23 +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();
 
 	hide_button.add (*(manage (new Gtk::Image (::get_icon("hide")))));
 
-	height_button.set_name ("TrackSizeButton");
 	auto_button.set_name ("TrackVisualButton");
-	clear_button.set_name ("TrackVisualButton");
 	hide_button.set_name ("TrackRemoveButton");
 
+	auto_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(height_button, _("track height"));
 	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 */
@@ -174,18 +175,14 @@ AutomationTimeAxisView::AutomationTimeAxisView (Session& s, boost::shared_ptr<Ro
 	
 	/* add the buttons */
 	controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
-	controls_table.attach (height_button, 0, 1, 1, 2, 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 ();
 
-	height_button.signal_clicked().connect (mem_fun(*this, &AutomationTimeAxisView::height_clicked));
-	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));
 
@@ -210,11 +207,10 @@ 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,
-					*canvas_display,
+					*_canvas_display,
 					_control->alist()));
 
 		line->set_line_color (ARDOUR_UI::config()->canvasvar_ProcessorAutomationLine.get());
@@ -349,30 +345,27 @@ AutomationTimeAxisView::interpolation_changed ()
 		}
 	}
 	
-	if (_line)
+	if (_line) {
 		_line->set_interpolation(style);
+	}
 }
 
 void
 AutomationTimeAxisView::set_interpolation (AutomationList::InterpolationStyle style)
 {
 	_control->list()->set_interpolation(style);
-	if (_line)
+	if (_line) {
 		_line->set_interpolation(style);
-}
-
-void
-AutomationTimeAxisView::height_clicked ()
-{
-	popup_size_menu (0);
+	}
 }
 
 void
 AutomationTimeAxisView::clear_clicked ()
 {
 	_session.begin_reversible_command (_("clear automation"));
-	if (_line)
+	if (_line) {
 		_line->clear ();
+	}
 	_session.commit_reversible_command ();
 }
 
@@ -380,10 +373,11 @@ void
 AutomationTimeAxisView::set_height (uint32_t h)
 {
 	bool changed = (height != (uint32_t) h) || first_call_to_set_height;
-	bool changed_between_small_and_normal = ( (h == hSmall || h == hSmaller) ^ (height == hSmall || height == hSmaller) );
+	bool changed_between_small_and_normal = ( 
+		   (height < hNormal && h >= hNormal)
+		|| (height >= hNormal || h < hNormal) );
 
 	TimeAxisView* state_parent = get_parent_with_state ();
-
 	assert(state_parent);
 	XMLNode* xml_node = state_parent->get_automation_child_xml_node (_control->parameter());
 
@@ -400,7 +394,9 @@ AutomationTimeAxisView::set_height (uint32_t h)
 
 	char buf[32];
 	snprintf (buf, sizeof (buf), "%u", height);
-	xml_node->add_property ("height", buf);
+	if (xml_node) {
+		xml_node->add_property ("height", buf);
+	}
 
 	if (changed_between_small_and_normal || first_call_to_set_height) {
 
@@ -425,8 +421,6 @@ AutomationTimeAxisView::set_height (uint32_t h)
 			name_hbox.show_all ();
 			
 			auto_button.show();
-			height_button.show();
-			clear_button.show();
 			hide_button.show_all();
 
 		} else if (h >= hSmall) {
@@ -444,15 +438,10 @@ AutomationTimeAxisView::set_height (uint32_t h)
 			name_hbox.show_all ();
 			
 			auto_button.hide();
-			height_button.hide();
-			clear_button.hide();
 			hide_button.hide();
 		}
-	} else  if (h >= hNormal){
-			auto_button.show();
-			height_button.show();
-			clear_button.show();
-			hide_button.show_all();
+	} else if (h >= hNormal){
+		cerr << "track grown, but neither changed_between_small_and_normal nor first_call_to_set_height set!" << endl;
 	}
 
 	if (changed) {
@@ -515,44 +504,52 @@ 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));
 	
 	/* mode menu */
-	
-	if (_control->parameter().type() == MidiCCAutomation) {
+
+	if ( EventTypeMap::instance().is_midi_parameter(_control->parameter()) ) {
+		
 		Menu* auto_mode_menu = manage (new Menu);
 		auto_mode_menu->set_name ("ArdourContextMenu");
 		MenuList& am_items = auto_mode_menu->items();
 	
 		RadioMenuItem::Group group;
-
+		
 		am_items.push_back (RadioMenuElem (group, _("Discrete"), bind (
 						mem_fun(*this, &AutomationTimeAxisView::set_interpolation),
 						AutomationList::Discrete)));
 		mode_discrete_item = dynamic_cast<CheckMenuItem*>(&am_items.back());
-		//mode_discrete_item->set_active(_control->list()->interpolation() == AutomationList::Discrete);
-
-		am_items.push_back (RadioMenuElem (group, _("Line"), bind (
-						mem_fun(*this, &AutomationTimeAxisView::set_interpolation),
-						AutomationList::Linear)));
-		mode_line_item = dynamic_cast<CheckMenuItem*>(&am_items.back());
-		//mode_line_item->set_active(_control->list()->interpolation() == AutomationList::Linear);
+		mode_discrete_item->set_active(_control->list()->interpolation() == AutomationList::Discrete);
+
+		// For discrete types we dont allow the linear option since it makes no sense for those Controls
+		if (EventTypeMap::instance().interpolation_of(_control->parameter()) == Evoral::ControlList::Linear) {
+			am_items.push_back (RadioMenuElem (group, _("Line"), bind (
+							mem_fun(*this, &AutomationTimeAxisView::set_interpolation),
+							AutomationList::Linear)));
+			mode_line_item = dynamic_cast<CheckMenuItem*>(&am_items.back());
+			mode_line_item->set_active(_control->list()->interpolation() == AutomationList::Linear);
+		}
 
 		items.push_back (MenuElem (_("Mode"), *auto_mode_menu));
 	}
@@ -571,7 +568,7 @@ AutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent
 
 	double x = 0;
 
-	canvas_display->w2i (x, y);
+	_canvas_display->w2i (x, y);
 
 	/* compute vertical fractional position */
 
@@ -579,7 +576,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();
@@ -611,14 +608,14 @@ AutomationTimeAxisView::cut_copy_clear_one (AutomationLine& line, Selection& sel
 	switch (op) {
 	case Cut:
 		if ((what_we_got = alist->cut (selection.time.front().start, selection.time.front().end)) != 0) {
-			editor.get_cut_buffer().add (what_we_got);
+			_editor.get_cut_buffer().add (what_we_got);
 			_session.add_command(new MementoCommand<AutomationList>(*alist.get(), &before, &alist->get_state()));
 			ret = true;
 		}
 		break;
 	case Copy:
 		if ((what_we_got = alist->copy (selection.time.front().start, selection.time.front().end)) != 0) {
-			editor.get_cut_buffer().add (what_we_got);
+			_editor.get_cut_buffer().add (what_we_got);
 		}
 		break;
 
@@ -632,9 +629,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;
 		}
 	}
 
@@ -688,14 +687,14 @@ AutomationTimeAxisView::cut_copy_clear_objects_one (AutomationLine& line, PointS
 		switch (op) {
 		case Cut:
 			if ((what_we_got = alist->cut ((*i).start, (*i).end)) != 0) {
-				editor.get_cut_buffer().add (what_we_got);
+				_editor.get_cut_buffer().add (what_we_got);
 				_session.add_command (new MementoCommand<AutomationList>(*alist.get(), new XMLNode (before), &alist->get_state()));
 				ret = true;
 			}
 			break;
 		case Copy:
 			if ((what_we_got = alist->copy ((*i).start, (*i).end)) != 0) {
-				editor.get_cut_buffer().add (what_we_got);
+				_editor.get_cut_buffer().add (what_we_got);
 			}
 			break;
 			
@@ -712,9 +711,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;
 		}
 	}
 
@@ -733,7 +734,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;
@@ -747,9 +748,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();
@@ -767,14 +770,14 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double
 		double botfrac;
 
 		/* remember: this is X Window - coordinate space starts in upper left and moves down.
-		   y_position is the "origin" or "top" of the track.
+		   _y_position is the "origin" or "top" of the track.
 		*/
 
-		double mybot = y_position + height;
+		double mybot = _y_position + height;
 
-		if (y_position >= top && mybot <= bot) {
+		if (_y_position >= top && mybot <= bot) {
 
-			/* y_position is below top, mybot is above bot, so we're fully
+			/* _y_position is below top, mybot is above bot, so we're fully
 			   covered vertically.
 			*/
 
@@ -783,10 +786,10 @@ AutomationTimeAxisView::get_selectables (nframes_t start, nframes_t end, double
 
 		} else {
 
-			/* top and bot are within y_position .. mybot */
+			/* top and bot are within _y_position .. mybot */
 
-			topfrac = 1.0 - ((top - y_position) / height);
-			botfrac = 1.0 - ((bot - y_position) / height);
+			topfrac = 1.0 - ((top - _y_position) / height);
+			botfrac = 1.0 - ((bot - _y_position) / height);
 		}
 
 		if (_line)
@@ -850,17 +853,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 () 
 {
@@ -873,31 +865,19 @@ int
 AutomationTimeAxisView::set_state (const XMLNode& node)
 {
 	TimeAxisView::set_state (node);
-	
-	XMLNodeList kids;
-	XMLNodeConstIterator iter;
-
-	kids = node.children ();
-
-	for (iter = kids.begin(); iter != kids.end(); ++iter) {
-		
-		if ((*iter)->name() == state_node_name) {
-			XMLProperty* type = (*iter)->property("automation-id");
-
-			if (type && type->value() == ARDOUR::EventTypeMap::instance().to_symbol(_control->parameter())) {
-				XMLProperty *shown = (*iter)->property("shown_editor");
 
-				if (shown && shown->value() == "yes") {
-					set_marked_for_display(true);
-					canvas_display->show(); /* FIXME: necessary? show_at? */
-				}
-				break;
-			}
+	XMLProperty const * type = node.property ("automation-id");
+	if (type && type->value () == ARDOUR::EventTypeMap::instance().to_symbol (_control->parameter())) {
+		XMLProperty const * shown = node.property ("shown");
+		if (shown && shown->value () == "yes") {
+			set_marked_for_display (true);
+			_canvas_display->show (); /* FIXME: necessary? show_at? */
 		}
 	}
-
-	if (!_marked_for_display)
+	
+	if (!_marked_for_display) {
 		hide();
+	}
 
 	return 0;
 }