diff options
| author | Hans Fugal <hans@fugal.net> | 2006-08-04 03:42:34 +0000 |
|---|---|---|
| committer | Hans Fugal <hans@fugal.net> | 2006-08-04 03:42:34 +0000 |
| commit | 5756373841675a879833f98bb4008dd0c40714d3 (patch) | |
| tree | 5ab9e96d4e4314554a818b541bbc8e0e5f0c3e70 /gtk2_ardour/route_ui.cc | |
| parent | 79986643c0c904f6574bb5323e2233a43a9e622e (diff) | |
Really fixed conflicts. Ready to merge into trunk.
git-svn-id: svn://localhost/ardour2/branches/undo@757 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 8a1fb1c21a..863e73d33e 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -130,7 +130,7 @@ RouteUI::mute_press(GdkEventButton* ev) _session.begin_reversible_command (_("mute change")); Session::GlobalMuteStateCommand *cmd = new Session::GlobalMuteStateCommand(_session, this); - _session.set_all_mute (!_route.muted()); + _session.set_all_mute (!_route->muted()); cmd->mark(); _session.add_command(cmd); _session.commit_reversible_command (); @@ -206,7 +206,7 @@ RouteUI::solo_press(GdkEventButton* ev) _session.begin_reversible_command (_("solo change")); Session::GlobalSoloStateCommand *cmd = new Session::GlobalSoloStateCommand(_session, this); - _session.set_all_solo (!_route.soloed()); + _session.set_all_solo (!_route->soloed()); cmd->mark(); _session.add_command (cmd); _session.commit_reversible_command (); @@ -218,7 +218,7 @@ RouteUI::solo_press(GdkEventButton* ev) _session.begin_reversible_command (_("solo change")); Session::GlobalSoloStateCommand *cmd = new Session::GlobalSoloStateCommand (_session, this); _session.set_all_solo (false); - _route.set_solo (true, this); + _route->set_solo (true, this); cmd->mark(); _session.add_command(cmd); _session.commit_reversible_command (); @@ -572,10 +572,10 @@ void RouteUI::reversibly_apply_route_boolean (string name, void (Route::*func)(bool, void *), bool yn, void *arg) { _session.begin_reversible_command (name); - XMLNode &before = _route.get_state(); - bind(mem_fun(_route, func), yn, arg)(); - XMLNode &after = _route.get_state(); - _session.add_command (new MementoCommand<Route>(_route, before, after)); + XMLNode &before = _route->get_state(); + bind(mem_fun(*_route, func), yn, arg)(); + XMLNode &after = _route->get_state(); + _session.add_command (new MementoCommand<Route>(*_route, before, after)); _session.commit_reversible_command (); } |