diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-10 03:25:32 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-10 03:25:32 +0000 |
| commit | 61cade6d59118288e90a405e0f4fbc24d0108814 (patch) | |
| tree | fe9083a4c005ac239bf5995c16252609dc547869 /gtk2_ardour/route_ui.cc | |
| parent | f18bcf0cc835ab401d8e28dcc18c72795977752a (diff) | |
drastic, deep and wide changes to make RouteGroup use boost::shared_ptr<Route> and boost::shared_ptr<RouteList> to better fit into emerging framework for "RT operations" ; torben's changes to MTC slaving code (sorry for bundling)
git-svn-id: svn://localhost/ardour2/branches/3.0@6334 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/route_ui.cc')
| -rw-r--r-- | gtk2_ardour/route_ui.cc | 26 |
1 files changed, 12 insertions, 14 deletions
diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 9eb356ddd1..821b82a0b6 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -543,35 +543,33 @@ RouteUI::rec_enable_press(GdkEventButton* ev) } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::ModifierMask (Keyboard::PrimaryModifier|Keyboard::TertiaryModifier))) { - SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); - ev->rt_slot = bind (sigc::mem_fun (_session, &Session::set_record_enable), _session.get_routes(), !rec_enable_button->get_active()); - ev->rt_return = sigc::mem_fun (*this, &RouteUI::post_rtop_cleanup); - - _session.queue_event (ev); +#if 0 + _session.set_record_enable (_session.get_route(), !rec_enable_button->get_active(), sigc::mem_fun (*this, &RouteUI::post_rtop_cleanup)); +#endif } else if (Keyboard::modifier_state_equals (ev->state, Keyboard::PrimaryModifier)) { /* Primary-button1 applies change to the route group (even if it is not active) NOTE: Primary-button2 is MIDI learn. */ - - if (ev->button == 1) { - queue_route_group_op (RouteGroup::RecEnable, &Session::set_record_enable, !rec_enable_button->get_active()); +#if 0 + if (ev->button == 1 && _route->route_group()) { + _session.set_record_enable (_route->route_group(), !rec_enable_button->get_active(), + queue_route_group_op (RouteGroup::RecEnable, &Session::set_record_enable, } +#endif } else if (Keyboard::is_context_menu_event (ev)) { /* do this on release */ } else { + +#if 0 boost::shared_ptr<RouteList> rl (new RouteList); rl->push_back (route()); - - SessionEvent* ev = new SessionEvent (SessionEvent::RealTimeOperation, SessionEvent::Add, SessionEvent::Immediate, 0, 0.0); - ev->rt_slot = bind (sigc::mem_fun (_session, &Session::set_record_enable), rl, !rec_enable_button->get_active()); - ev->rt_return = sigc::mem_fun (*this, &RouteUI::post_rtop_cleanup); - - _session.queue_event (ev); + _session.set_record_enable (rl, !rec_enable_button->get_active(), sigc::mem_fun (*this, &RouteUI::post_rtop_cleanup)); +#endif } } |