*/
+#ifdef WAF_BUILD
+#include "gtk2ardour-config.h"
+#endif
+
/* this file exists solely to break compilation dependencies that
would connect changes to the mixer or editor objects.
*/
install_actions ();
ProcessorBox::register_actions ();
keyboard->setup_keybindings ();
+ editor->setup_tooltips ();
editor->UpdateAllTransportClocks.connect (sigc::mem_fun (*this, &ARDOUR_UI::update_transport_clocks));
}
ARDOUR_UI::connect_dependents_to_session (ARDOUR::Session *s)
{
BootMessage (_("Setup Editor"));
- editor->connect_to_session (s);
+ editor->set_session (s);
BootMessage (_("Setup Mixer"));
- mixer->connect_to_session (s);
+ mixer->set_session (s);
/* its safe to do this now */
editor->show_window ();
editor->present ();
- _mixer_on_top = false;
flush_pending ();
}
{
mixer->show_window ();
mixer->present ();
- _mixer_on_top = true;
flush_pending ();
}
void
-ARDOUR_UI::toggle_editor_mixer_on_top ()
+ARDOUR_UI::toggle_mixer_window ()
{
- if (_mixer_on_top) {
- goto_editor_window ();
+ Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-mixer"));
+ if (!act) {
+ return;
+ }
+
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+
+ if (tact->get_active()) {
+ goto_mixer_window ();
} else {
+ mixer->hide ();
+ }
+}
+
+void
+ARDOUR_UI::toggle_mixer_on_top ()
+{
+ Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("toggle-mixer-on-top"));
+ if (!act) {
+ return;
+ }
+
+ Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+
+ if (tact->get_active()) {
+
+ /* Toggle the mixer to `visible' if required */
+ act = ActionManager::get_action (X_("Common"), X_("toggle-mixer"));
+ if (act) {
+ tact = Glib::RefPtr<ToggleAction>::cast_dynamic (act);
+
+ if (!tact->get_active()) {
+ tact->set_active ();
+ }
+ }
+
goto_mixer_window ();
+ } else {
+ goto_editor_window ();
}
}
return TRUE;
#endif
}
+