projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' into cairocanvas
[ardour.git]
/
gtk2_ardour
/
automation_controller.h
diff --git
a/gtk2_ardour/automation_controller.h
b/gtk2_ardour/automation_controller.h
index 042f4a3b96f5f0b7f54044e89557538a40d26db7..29635c848869d2bed9ae98f5f3c955a78c61c541 100644
(file)
--- a/
gtk2_ardour/automation_controller.h
+++ b/
gtk2_ardour/automation_controller.h
@@
-1,6
+1,6
@@
/*
/*
- Copyright (C) 2007 Paul Davis
-
Author: Dave
Robillard
+ Copyright (C) 2007 Paul Davis
+
Author: David
Robillard
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-21,41
+21,61
@@
#ifndef __ardour_gtk_automation_controller_h__
#define __ardour_gtk_automation_controller_h__
#ifndef __ardour_gtk_automation_controller_h__
#define __ardour_gtk_automation_controller_h__
+#ifdef YES
+#undef YES
+#endif
+#ifdef NO
+#undef NO
+#endif
+
#include <boost/shared_ptr.hpp>
#include <gtkmm.h>
#include <boost/shared_ptr.hpp>
#include <gtkmm.h>
-#include <gtkmm2ext/barcontroller.h>
+
+#include "gtkmm2ext/barcontroller.h"
+#include "pbd/signals.h"
+#include "evoral/Parameter.hpp"
namespace ARDOUR {
class Session;
class AutomationList;
class AutomationControl;
namespace ARDOUR {
class Session;
class AutomationList;
class AutomationControl;
+ class Automatable;
}
}
-
+/** A BarController which displays the value and allows control of an AutomationControl */
class AutomationController : public Gtkmm2ext::BarController {
public:
static boost::shared_ptr<AutomationController> create(
class AutomationController : public Gtkmm2ext::BarController {
public:
static boost::shared_ptr<AutomationController> create(
-
ARDOUR::Session& s
,
-
boost::shared_ptr<ARDOUR::AutomationList> al
,
+
boost::shared_ptr<ARDOUR::Automatable> parent
,
+
const Evoral::Parameter& param
,
boost::shared_ptr<ARDOUR::AutomationControl> ac);
~AutomationController();
boost::shared_ptr<ARDOUR::AutomationControl> ac);
~AutomationController();
-
+
boost::shared_ptr<ARDOUR::AutomationControl> controllable() { return _controllable; }
boost::shared_ptr<ARDOUR::AutomationControl> controllable() { return _controllable; }
-
- void update_label(char* label, int label_len);
+
+ Gtk::Adjustment* adjustment() { return _adjustment; }
+
void display_effective_value();
void value_adjusted();
void display_effective_value();
void value_adjusted();
+ void stop_updating ();
+
private:
private:
- AutomationController(boost::shared_ptr<ARDOUR::AutomationControl> ac, Gtk::Adjustment* adj);
+ AutomationController (boost::shared_ptr<ARDOUR::Automatable> printer, boost::shared_ptr<ARDOUR::AutomationControl> ac, Gtk::Adjustment* adj);
+ std::string get_label (double&);
+
void start_touch();
void end_touch();
void start_touch();
void end_touch();
+ void value_changed();
+
bool _ignore_change;
bool _ignore_change;
+ boost::shared_ptr<ARDOUR::Automatable> _printer;
boost::shared_ptr<ARDOUR::AutomationControl> _controllable;
Gtk::Adjustment* _adjustment;
sigc::connection _screen_update_connection;
boost::shared_ptr<ARDOUR::AutomationControl> _controllable;
Gtk::Adjustment* _adjustment;
sigc::connection _screen_update_connection;
+ PBD::ScopedConnection _changed_connection;
};
};