ardour/livetrax
13
0
Fork 0
Code

r209@gandalf: fugalh | 2006-07-28 17:38:21 -0600

Browse Source 
global {solo,mute,record enable,metering} state commands. Same philosophy as
 the MementoCommand but using only the appropriate state and not the entire
 state of the session.
 


git-svn-id: svn://localhost/ardour2/branches/undo@718 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Hans Fugal 2006-07-28 23:38:30 +00:00
parent 6aeb09062f
commit 277b771a97
3 changed files with 155 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
gtk2_ardour/route_ui.cc
View File

@ -132,9 +132,10 @@ RouteUI::mute_press(GdkEventButton* ev)
/* ctrl-shift-click applies change to all routes */
_session.begin_reversible_command (_("mute change"));
_session.add_undo (_session.global_mute_memento(this));
Session::GlobalMuteStateCommand cmd(this);
_session.set_all_mute (!_route.muted());
_session.add_redo_no_execute (_session.global_mute_memento(this));
cmd.mark();
_session.add_command(cmd);
_session.commit_reversible_command ();
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
@ -207,9 +208,10 @@ RouteUI::solo_press(GdkEventButton* ev)
/* ctrl-shift-click applies change to all routes */
_session.begin_reversible_command (_("solo change"));
_session.add_undo (_session.global_solo_memento(this));
Session::GlobalSoloStateCommand cmd(this);
_session.set_all_solo (!_route.soloed());
_session.add_redo_no_execute (_session.global_solo_memento(this));
cmd.mark();
_session.add_command (cmd);
_session.commit_reversible_command ();
} else if (Keyboard::modifier_state_contains (ev->state, Keyboard::ModifierMask (Keyboard::Control|Keyboard::Alt))) {
@ -217,10 +219,11 @@ RouteUI::solo_press(GdkEventButton* ev)
// ctrl-alt-click: exclusively solo this track, not a toggle */
_session.begin_reversible_command (_("solo change"));
_session.add_undo (_session.global_solo_memento(this));
Session::GlobalSoloStateCommand cmd(this);
_session.set_all_solo (false);
_route.set_solo (true, this);
_session.add_redo_no_execute (_session.global_solo_memento(this));
cmd.mark();
_session.add_command(cmd);
_session.commit_reversible_command ();
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Shift)) {
@ -280,7 +283,7 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::Control|Keyboard::Shift))) {
_session.begin_reversible_command (_("rec-enable change"));
_session.add_undo (_session.global_record_enable_memento(this));
Session::GlobalRecordEnableStateCommand cmd(this);
if (rec_enable_button->get_active()) {
_session.record_disenable_all ();
@ -288,7 +291,8 @@ RouteUI::rec_enable_press(GdkEventButton* ev)
_session.record_enable_all ();
}
_session.add_redo_no_execute (_session.global_record_enable_memento(this));
cmd.mark();
_session.add_command(cmd);
_session.commit_reversible_command ();
} else if (Keyboard::modifier_state_equals (ev->state, Keyboard::Control)) {
@ -557,9 +561,10 @@ RouteUI::set_mix_group_solo(Route& route, bool yn)
if((mix_group = route.mix_group()) != 0){
_session.begin_reversible_command (_("mix group solo change"));
_session.add_undo (_session.global_solo_memento (this));
Session::GlobalSoloStateCommand cmd(this);
mix_group->apply(&Route::set_solo, yn, this);
_session.add_redo_no_execute (_session.global_solo_memento(this));
cmd.mark();
_session.add_command (cmd);
_session.commit_reversible_command ();
} else {
reversibly_apply_route_boolean ("solo change", &Route::set_solo, !route.soloed(), this);
@ -595,9 +600,10 @@ RouteUI::set_mix_group_mute(Route& route, bool yn)
if((mix_group = route.mix_group()) != 0){
_session.begin_reversible_command (_("mix group mute change"));
_session.add_undo (_session.global_mute_memento (this));
Session::GlobalMuteStateCommand cmd(this);
mix_group->apply(&Route::set_mute, yn, this);
_session.add_redo_no_execute (_session.global_mute_memento(this));
cmd.mark();
_session.add_command(cmd);
_session.commit_reversible_command ();
} else {
reversibly_apply_route_boolean ("mute change", &Route::set_mute, !route.muted(), this);
@ -611,9 +617,10 @@ RouteUI::set_mix_group_rec_enable(Route& route, bool yn)
if((mix_group = route.mix_group()) != 0){
_session.begin_reversible_command (_("mix group rec-enable change"));
_session.add_undo (_session.global_record_enable_memento (this));
Session::GlobalRecordEnableStateCommand cmd(this);
mix_group->apply (&Route::set_record_enable, yn, this);
_session.add_redo_no_execute (_session.global_record_enable_memento(this));
cmd.mark();
_session.add_command(cmd);
_session.commit_reversible_command ();
} else {
reversibly_apply_route_boolean ("rec-enable change", &Route::set_record_enable, !_route.record_enabled(), this);

52
libs/ardour/ardour/session.h
View File

@ -848,10 +848,54 @@ class Session : public sigc::trackable, public Stateful
current_trans.add_command (cmd);
}
UndoAction global_solo_memento (void *src);
UndoAction global_mute_memento (void *src);
UndoAction global_record_enable_memento (void *src);
UndoAction global_metering_memento (void *src);
// these commands are implemented in libs/ardour/session_command.cc
class GlobalSoloStateCommand : public Command
{
GlobalRouteBooleanState before, after;
void *src;
public:
GlobalSoloStateCommand(void *src);
void operator()();
void undo();
XMLNode &serialize();
void mark();
}
class GlobalMuteStateCommand : public Command
{
GlobalRouteBooleanState before, after;
void *src;
public:
GlobalMuteStateCommand(void *src);
void operator()();
void undo();
XMLNode &serialize();
void mark();
}
class GlobalRecordEnableStateCommand : public Command
{
GlobalRouteBooleanState before, after;
void *src;
public:
GlobalRecordEnableStateCommand(void *src);
void operator()();
void undo();
XMLNode &serialize();
void mark();
}
class GlobalMeteringStateCommand : public Command
{
GlobalRouteMeterState before, after;
void *src;
public:
GlobalMeteringStateCommand(void *src);
void operator()();
void undo();
XMLNode &serialize();
void mark();
}
/* edit mode */

86
libs/ardour/session_command.cc Normal file
View File

@ -0,0 +1,86 @@
#include <ardour/session.h>
// solo
Session::GlobalSoloStateCommand::GlobalSoloStateCommand(void *src) : src(src)
{
after = before = get_global_route_boolean(&Route::soloed);
}
void Session::GlobalSoloStateCommand::mark()
{
after = get_global_route_boolean(&Route::soloed);
}
void operator()()
{
set_global_solo(after, src);
}
void undo()
{
set_global_solo(before, src);
}
XMLNode &serialize()
{
}
// mute
Session::GlobalMuteStateCommand::GlobalMuteStateCommand(void *src) : src(src)
{
after = before = get_global_route_boolean(&Route::muted);
}
void Session::GlobalMuteStateCommand::mark()
{
after = get_global_route_boolean(&Route::muted);
}
void operator()()
{
set_global_mute(after, src);
}
void undo()
{
set_global_mute(before, src);
}
XMLNode &serialize()
{
}
// record enable
Session::GlobalRecordEnableStateCommand::GlobalRecordEnableStateCommand(void *src) : src(src)
{
after = before = get_global_route_boolean(&Route::record_enabled);
}
void Session::GlobalRecordEnableStateCommand::mark()
{
after = get_global_route_boolean(&Route::record_enabled);
}
void operator()()
{
set_global_record_enable(after, src);
}
void undo()
{
set_global_record_enable(before, src);
}
XMLNode &serialize()
{
}
// metering
Session::GlobalMeteringStateCommand::GlobalMeteringStateCommand(void *src) : src(src)
{
after = before = get_global_route_metering();
}
void Session::GlobalMeteringStateCommand::mark()
{
after = get_global_route_metering();
}
void operator()()
{
set_global_route_metering(after, src);
}
void undo()
{
set_global_route_metering(before, src);
}
XMLNode &serialize()
{
}