projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove internal edit mode and add "content" tool.
[ardour.git]
/
gtk2_ardour
/
automation_time_axis.h
diff --git
a/gtk2_ardour/automation_time_axis.h
b/gtk2_ardour/automation_time_axis.h
index d388419e177ab6d2a30ba4ed838f4859ebb3221f..b726de64405c98c6eb03b2015c0f648f06acd81c 100644
(file)
--- a/
gtk2_ardour/automation_time_axis.h
+++ b/
gtk2_ardour/automation_time_axis.h
@@
-34,6
+34,7
@@
#include "time_axis_view.h"
#include "automation_controller.h"
#include "time_axis_view.h"
#include "automation_controller.h"
+#include "ardour_button.h"
namespace ARDOUR {
class Session;
namespace ARDOUR {
class Session;
@@
-50,7
+51,7
@@
class Selection;
class Selectable;
class AutomationStreamView;
class AutomationController;
class Selectable;
class AutomationStreamView;
class AutomationController;
-
+class ItemCounts;
class AutomationTimeAxisView : public TimeAxisView {
public:
class AutomationTimeAxisView : public TimeAxisView {
public:
@@
-72,7
+73,7
@@
class AutomationTimeAxisView : public TimeAxisView {
void set_samples_per_pixel (double);
std::string name() const { return _name; }
void set_samples_per_pixel (double);
std::string name() const { return _name; }
-
void add_automation_event (GdkEvent *, framepos_t, double
);
+
void add_automation_event (GdkEvent *, framepos_t, double, bool with_guard_points
);
void clear_lines ();
void clear_lines ();
@@
-92,7
+93,7
@@
class AutomationTimeAxisView : public TimeAxisView {
/* editing operations */
void cut_copy_clear (Selection&, Editing::CutCopyOp);
/* editing operations */
void cut_copy_clear (Selection&, Editing::CutCopyOp);
- bool paste (ARDOUR::framepos_t,
float times, Selection&, size_t nth
);
+ bool paste (ARDOUR::framepos_t,
const Selection&, PasteContext&
);
int set_state (const XMLNode&, int version);
int set_state (const XMLNode&, int version);
@@
-122,29
+123,33
@@
class AutomationTimeAxisView : public TimeAxisView {
static void what_has_visible_automation (const boost::shared_ptr<ARDOUR::Automatable>& automatable, std::set<Evoral::Parameter>& visible);
protected:
static void what_has_visible_automation (const boost::shared_ptr<ARDOUR::Automatable>& automatable, std::set<Evoral::Parameter>& visible);
protected:
+ /* Note that for MIDI controller "automation" (in regions), all of these
+ may be set. In this case, _automatable is likely _route so the
+ controller will send immediate events out the route's MIDI port. */
+
/** parent route */
boost::shared_ptr<ARDOUR::Route> _route;
/** parent route */
boost::shared_ptr<ARDOUR::Route> _route;
- /** control
; 0 if we are editing region-based automation
*/
+ /** control */
boost::shared_ptr<ARDOUR::AutomationControl> _control;
boost::shared_ptr<ARDOUR::AutomationControl> _control;
- /** control owner; may be _route,
or 0 if we are editing region-based automation
*/
+ /** control owner; may be _route,
something else (e.g. a pan control), or NULL
*/
boost::shared_ptr<ARDOUR::Automatable> _automatable;
boost::shared_ptr<ARDOUR::Automatable> _automatable;
- /** controller owner
; 0 if we are editing region-based automation
*/
+ /** controller owner */
boost::shared_ptr<AutomationController> _controller;
Evoral::Parameter _parameter;
ArdourCanvas::Rectangle* _base_rect;
boost::shared_ptr<AutomationLine> _line;
boost::shared_ptr<AutomationController> _controller;
Evoral::Parameter _parameter;
ArdourCanvas::Rectangle* _base_rect;
boost::shared_ptr<AutomationLine> _line;
+ std::string _name;
+
/** AutomationStreamView if we are editing region-based automation (for MIDI), otherwise 0 */
AutomationStreamView* _view;
/** AutomationStreamView if we are editing region-based automation (for MIDI), otherwise 0 */
AutomationStreamView* _view;
- std::string _name;
bool ignore_toggle;
bool ignore_toggle;
-
bool first_call_to_set_height;
bool first_call_to_set_height;
-
Gtk::Button
hide_button;
-
Gtk::Button
auto_button;
+
ArdourButton
hide_button;
+
ArdourButton
auto_button;
Gtk::Menu* automation_menu;
Gtk::Label* plugname;
bool plugname_packed;
Gtk::Menu* automation_menu;
Gtk::Label* plugname;
bool plugname_packed;
@@
-165,10
+170,12
@@
class AutomationTimeAxisView : public TimeAxisView {
void hide_clicked ();
void auto_clicked ();
void hide_clicked ();
void auto_clicked ();
+ virtual bool can_edit_name() const {return false;}
+
void build_display_menu ();
void cut_copy_clear_one (AutomationLine&, Selection&, Editing::CutCopyOp);
void build_display_menu ();
void cut_copy_clear_one (AutomationLine&, Selection&, Editing::CutCopyOp);
- bool paste_one (A
utomationLine&, ARDOUR::framepos_t, float times, Selection&, size_t nth
);
+ bool paste_one (A
RDOUR::framepos_t, unsigned, float times, const Selection&, ItemCounts& counts, bool greedy=false
);
void route_going_away ();
void set_automation_state (ARDOUR::AutoState);
void route_going_away ();
void set_automation_state (ARDOUR::AutoState);