diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-17 22:25:21 -0400 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-09-17 22:25:21 -0400 |
commit | 20fa19e69e176aa3c0a1ed8e6688acec0799daad (patch) | |
tree | 18602d78eb833b98345ccdbf92b98c993f0e943f | |
parent | 402d92889a358949af3ea7ad0dd5be88a5652626 (diff) |
more excision of "JACK" from labels, menu items, etc.
NOTE: users will lose the sample rate/latency display in the status bar display. Not yet sure what to do about this
-rw-r--r-- | gtk2_ardour/ardour_ui.cc | 67 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui.h | 2 | ||||
-rw-r--r-- | gtk2_ardour/ardour_ui_ed.cc | 56 | ||||
-rw-r--r-- | gtk2_ardour/keyeditor.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/main.cc | 11 | ||||
-rw-r--r-- | gtk2_ardour/mixer_strip.cc | 4 | ||||
-rw-r--r-- | gtk2_ardour/processor_box.cc | 2 | ||||
-rw-r--r-- | gtk2_ardour/rc_option_editor.cc | 6 |
8 files changed, 21 insertions, 129 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index eccd37fec2..74e2768b41 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -399,61 +399,19 @@ ARDOUR_UI::engine_stopped () void ARDOUR_UI::engine_running () { + cerr << "ENGINE RUNNING\n"; + if (first_time_engine_run) { post_engine(); first_time_engine_run = false; + } else { + cerr << "AGAIN...\n"; } - ActionManager::set_sensitive (ActionManager::engine_sensitive_actions, true); - ActionManager::set_sensitive (ActionManager::engine_opposite_sensitive_actions, false); - - Glib::RefPtr<Action> action; - const char* action_name = 0; - - switch (AudioEngine::instance()->samples_per_cycle()) { - case 32: - action_name = X_("JACKLatency32"); - break; - case 64: - action_name = X_("JACKLatency64"); - break; - case 128: - action_name = X_("JACKLatency128"); - break; - case 512: - action_name = X_("JACKLatency512"); - break; - case 1024: - action_name = X_("JACKLatency1024"); - break; - case 2048: - action_name = X_("JACKLatency2048"); - break; - case 4096: - action_name = X_("JACKLatency4096"); - break; - case 8192: - action_name = X_("JACKLatency8192"); - break; - default: - /* XXX can we do anything useful ? */ - break; - } - - if (action_name) { - - action = ActionManager::get_action (X_("JACK"), action_name); - - if (action) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (action); - ract->set_active (); - } - - update_disk_space (); - update_cpu_load (); - update_sample_rate (AudioEngine::instance()->sample_rate()); - update_timecode_format (); - } + update_disk_space (); + update_cpu_load (); + update_sample_rate (AudioEngine::instance()->sample_rate()); + update_timecode_format (); } void @@ -481,13 +439,13 @@ ARDOUR_UI::engine_halted (const char* reason, bool free_reason) */ if (strlen (reason)) { - msgstr = string_compose (_("The audio backend (JACK) was shutdown because:\n\n%1"), reason); + msgstr = string_compose (_("The audio backend was shutdown because:\n\n%1"), reason); } else { msgstr = string_compose (_("\ -JACK has either been shutdown or it\n\ +`The audio backend has either been shutdown or it\n\ disconnected %1 because %1\n\ was not fast enough. Try to restart\n\ -JACK, reconnect and save the session."), PROGRAM_NAME); +the audio backend and save the session."), PROGRAM_NAME); } MessageDialog msg (*editor, msgstr); @@ -1126,6 +1084,8 @@ ARDOUR_UI::update_sample_rate (framecnt_t) { char buf[64]; + cerr << "USR\n"; + ENSURE_GUI_THREAD (*this, &ARDOUR_UI::update_sample_rate, ignored) if (!AudioEngine::instance()->connected()) { @@ -1152,6 +1112,7 @@ ARDOUR_UI::update_sample_rate (framecnt_t) } } } + cerr << "SRL = " << buf << endl; sample_rate_label.set_markup (buf); } diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index c84a279320..ea03c8590f 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -670,8 +670,6 @@ class ARDOUR_UI : public Gtkmm2ext::UI, public ARDOUR::SessionHandlePtr int pending_state_dialog (); int sr_mismatch_dialog (ARDOUR::framecnt_t, ARDOUR::framecnt_t); - void set_engine_buffer_size (ARDOUR::pframes_t); - Gtk::MenuItem* jack_disconnect_item; Gtk::MenuItem* jack_reconnect_item; Gtk::Menu* jack_bufsize_menu; diff --git a/gtk2_ardour/ardour_ui_ed.cc b/gtk2_ardour/ardour_ui_ed.cc index b64498fb33..96bbd8c4e3 100644 --- a/gtk2_ardour/ardour_ui_ed.cc +++ b/gtk2_ardour/ardour_ui_ed.cc @@ -397,60 +397,6 @@ ARDOUR_UI::install_actions () } void -ARDOUR_UI::set_engine_buffer_size (pframes_t nframes) -{ - Glib::RefPtr<Action> action; - const char* action_name = 0; - - switch (nframes) { - case 32: - action_name = X_("EngineLatency32"); - break; - case 64: - action_name = X_("EngineLatency64"); - break; - case 128: - action_name = X_("EngineLatency128"); - break; - case 256: - action_name = X_("EngineLatency256"); - break; - case 512: - action_name = X_("EngineLatency512"); - break; - case 1024: - action_name = X_("EngineLatency1024"); - break; - case 2048: - action_name = X_("EngineLatency2048"); - break; - case 4096: - action_name = X_("EngineLatency4096"); - break; - case 8192: - action_name = X_("EngineLatency8192"); - break; - default: - /* XXX can we do anything useful ? */ - break; - } - - if (action_name) { - - action = ActionManager::get_action (X_("JACK"), action_name); - - if (action) { - Glib::RefPtr<RadioAction> ract = Glib::RefPtr<RadioAction>::cast_dynamic (action); - - if (ract && ract->get_active()) { - AudioEngine::instance()->request_buffer_size (nframes); - update_sample_rate (0); - } - } - } -} - -void ARDOUR_UI::build_menu_bar () { menu_bar = dynamic_cast<MenuBar*> (ActionManager::get_widget (X_("/Main"))); @@ -528,7 +474,7 @@ ARDOUR_UI::build_menu_bar () _status_bar_visibility.add (&disk_space_label, X_("Disk"), _("Disk Space"), disk_space); _status_bar_visibility.add (&cpu_load_label, X_("DSP"), _("DSP"), true); _status_bar_visibility.add (&buffer_load_label, X_("Buffers"), _("Buffers"), true); - _status_bar_visibility.add (&sample_rate_label, X_("JACK"), _("JACK Sampling Rate and Latency"), true); + _status_bar_visibility.add (&sample_rate_label, X_("Audio"), _("Audio"), true); _status_bar_visibility.add (&timecode_format_label, X_("TCFormat"), _("Timecode Format"), true); _status_bar_visibility.add (&format_label, X_("Format"), _("File Format"), true); diff --git a/gtk2_ardour/keyeditor.cc b/gtk2_ardour/keyeditor.cc index 07042a1cdf..f23e246958 100644 --- a/gtk2_ardour/keyeditor.cc +++ b/gtk2_ardour/keyeditor.cc @@ -250,8 +250,6 @@ KeyEditor::populate () //kinda kludgy way to avoid displaying menu items as mappable if ( parts[1] == _("Main_menu") ) continue; - if ( parts[1] == _("JACK") ) - continue; if ( parts[1] == _("redirectmenu") ) continue; if ( parts[1] == _("Editor_menus") ) diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index c8f8d76a98..a7497f96fb 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -36,8 +36,6 @@ #include "pbd/boost_debug.h" #endif -#include <jack/jack.h> - #include "ardour/revision.h" #include "ardour/version.h" #include "ardour/ardour.h" @@ -80,17 +78,10 @@ static const char* localedir = LOCALEDIR; void gui_jack_error () { - MessageDialog win (string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME), + MessageDialog win (string_compose (_("%1 could not connect to the audio backend."), PROGRAM_NAME), false, Gtk::MESSAGE_INFO, Gtk::BUTTONS_NONE); - win.set_secondary_text(string_compose (_("There are several possible reasons:\n\ -\n\ -1) JACK is not running.\n\ -2) JACK is running as another user, perhaps root.\n\ -3) There is already another client called \"%1\".\n\ -\n\ -Please consider the possibilities, and perhaps (re)start JACK."), PROGRAM_NAME)); win.add_button (Stock::QUIT, RESPONSE_CLOSE); win.set_default_response (RESPONSE_CLOSE); diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index d77023d201..50594378de 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -698,7 +698,7 @@ MixerStrip::output_press (GdkEventButton *ev) { using namespace Menu_Helpers; if (!_session->engine().connected()) { - MessageDialog msg (_("Not connected to JACK - no I/O changes are possible")); + MessageDialog msg (_("Not connected to audio engine - no I/O changes are possible")); msg.run (); return true; } @@ -826,7 +826,7 @@ MixerStrip::input_press (GdkEventButton *ev) citems.clear(); if (!_session->engine().connected()) { - MessageDialog msg (_("Not connected to JACK - no I/O changes are possible")); + MessageDialog msg (_("Not connected to audio engine - no I/O changes are possible")); msg.run (); return true; } diff --git a/gtk2_ardour/processor_box.cc b/gtk2_ardour/processor_box.cc index d475e28605..17f548c0e3 100644 --- a/gtk2_ardour/processor_box.cc +++ b/gtk2_ardour/processor_box.cc @@ -2151,7 +2151,7 @@ ProcessorBox::get_editor_window (boost::shared_ptr<Processor> processor, bool us } else if ((port_insert = boost::dynamic_pointer_cast<PortInsert> (processor)) != 0) { if (!_session->engine().connected()) { - MessageDialog msg ( _("Not connected to JACK - no I/O changes are possible")); + MessageDialog msg ( _("Not connected to audio engine - no I/O changes are possible")); msg.run (); return 0; } diff --git a/gtk2_ardour/rc_option_editor.cc b/gtk2_ardour/rc_option_editor.cc index ed9ffda4ef..f9336cee31 100644 --- a/gtk2_ardour/rc_option_editor.cc +++ b/gtk2_ardour/rc_option_editor.cc @@ -1146,7 +1146,7 @@ RCOptionEditor::RCOptionEditor () tsf = new BoolOption ( "seamless-loop", - _("Do seamless looping (not possible when slaved to MTC, JACK etc)"), + _("Do seamless looping (not possible when slaved to MTC, LTC etc)"), sigc::mem_fun (*_rc_config, &RCConfiguration::get_seamless_loop), sigc::mem_fun (*_rc_config, &RCConfiguration::set_seamless_loop) ); @@ -1464,12 +1464,10 @@ RCOptionEditor::RCOptionEditor () sigc::mem_fun (*_rc_config, &RCConfiguration::set_monitoring_model) ); -#ifndef __APPLE__ - /* no JACK monitoring on CoreAudio */ if (AudioEngine::instance()->port_engine().can_monitor_input()) { mm->add (HardwareMonitoring, _("via Audio Driver")); } -#endif + mm->add (SoftwareMonitoring, _("ardour")); mm->add (ExternalMonitoring, _("audio hardware")); |