along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
#include <ardour/curve.h>
#include <ardour/panner.h>
#include <gtkmm2ext/popup.h>
+#include <pbd/memento_command.h>
#include "pan_automation_time_axis.h"
#include "automation_line.h"
#include "canvas_impl.h"
+#include "route_ui.h"
#include "i18n.h"
using namespace PBD;
using namespace Gtk;
-PanAutomationTimeAxisView::PanAutomationTimeAxisView (Session& s, Route& r, PublicEditor& e, TimeAxisView& parent, Canvas& canvas, std::string n)
+PanAutomationTimeAxisView::PanAutomationTimeAxisView (Session& s, boost::shared_ptr<Route> r, PublicEditor& e,
+ TimeAxisView& parent, Canvas& canvas, std::string n)
: AxisView (s),
AutomationTimeAxisView (s, r, e, parent, canvas, n, X_("pan"), "")
{
multiline_selector.set_name ("PanAutomationLineSelector");
- controls_table.attach (multiline_selector, 1, 5, 1, 2, Gtk::FILL | Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND);
+ controls_table.attach (multiline_selector, 1, 5, 1, 2, Gtk::EXPAND, Gtk::EXPAND);
}
PanAutomationTimeAxisView::~PanAutomationTimeAxisView ()
}
void
-PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, jack_nframes_t when, double y)
+PanAutomationTimeAxisView::add_automation_event (ArdourCanvas::Item* item, GdkEvent* event, nframes_t when, double y)
{
if (lines.empty()) {
/* no data, possibly caused by no outputs/inputs */
AutomationList& alist (lines[line_index]->the_list());
_session.begin_reversible_command (_("add pan automation event"));
- _session.add_undo (alist.get_memento());
+ XMLNode &before = alist.get_state();
alist.add (when, y);
- _session.add_undo (alist.get_memento());
+ XMLNode &after = alist.get_state();
+ _session.add_command(new MementoCommand<AutomationList>(alist, &before, &after));
_session.commit_reversible_command ();
_session.set_dirty ();
}
PanAutomationTimeAxisView::add_line (AutomationLine& line)
{
char buf[32];
- snprintf(buf,32,"Line %d",lines.size()+1);
+ snprintf(buf,32,"Line %zu",lines.size()+1);
multiline_selector.append_text(buf);
if (lines.empty()) {
multiline_selector.set_active(0);
}
- if (lines.size() + 1 > 1) {
+ if (lines.size() + 1 > 1 && (height > hSmall)) {
multiline_selector.show();
+ } else {
+ multiline_selector.hide();
+
}
AutomationTimeAxisView::add_line(line);
}
void
-PanAutomationTimeAxisView::set_height (TimeAxisView::TrackHeight th)
+PanAutomationTimeAxisView::set_height (uint32_t h)
{
- AutomationTimeAxisView::set_height(th);
+ AutomationTimeAxisView::set_height(h);
- switch (th) {
- case Largest:
- case Large:
- case Larger:
- case Normal:
+ if (h >= hNormal) {
+ if (lines.size() > 1) {
multiline_selector.show();
- break;
-
- default:
- multiline_selector.hide();
+ }
+ } else {
+ multiline_selector.hide();
}
}
PanAutomationTimeAxisView::set_automation_state (AutoState state)
{
if (!ignore_state_request) {
- route.panner().set_automation_state (state);
+ route->panner().set_automation_state (state);
}
}