diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-04-20 02:48:20 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-04-20 02:48:20 +0000 |
| commit | 718b2eab6706f304e398f036e3d817567cd746e8 (patch) | |
| tree | 686fc9f7e530bd57f7acb0d4d578db75460e182a /gtk2_ardour/ardour_ui_dialogs.cc | |
| parent | c3f458816fd8e8476b226c9aa0c2cd4765fe06ec (diff) | |
factor out shuttle controller to its own class, new design
git-svn-id: svn://localhost/ardour2/branches/3.0@9391 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/ardour_ui_dialogs.cc')
| -rw-r--r-- | gtk2_ardour/ardour_ui_dialogs.cc | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gtk2_ardour/ardour_ui_dialogs.cc b/gtk2_ardour/ardour_ui_dialogs.cc index f84742f317..582c635ca7 100644 --- a/gtk2_ardour/ardour_ui_dialogs.cc +++ b/gtk2_ardour/ardour_ui_dialogs.cc @@ -39,6 +39,7 @@ #include "public_editor.h" #include "rc_option_editor.h" #include "route_params_ui.h" +#include "shuttle_control.h" #include "session_option_editor.h" #include "speaker_dialog.h" #include "sfdb_ui.h" @@ -81,6 +82,10 @@ ARDOUR_UI::set_session (Session *s) session_option_editor->set_session (s); } + if (shuttle_box) { + shuttle_box->set_session (s); + } + for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) { if (_global_port_matrix[*i]->get()) { _global_port_matrix[*i]->get()->set_session (_session); @@ -127,7 +132,7 @@ ARDOUR_UI::set_session (Session *s) ActionManager::set_sensitive (ActionManager::playlist_selection_sensitive_actions, false); rec_button.set_sensitive (true); - shuttle_box.set_sensitive (true); + solo_alert_button.set_active (_session->soloing()); setup_session_options (); @@ -205,7 +210,6 @@ ARDOUR_UI::unload_session (bool hide_stuff) ActionManager::set_sensitive (ActionManager::session_sensitive_actions, false); rec_button.set_sensitive (false); - shuttle_box.set_sensitive (false); stop_blinking (); stop_clocking (); |