Small cleanup.

[ardour.git] / gtk2_ardour / ardour_ui_ed.cc

diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc
index 6eb88ae9401d9dc35cfeef650969d6aa74069028..f038897cf7112d636e27437d5b6f2619cb5013c3 100644 (file)
--- a/gtk2_ardour/ardour_ui_ed.cc
+++ b/gtk2_ardour/ardour_ui_ed.cc
@@ -161,6 +161,9 @@ ARDOUR_UI::install_actions ()
 
        act = ActionManager::register_action (main_actions, X_("ExportAudio"), _("Export To Audio File(s)..."),  sigc::mem_fun (*editor, &PublicEditor::export_audio));
        ActionManager::session_sensitive_actions.push_back (act);
+       
+       act = ActionManager::register_action (main_actions, X_("StemExport"), _("Stem export..."),  sigc::mem_fun (*editor, &PublicEditor::stem_export));
+       ActionManager::session_sensitive_actions.push_back (act);
 
        act = ActionManager::register_action (main_actions, X_("Export"), _("Export"));
        ActionManager::session_sensitive_actions.push_back (act);
@@ -187,23 +190,23 @@ ARDOUR_UI::install_actions ()
 
        RadioAction::Group jack_latency_group;
 
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency32"), X_("32"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 32));
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency32"), X_("32"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 32));
        ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency64"), X_("64"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 64));
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency64"), X_("64"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 64));
        ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency128"), X_("128"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 128));
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency128"), X_("128"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 128));
        ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency256"), X_("256"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 256));
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency256"), X_("256"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 256));
        ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency512"), X_("512"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 512));
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency512"), X_("512"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 512));
        ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency1024"), X_("1024"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 1024));
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency1024"), X_("1024"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 1024));
        ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency2048"), X_("2048"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 2048));
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency2048"), X_("2048"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 2048));
        ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency4096"), X_("4096"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 4096));
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency4096"), X_("4096"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 4096));
        ActionManager::jack_sensitive_actions.push_back (act);
-       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency8192"), X_("8192"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (nframes_t) 8192));
+       act = ActionManager::register_radio_action (jack_actions, jack_latency_group, X_("JACKLatency8192"), X_("8192"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::set_jack_buffer_size), (pframes_t) 8192));
        ActionManager::jack_sensitive_actions.push_back (act);
 
        /* these actions are intended to be shared across all windows */
@@ -229,6 +232,8 @@ ARDOUR_UI::install_actions ()
        ActionManager::session_sensitive_actions.push_back (act);
        act = ActionManager::register_toggle_action (common_actions, X_("ToggleBigClock"), _("Big Clock"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_big_clock_window));
        ActionManager::session_sensitive_actions.push_back (act);
+       act = ActionManager::register_toggle_action (common_actions, X_("toggle-speaker-config"), _("Speaker Config"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_speaker_config_window));
+       ActionManager::session_sensitive_actions.push_back (act);
        act = ActionManager::register_toggle_action (common_actions, X_("toggle-audio-connection-manager"), _("Audio Connection Manager"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_global_port_matrix), ARDOUR::DataType::AUDIO));
        ActionManager::session_sensitive_actions.push_back (act);
        act = ActionManager::register_toggle_action (common_actions, X_("toggle-midi-connection-manager"), _("MIDI Connection Manager"), sigc::bind (sigc::mem_fun(*this, &ARDOUR_UI::toggle_global_port_matrix), ARDOUR::DataType::MIDI));
@@ -393,7 +398,7 @@ ARDOUR_UI::install_actions ()
        ActionManager::session_sensitive_actions.push_back (act);
        act = ActionManager::register_toggle_action (transport_actions, X_("ToggleTimeMaster"), _("Time Master"), sigc::mem_fun(*this, &ARDOUR_UI::toggle_time_master));
        ActionManager::session_sensitive_actions.push_back (act);
