ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

allow ControlProtocols to call for undo/redo in GUI; make MCP use this

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11851 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-04-09 15:50:38 +00:00
parent 5d0858940b
commit e2d62d9af4
5 changed files with 36 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/editor.cc
View File

@ -709,6 +709,8 @@ Editor::Editor ()
ControlProtocol::ZoomToSession.connect (*this, invalidator (*this), boost::bind (&Editor::temporal_zoom_session, this), gui_context());
ControlProtocol::ZoomIn.connect (*this, invalidator (*this), boost::bind (&Editor::temporal_zoom_step, this, false), gui_context());
ControlProtocol::ZoomOut.connect (*this, invalidator (*this), boost::bind (&Editor::temporal_zoom_step, this, true), gui_context());
ControlProtocol::Undo.connect (*this, invalidator (*this), boost::bind (&Editor::undo, this, true), gui_context());
ControlProtocol::Redo.connect (*this, invalidator (*this), boost::bind (&Editor::redo, this, true), gui_context());
ControlProtocol::ScrollTimeline.connect (*this, invalidator (*this), ui_bind (&Editor::control_scroll, this, _1), gui_context());
ControlProtocol::SelectByRID.connect (*this, invalidator (*this), ui_bind (&Editor::control_select, this, _1), gui_context());
BasicUI::AccessAction.connect (*this, invalidator (*this), ui_bind (&Editor::access_action, this, _1, _2), gui_context());

2
libs/surfaces/control_protocol/control_protocol.cc
View File

@ -35,6 +35,8 @@ Signal0<void> ControlProtocol::ZoomToSession;
Signal0<void> ControlProtocol::ZoomOut;
Signal0<void> ControlProtocol::ZoomIn;
Signal0<void> ControlProtocol::Enter;
Signal0<void> ControlProtocol::Undo;
Signal0<void> ControlProtocol::Redo;
Signal1<void,float> ControlProtocol::ScrollTimeline;
Signal1<void,uint32_t> ControlProtocol::SelectByRID;

2
libs/surfaces/control_protocol/control_protocol/control_protocol.h
View File

@ -60,6 +60,8 @@ class ControlProtocol : virtual public sigc::trackable, public PBD::Stateful, pu
static PBD::Signal0<void> ZoomIn;
static PBD::Signal0<void> ZoomOut;
static PBD::Signal0<void> Enter;
static PBD::Signal0<void> Undo;
static PBD::Signal0<void> Redo;
static PBD::Signal1<void,float> ScrollTimeline;
static PBD::Signal1<void,uint32_t> SelectByRID;

26
libs/surfaces/mackie/mackie_control_protocol.cc
View File

@ -1720,6 +1720,32 @@ MackieControlProtocol::scrub_release (Mackie::Button &)
);
}
LedState
MackieControlProtocol::undo_press (Button&)
{
Undo(); /* EMIT SIGNAL */
return off;
}
LedState
MackieControlProtocol::undo_release (Button&)
{
return off;
}
LedState
MackieControlProtocol::redo_press (Button&)
{
Redo(); /* EMIT SIGNAL */
return off;
}
LedState
MackieControlProtocol::redo_release (Button&)
{
return off;
}
LedState
MackieControlProtocol::drop_press (Button &)
{

8
libs/surfaces/mackie/mackie_control_protocol.h
View File

@ -196,6 +196,10 @@ class MackieControlProtocol
Mackie::LedState zoom_release(Mackie::Button &);
Mackie::LedState scrub_press(Mackie::Button &);
Mackie::LedState scrub_release(Mackie::Button &);
Mackie::LedState undo_press (Mackie::Button &);
Mackie::LedState undo_release (Mackie::Button &);
Mackie::LedState redo_press (Mackie::Button &);
Mackie::LedState redo_release (Mackie::Button &);
/* unimplemented button handlers */
@ -261,14 +265,10 @@ class MackieControlProtocol
Mackie::LedState on_release (Mackie::Button &) { return Mackie::off; }
Mackie::LedState rec_ready_press (Mackie::Button &) { return Mackie::off; }
Mackie::LedState rec_ready_release (Mackie::Button &) { return Mackie::off; }
Mackie::LedState undo_press (Mackie::Button &) { return Mackie::off; }
Mackie::LedState undo_release (Mackie::Button &) { return Mackie::off; }
Mackie::LedState snapshot_press (Mackie::Button &) { return Mackie::off; }
Mackie::LedState snapshot_release (Mackie::Button &) { return Mackie::off; }
Mackie::LedState touch_press (Mackie::Button &) { return Mackie::off; }
Mackie::LedState touch_release (Mackie::Button &) { return Mackie::off; }
Mackie::LedState redo_press (Mackie::Button &) { return Mackie::off; }
Mackie::LedState redo_release (Mackie::Button &) { return Mackie::off; }
Mackie::LedState enter_press (Mackie::Button &) { return Mackie::off; }
Mackie::LedState enter_release (Mackie::Button &) { return Mackie::off; }
Mackie::LedState cancel_press (Mackie::Button &) { return Mackie::off; }