#include "gtk2ardour-config.h"
#endif
-#include <stdint.h>
-
#include <algorithm>
#include <cmath>
+#include <iostream>
+#include <cerrno>
+#include <fstream>
+
+#include <stdint.h>
#include <fcntl.h>
#include <signal.h>
#include <unistd.h>
#include <time.h>
-#include <cerrno>
-#include <fstream>
-
-#include <iostream>
#include <sys/resource.h>
#include <sys/types.h>
#include "ambiguous_file_dialog.h"
#include "ardour_ui.h"
#include "audio_clock.h"
+#include "big_clock_window.h"
#include "bundle_manager.h"
#include "engine_dialog.h"
#include "gain_meter.h"
#include "gui_object.h"
#include "gui_thread.h"
#include "keyboard.h"
+#include "keyeditor.h"
#include "location_ui.h"
#include "main_clock.h"
#include "missing_file_dialog.h"
#include "processor_box.h"
#include "prompter.h"
#include "public_editor.h"
+#include "rc_option_editor.h"
#include "route_time_axis.h"
+#include "route_params_ui.h"
#include "session_metadata_dialog.h"
+#include "session_option_editor.h"
#include "shuttle_control.h"
#include "speaker_dialog.h"
#include "splash.h"
#include "theme_manager.h"
#include "time_axis_view_item.h"
#include "utils.h"
-#include "window_proxy.h"
#include "video_server_dialog.h"
#include "add_video_dialog.h"
#include "transcode_video_dialog.h"
sigc::signal<void> ARDOUR_UI::RapidScreenUpdate;
sigc::signal<void> ARDOUR_UI::SuperRapidScreenUpdate;
sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock;
+sigc::signal<void> ARDOUR_UI::CloseAllDialogs;
ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir)
: Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
-
+
, gui_object_state (new GUIObjectState)
+
, primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, true))
, secondary_clock (new MainClock (X_("secondary"), false, X_("secondary"), true, true, false, false, true))
/* big clock */
, big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
+ , video_timeline(0)
+
+ /* start of private members */
+
+ , _startup (0)
+ , engine (0)
+ , nsm (0)
+ , _was_dirty (false)
+ , _mixer_on_top (false)
/* transport */
, solo_alert_button (_("solo"))
, feedback_alert_button (_("feedback"))
+ , speaker_config_window (X_("speaker-config"), _("Speaker Configuration"))
+ , theme_manager (X_("theme-manager"), _("Theme Manager"))
+ , key_editor (X_("key-editor"), _("Key Bindings"))
+ , rc_option_editor (X_("rc-options-editor"), _("Preferences"))
+ , add_route_dialog (X_("add-routes"), _("Add Tracks/Busses"))
+ , about (X_("about"), _("About"))
+ , location_ui (X_("locations"), _("Locations"))
+ , route_params (X_("inspector"), _("Tracks and Busses"))
+ , session_option_editor (X_("session-options-editor"), _("Properties"), boost::bind (&ARDOUR_UI::create_session_option_editor, this))
+ , add_video_dialog (X_("add-video"), _("Add Tracks/Busses"), boost::bind (&ARDOUR_UI::create_add_video_dialog, this))
+ , bundle_manager (X_("bundle-manager"), _("Bundle Manager"), boost::bind (&ARDOUR_UI::create_bundle_manager, this))
+ , big_clock_window (X_("big-clock"), _("Big Clock"), boost::bind (&ARDOUR_UI::create_big_clock_window, this))
+ , audio_port_matrix (X_("audio-connection-manager"), _("Audio Connections"), boost::bind (&ARDOUR_UI::create_global_port_matrix, this, ARDOUR::DataType::AUDIO))
+ , midi_port_matrix (X_("midi-connection-manager"), _("MIDI Connections"), boost::bind (&ARDOUR_UI::create_global_port_matrix, this, ARDOUR::DataType::MIDI))
+
, error_log_button (_("Errors"))
, _status_bar_visibility (X_("status-bar"))
{
Gtkmm2ext::init(localedir);
- about = 0;
splash = 0;
- _startup = 0;
if (theArdourUI == 0) {
theArdourUI = this;
}
ui_config = new UIConfiguration();
- theme_manager = new ThemeManager();
-
- key_editor = 0;
editor = 0;
mixer = 0;
+ meterbridge = 0;
editor = 0;
engine = 0;
_session_is_new = false;
- big_clock_window = 0;
- big_clock_height = 0;
- big_clock_resize_in_progress = false;
session_selector_window = 0;
last_key_press_time = 0;
- add_route_dialog = 0;
- add_video_dialog = 0;
video_server_process = 0;
- route_params = 0;
- bundle_manager = 0;
- rc_option_editor = 0;
- session_option_editor = 0;
- location_ui = 0;
open_session_selector = 0;
have_configure_timeout = false;
have_disk_speed_dialog_displayed = false;
session_loaded = false;
ignore_dual_punch = false;
- original_big_clock_width = -1;
- original_big_clock_height = -1;
- original_big_clock_font_size = 0;
roll_button.set_controllable (roll_controllable);
stop_button.set_controllable (stop_controllable);
TimeAxisViewItem::set_constant_heights ();
- /* The following must happen after ARDOUR::init() so that Config is set up */
-
- location_ui = new ActionWindowProxy<LocationUIWindow> (X_("locations"), Config->extra_xml (X_("UI")), X_("ToggleLocations"));
- big_clock_window = new ActionWindowProxy<Gtk::Window> (X_("bigclock"), Config->extra_xml (X_("UI")), X_("ToggleBigClock"));
- speaker_config_window = new ActionWindowProxy<SpeakerDialog> (X_("speakerconf"), Config->extra_xml (X_("UI")), X_("toggle-speaker-config"));
-
- for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
- _global_port_matrix[*i] = new ActionWindowProxy<GlobalPortMatrixWindow> (
- string_compose ("GlobalPortMatrix-%1", (*i).to_string()),
- Config->extra_xml (X_("UI")),
- string_compose ("toggle-%1-connection-manager", (*i).to_string())
- );
- }
+ /* Set this up so that our window proxies can register actions */
- setup_clock ();
+ ActionManager::init ();
- SpeakerDialog* s = new SpeakerDialog ();
- s->signal_unmap().connect (sigc::bind (sigc::ptr_fun (&ActionManager::uncheck_toggleaction), X_("<Actions>/Common/toggle-speaker-config")));
- speaker_config_window->set (s);
+ /* The following must happen after ARDOUR::init() so that Config is set up */
+ const XMLNode* ui_xml = Config->extra_xml (X_("UI"));
+
+ if (ui_xml) {
+ theme_manager.set_state (*ui_xml);
+ key_editor.set_state (*ui_xml);
+ rc_option_editor.set_state (*ui_xml);
+ session_option_editor.set_state (*ui_xml);
+ speaker_config_window.set_state (*ui_xml);
+ about.set_state (*ui_xml);
+ add_route_dialog.set_state (*ui_xml);
+ add_video_dialog.set_state (*ui_xml);
+ route_params.set_state (*ui_xml);
+ bundle_manager.set_state (*ui_xml);
+ location_ui.set_state (*ui_xml);
+ big_clock_window.set_state (*ui_xml);
+ audio_port_matrix.set_state (*ui_xml);
+ midi_port_matrix.set_state (*ui_xml);
+ }
+
+ WM::Manager::instance().register_window (&theme_manager);
+ WM::Manager::instance().register_window (&key_editor);
+ WM::Manager::instance().register_window (&rc_option_editor);
+ WM::Manager::instance().register_window (&session_option_editor);
+ WM::Manager::instance().register_window (&speaker_config_window);
+ WM::Manager::instance().register_window (&about);
+ WM::Manager::instance().register_window (&add_route_dialog);
+ WM::Manager::instance().register_window (&add_video_dialog);
+ WM::Manager::instance().register_window (&route_params);
+ WM::Manager::instance().register_window (&bundle_manager);
+ WM::Manager::instance().register_window (&location_ui);
+ WM::Manager::instance().register_window (&big_clock_window);
+ WM::Manager::instance().register_window (&audio_port_matrix);
+ WM::Manager::instance().register_window (&midi_port_matrix);
+
+ /* We need to instantiate the theme manager because it loads our
+ theme files. This should really change so that its window
+ and its functionality are separate
+ */
+
+ (void) theme_manager.get (true);
+
starting.connect (sigc::mem_fun(*this, &ARDOUR_UI::startup));
stopping.connect (sigc::mem_fun(*this, &ARDOUR_UI::shutdown));
DPIReset.connect (sigc::mem_fun (*this, &ARDOUR_UI::resize_text_widgets));
}
+GlobalPortMatrixWindow*
+ARDOUR_UI::create_global_port_matrix (ARDOUR::DataType type)
+{
+ if (!_session) {
+ return 0;
+ }
+ return new GlobalPortMatrixWindow (_session, type);
+}
int
ARDOUR_UI::create_engine ()
loading_message (_("Starting audio engine"));
try {
- engine = new ARDOUR::AudioEngine (ARDOUR_COMMAND_LINE::jack_client_name, ARDOUR_COMMAND_LINE::jack_session_uuid);
+ engine = ARDOUR::AudioEngine::create (ARDOUR_COMMAND_LINE::backend_client_name, ARDOUR_COMMAND_LINE::backend_session_uuid);
} catch (...) {
ARDOUR::init_post_engine ();
- /* load up the UI manager */
-
- ActionManager::init ();
-
_tooltips.enable();
+ ActionManager::load_menus ();
+
if (setup_windows ()) {
throw failed_constructor ();
}
update_disk_space ();
update_cpu_load ();
- update_sample_rate (engine->frame_rate());
+ update_sample_rate (engine->sample_rate());
update_timecode_format ();
Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
delete keyboard;
delete editor;
delete mixer;
- delete add_route_dialog;
- if (add_video_dialog) {
- delete add_video_dialog;
- }
+ delete meterbridge;
+
stop_video_server();
}
app->ready ();
nsm_url = getenv ("NSM_URL");
- nsm = 0;
if (nsm_url) {
nsm = new NSM_Client;
goto_editor_window ();
- /* Add the window proxies here; their addition may cause windows to be opened, and we want them
- to be opened on top of the editor window that goto_editor_window() just opened.
- */
- add_window_proxy (location_ui);
- add_window_proxy (big_clock_window);
- for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
- add_window_proxy (_global_port_matrix[*i]);
- }
+ WM::Manager::instance().show_visible ();
/* We have to do this here since goto_editor_window() ends up calling show_all() on the
* editor window, and we may want stuff to be hidden.
"runs out of memory. \n\n"
"You can view the memory limit with 'ulimit -l', "
"and it is normally controlled by %2"),
- PROGRAM_NAME).c_str(),
+ PROGRAM_NAME,
#ifdef __FreeBSD__
- X_("/etc/login.conf")
+ X_("/etc/login.conf")
#else
- X_(" /etc/security/limits.conf")
+ X_(" /etc/security/limits.conf")
#endif
- );
+ ).c_str());
msg.set_default_response (RESPONSE_OK);
second_connection.disconnect ();
point_one_second_connection.disconnect ();
- point_oh_five_second_connection.disconnect ();
- point_zero_one_second_connection.disconnect();
+ point_zero_something_second_connection.disconnect();
}
delete ARDOUR_UI::instance()->video_timeline;
+ ARDOUR_UI::instance()->video_timeline = NULL;
stop_video_server();
/* Save state before deleting the session, as that causes some
*/
save_ardour_state ();
+ close_all_dialogs ();
+
loading_message (string_compose (_("Please wait while %1 cleans up..."), PROGRAM_NAME));
if (_session) {
_session = 0;
}
- ArdourDialog::close_all_dialogs ();
- engine->stop (true);
+ engine->stop ();
quit ();
}
window.get_vbox()->pack_start (dhbox);
window.set_name (_("Prompter"));
- window.set_position (Gtk::WIN_POS_MOUSE);
window.set_modal (true);
window.set_resizable (false);
}
gint
-ARDOUR_UI::every_point_zero_one_seconds ()
+ARDOUR_UI::every_point_zero_something_seconds ()
{
- // august 2007: actual update frequency: 40Hz, not 100Hz
+ // august 2007: actual update frequency: 25Hz (40ms), not 100Hz
SuperRapidScreenUpdate(); /* EMIT_SIGNAL */
return TRUE;
} else {
- framecnt_t rate = engine->frame_rate();
+ framecnt_t rate = engine->sample_rate();
if (fmod (rate, 1000.0) != 0.0) {
snprintf (buf, sizeof (buf), _("JACK: <span foreground=\"green\">%.1f kHz / %4.1f ms</span>"),
- (float) rate/1000.0f,
- (engine->frames_per_cycle() / (float) rate) * 1000.0f);
+ (float) rate / 1000.0f,
+ (engine->usecs_per_cycle() / 1000.0f));
} else {
snprintf (buf, sizeof (buf), _("JACK: <span foreground=\"green\">%" PRId64 " kHz / %4.1f ms</span>"),
rate/1000,
- (engine->frames_per_cycle() / (float) rate) * 1000.0f);
+ (engine->usecs_per_cycle() * 1000.0f));
}
}
while (true) {
- session_selector_window->set_position (WIN_POS_MOUSE);
-
ResponseType r = (ResponseType) session_selector_window->run ();
switch (r) {
open_session_selector->set_current_folder(Config->get_default_session_parent_dir());
}
- open_session_selector->add_shortcut_folder (Config->get_default_session_parent_dir());
+ string default_session_folder = Config->get_default_session_parent_dir();
+ try {
+ /* add_shortcut_folder throws an exception if the folder being added already has a shortcut */
+ open_session_selector->add_shortcut_folder (default_session_folder);
+ }
+ catch (Glib::Error & e) {
+ std::cerr << "open_session_selector->add_shortcut_folder (" << default_session_folder << ") threw Glib::Error " << e.what() << std::endl;
+ }
FileFilter session_filter;
session_filter.add_pattern ("*.ardour");
Glib::RefPtr<Action> action;
const char* action_name = 0;
- switch (engine->frames_per_cycle()) {
+ switch (engine->samples_per_cycle()) {
case 32:
action_name = X_("JACKLatency32");
break;
{
XMLNode* node = new XMLNode (X_("UI"));
- for (list<WindowProxyBase*>::iterator i = _window_proxies.begin(); i != _window_proxies.end(); ++i) {
- if (!(*i)->rc_configured()) {
- node->add_child_nocopy (*((*i)->get_state ()));
- }
- }
+ WM::Manager::instance().add_state (*node);
node->add_child_nocopy (gui_object_state->get_state());
#endif
}
-void
-ARDOUR_UI::show_about ()
-{
- if (about == 0) {
- about = new About;
- about->signal_response().connect (sigc::mem_fun (*this, &ARDOUR_UI::about_signal_response));
- }
-
- about->set_transient_for(*editor);
- about->show_all ();
-}
-
void
ARDOUR_UI::launch_manual ()
{
PBD::open_uri (Config->get_reference_manual_url());
}
-void
-ARDOUR_UI::hide_about ()
-{
- if (about) {
- about->get_window()->set_cursor ();
- about->hide ();
- }
-}
-
-void
-ARDOUR_UI::about_signal_response (int /*response*/)
-{
- hide_about();
-}
-
void
ARDOUR_UI::loading_message (const std::string& msg)
{
return;
}
- if (add_route_dialog == 0) {
- add_route_dialog = new AddRouteDialog (_session);
- add_route_dialog->set_position (WIN_POS_MOUSE);
- if (float_window) {
- add_route_dialog->set_transient_for (*float_window);
- }
- }
-
if (add_route_dialog->is_visible()) {
/* we're already doing this */
return;
}
+ if (float_window) {
+ add_route_dialog->set_transient_for (*float_window);
+ }
+
ResponseType r = (ResponseType) add_route_dialog->run ();
add_route_dialog->hide();
Config->set_video_advanced_setup(true);
}
+ if (video_server_process) {
+ delete video_server_process;
+ }
+
video_server_process = new SystemExec(icsd_exec, argp);
- video_server_process->start();
- sleep(1);
+ if (video_server_process->start()) {
+ warning << _("Cannot launch the video-server") << endmsg;
+ continue;
+ }
+ int timeout = 120; // 6 sec
+ while (!ARDOUR_UI::instance()->video_timeline->check_server()) {
+ usleep (50000);
+ if (--timeout <= 0 || !video_server_process->is_running()) break;
+ }
+ if (timeout <= 0) {
+ warning << _("Video-server was started but does not respond to requests...") << endmsg;
+ } else {
+ if (!ARDOUR_UI::instance()->video_timeline->check_server_docroot()) {
+ delete video_server_process;
+ video_server_process = 0;
+ }
+ }
}
return true;
}
return;
}
- if (add_video_dialog == 0) {
- add_video_dialog = new AddVideoDialog (_session);
- if (float_window) {
- add_video_dialog->set_transient_for (*float_window);
- }
+ if (float_window) {
+ add_video_dialog->set_transient_for (*float_window);
}
if (add_video_dialog->is_visible()) {
/* we're already doing this */
return;
}
+
ResponseType r = (ResponseType) add_video_dialog->run ();
add_video_dialog->hide();
if (r != RESPONSE_ACCEPT) { return; }
- bool local_file;
+ bool local_file, orig_local_file;
std::string path = add_video_dialog->file_name(local_file);
+
+ std::string orig_path = path;
+ orig_local_file = local_file;
+
bool auto_set_session_fps = add_video_dialog->auto_set_session_fps();
if (local_file && !Glib::file_test(path, Glib::FILE_TEST_EXISTS)) {
node->add_property (X_("Filename"), path);
node->add_property (X_("AutoFPS"), auto_set_session_fps?X_("1"):X_("0"));
node->add_property (X_("LocalFile"), local_file?X_("1"):X_("0"));
+ if (orig_local_file) {
+ node->add_property (X_("OriginalVideoFile"), orig_path);
+ } else {
+ node->remove_property (X_("OriginalVideoFile"));
+ }
_session->add_extra_xml (*node);
_session->set_dirty ();
ARDOUR_UI::disconnect_from_jack ()
{
if (engine) {
- if (engine->disconnect_from_jack ()) {
+ if (engine->pause ()) {
MessageDialog msg (*editor, _("Could not disconnect from JACK"));
msg.run ();
}
ARDOUR_UI::reconnect_to_jack ()
{
if (engine) {
- if (engine->reconnect_to_jack ()) {
+ if (engine->start ()) {
MessageDialog msg (*editor, _("Could not reconnect to JACK"));
msg.run ();
}
secondary_clock->set (pos);
}
- if (big_clock_window->get()) {
+ if (big_clock_window) {
big_clock->set (pos);
}
ARDOUR_UI::instance()->video_timeline->manual_seek_video_monitor(pos);
}
-
void
ARDOUR_UI::step_edit_status_change (bool yn)
{
{
ENSURE_GUI_THREAD (*this, &ARDOUR_UI::record_state_changed);
- if (!_session || !big_clock_window->get()) {
+ if (!_session || !big_clock_window) {
/* why bother - the clock isn't visible */
return;
}
}
}
-/** Add a window proxy to our list, so that its state will be saved.
- * This call also causes the window to be created and opened if its
- * state was saved as `visible'.
- */
-void
-ARDOUR_UI::add_window_proxy (WindowProxyBase* p)
-{
- _window_proxies.push_back (p);
- p->maybe_show ();
-}
-
-/** Remove a window proxy from our list. Must be called if a WindowProxy
- * is deleted, to prevent hanging pointers.
- */
-void
-ARDOUR_UI::remove_window_proxy (WindowProxyBase* p)
-{
- _window_proxies.remove (p);
-}
-
int
ARDOUR_UI::missing_file (Session*s, std::string str, DataType type)
{
projects / ardour.git / blobdiff