-       act = ActionManager::register_toggle_action (transport_actions, X_("ToggleExternalSync"), _(""), sigc::mem_fun(*this, &ARDOUR_UI::toggle_external_sync));
+       act = ActionManager::register_toggle_action (transport_actions, X_("ToggleExternalSync"), "", sigc::mem_fun(*this, &ARDOUR_UI::toggle_external_sync));
        ActionManager::session_sensitive_actions.push_back (act);
 
        for (int i = 1; i <= 32; ++i) {
@@ -441,7 +446,7 @@ ARDOUR_UI::install_actions ()
 }
 
 void
-ARDOUR_UI::set_jack_buffer_size (nframes_t nframes)
+ARDOUR_UI::set_jack_buffer_size (pframes_t nframes)
 {
        Glib::RefPtr<Action> action;
        const char* action_name = 0;
@@ -510,29 +515,22 @@ ARDOUR_UI::build_menu_bar ()
        // so use this instead ...
        gtk_settings_set_long_property (gtk_settings_get_default(), "gtk-can-change-accels", 1, "Ardour:designers");
 
-       /* Set up some size requests here to stop the menu-bar clock jumping around in full-screen mode */
-
-       set_size_request_to_display_given_text (wall_clock_label, _("99:99"), 2, 0);
        wall_clock_box.add (wall_clock_label);
        wall_clock_box.set_name ("WallClock");
        wall_clock_label.set_name ("WallClock");
 
-       set_size_request_to_display_given_text (disk_space_label, _("9999h:999999m:99999999s"), 2, 0);
        disk_space_box.add (disk_space_label);
        disk_space_box.set_name ("WallClock");
        disk_space_label.set_name ("WallClock");
 
-       set_size_request_to_display_given_text (cpu_load_label, _("DSP: 100%"), 2, 0);
        cpu_load_box.add (cpu_load_label);
        cpu_load_box.set_name ("CPULoad");
        cpu_load_label.set_name ("CPULoad");
 
-       set_size_request_to_display_given_text (buffer_load_label, _("Buffers p:100% c:100%"), 2, 0);
        buffer_load_box.add (buffer_load_label);
        buffer_load_box.set_name ("BufferLoad");
        buffer_load_label.set_name ("BufferLoad");
 
-       set_size_request_to_display_given_text (sample_rate_label, X_("384 kHz / 1000 ms"), 2, 0);
        sample_rate_box.add (sample_rate_label);
        sample_rate_box.set_name ("SampleRate");
        sample_rate_label.set_name ("SampleRate");
@@ -543,9 +541,6 @@ ARDOUR_UI::build_menu_bar ()
        use_menubar_as_top_menubar ();
 #endif
 
-       _menu_bar_clock.ValueChanged.connect (sigc::mem_fun(*this, &ARDOUR_UI::menu_bar_clock_value_changed));
-       menu_hbox.pack_start (_menu_bar_clock, true, false);
-
        if (!Profile->get_small_screen()) {
 #ifndef GTKOSX
                // OSX provides its own wallclock, thank you very much
@@ -782,26 +777,3 @@ ARDOUR_UI::toggle_global_port_matrix (ARDOUR::DataType t)
                }
        }
 }
-
-void
-ARDOUR_UI::show_menu_bar_clock ()
-{
-       _menu_bar_clock.show ();
-       _menu_bar_clock.set (_session->audible_frame (), true);
-       _menu_bar_clock_connection = ARDOUR_UI::Clock.connect (sigc::bind (sigc::mem_fun (_menu_bar_clock, &AudioClock::set), 'p'));
-}
-
-void
-ARDOUR_UI::hide_menu_bar_clock ()
-{
-       _menu_bar_clock.hide ();
-       _menu_bar_clock_connection.disconnect ();
-}
-
-void
-ARDOUR_UI::menu_bar_clock_value_changed ()
-{
-       if (_session) {
-               _session->request_locate (_menu_bar_clock.current_time ());
-       }
-}