#include "engine_dialog.h"
#include "gain_meter.h"
#include "global_port_matrix.h"
+#include "gui_object.h"
#include "gui_thread.h"
#include "keyboard.h"
#include "location_ui.h"
ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
- : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp),
+ : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
- primary_clock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true),
- secondary_clock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true),
- preroll_clock (X_("preroll"), false, X_("PreRollClock"), true, false, true),
- postroll_clock (X_("postroll"), false, X_("PostRollClock"), true, false, true),
+ , gui_object_state (new GUIObjectState)
+ , primary_clock (new AudioClock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true))
+ , secondary_clock (new AudioClock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true))
+ , preroll_clock (new AudioClock (X_("preroll"), false, X_("PreRollClock"), true, false, true))
+ , postroll_clock (new AudioClock (X_("postroll"), false, X_("PostRollClock"), true, false, true))
/* preroll stuff */
- preroll_button (_("pre\nroll")),
- postroll_button (_("post\nroll")),
+ , preroll_button (_("pre\nroll"))
+ , postroll_button (_("post\nroll"))
/* big clock */
- big_clock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, false),
+ , big_clock (new AudioClock (X_("bigclock"), false, "BigClockNonRecording", true, true, false, false))
/* transport */
- roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll)),
- stop_controllable (new TransportControllable ("transport stop", *this, TransportControllable::Stop)),
- goto_start_controllable (new TransportControllable ("transport goto start", *this, TransportControllable::GotoStart)),
- goto_end_controllable (new TransportControllable ("transport goto end", *this, TransportControllable::GotoEnd)),
- auto_loop_controllable (new TransportControllable ("transport auto loop", *this, TransportControllable::AutoLoop)),
- play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection)),
- rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable)),
-
- roll_button (roll_controllable),
- stop_button (stop_controllable),
- goto_start_button (goto_start_controllable),
- goto_end_button (goto_end_controllable),
- auto_loop_button (auto_loop_controllable),
- play_selection_button (play_selection_controllable),
- rec_button (rec_controllable),
-
- punch_in_button (_("Punch In")),
- punch_out_button (_("Punch Out")),
- auto_return_button (_("Auto Return")),
- auto_play_button (_("Auto Play")),
- auto_input_button (_("Auto Input")),
- click_button (_("Click")),
- time_master_button (_("time\nmaster")),
-
- auditioning_alert_button (_("AUDITION")),
- solo_alert_button (_("SOLO")),
-
- error_log_button (_("Errors"))
+ , roll_controllable (new TransportControllable ("transport roll", *this, TransportControllable::Roll))
+ , stop_controllable (new TransportControllable ("transport stop", *this, TransportControllable::Stop))
+ , goto_start_controllable (new TransportControllable ("transport goto start", *this, TransportControllable::GotoStart))
+ , goto_end_controllable (new TransportControllable ("transport goto end", *this, TransportControllable::GotoEnd))
+ , auto_loop_controllable (new TransportControllable ("transport auto loop", *this, TransportControllable::AutoLoop))
+ , play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection))
+ , rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable))
+
+ , roll_button (roll_controllable)
+ , stop_button (stop_controllable)
+ , goto_start_button (goto_start_controllable)
+ , goto_end_button (goto_end_controllable)
+ , auto_loop_button (auto_loop_controllable)
+ , play_selection_button (play_selection_controllable)
+ , rec_button (rec_controllable)
+
+ , auto_return_button (_("Auto Return"))
+ , auto_play_button (_("Auto Play"))
+ , auto_input_button (_("Auto Input"))
+ // , click_button (_("Click"))
+ , time_master_button (_("time\nmaster"))
+
+ , auditioning_alert_button (_("AUDITION"))
+ , solo_alert_button (_("SOLO"))
+
+ , error_log_button (_("Errors"))
{
using namespace Gtk::Menu_Helpers;
ui_config = new UIConfiguration();
theme_manager = new ThemeManager();
+ key_editor = 0;
+
editor = 0;
mixer = 0;
editor = 0;
_will_create_new_session_automatically = false;
add_route_dialog = 0;
route_params = 0;
+ bundle_manager = 0;
rc_option_editor = 0;
session_option_editor = 0;
location_ui = 0;
ARDOUR::Session::AskAboutSampleRateMismatch.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::sr_mismatch_dialog, this, _1, _2));
/* handle requests to quit (coming from JACK session) */
-
+
ARDOUR::Session::Quit.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::finish, this), gui_context ());
/* handle requests to deal with missing files */
keyboard = new ArdourKeyboard(*this);
-
XMLNode* node = ARDOUR_UI::instance()->keyboard_settings();
if (node) {
keyboard->set_state (*node, Stateful::loading_state_version);
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()),
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);
-
+
starting.connect (sigc::mem_fun(*this, &ARDOUR_UI::startup));
stopping.connect (sigc::mem_fun(*this, &ARDOUR_UI::shutdown));
-
- platform_setup ();
}
/** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
_startup = new ArdourStartup ();
XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
-
+
if (audio_setup && _startup->engine_control()) {
_startup->engine_control()->set_state (*audio_setup);
}
if (setup_windows ()) {
throw failed_constructor ();
}
-
+
check_memory_locking();
/* this is the first point at which all the keybindings are available */
/* set default clock modes */
if (Profile->get_sae()) {
- primary_clock.set_mode (AudioClock::BBT);
- secondary_clock.set_mode (AudioClock::MinSec);
+ primary_clock->set_mode (AudioClock::BBT);
+ secondary_clock->set_mode (AudioClock::MinSec);
} else {
- primary_clock.set_mode (AudioClock::Timecode);
- secondary_clock.set_mode (AudioClock::BBT);
+ primary_clock->set_mode (AudioClock::Timecode);
+ secondary_clock->set_mode (AudioClock::BBT);
}
/* start the time-of-day-clock */
for (ARDOUR::DataType::iterator i = ARDOUR::DataType::begin(); i != ARDOUR::DataType::end(); ++i) {
add_window_proxy (_global_port_matrix[*i]);
}
-
+
BootMessage (string_compose (_("%1 is ready for use"), PROGRAM_NAME));
}
}
if (_session->dirty()) {
- switch (ask_about_saving_session(_("quit"))) {
+ vector<string> actions;
+ actions.push_back (_("Don't quit"));
+ actions.push_back (_("Just quit"));
+ actions.push_back (_("Save and quit"));
+ switch (ask_about_saving_session(actions)) {
case -1:
return;
break;
}
int
-ARDOUR_UI::ask_about_saving_session (const string & what)
+ARDOUR_UI::ask_about_saving_session (const vector<string>& actions)
{
ArdourDialog window (_("Unsaved Session"));
Gtk::HBox dhbox; // the hbox for the image and text
string msg;
- msg = string_compose(_("Don't %1"), what);
- window.add_button (msg, RESPONSE_REJECT);
- msg = string_compose(_("Just %1"), what);
- window.add_button (msg, RESPONSE_APPLY);
- msg = string_compose(_("Save and %1"), what);
- window.add_button (msg, RESPONSE_ACCEPT);
+ assert (actions.size() >= 3);
+
+ window.add_button (actions[0], RESPONSE_REJECT);
+ window.add_button (actions[1], RESPONSE_APPLY);
+ window.add_button (actions[2], RESPONSE_ACCEPT);
window.set_default_response (RESPONSE_ACCEPT);
noquit_button.set_name ("EditorGTKButton");
string prompt;
- string type;
if (_session->snap_name() == _session->name()) {
- type = _("session");
+ prompt = string_compose(_("The session \"%1\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"),
+ _session->snap_name());
} else {
- type = _("snapshot");
+ prompt = string_compose(_("The snapshot \"%1\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"),
+ _session->snap_name());
}
- prompt = string_compose(_("The %1 \"%2\"\nhas not been saved.\n\nAny changes made this time\nwill be lost unless you save it.\n\nWhat do you want to do?"),
- type, _session->snap_name());
prompt_label.set_text (prompt);
prompt_label.set_name (X_("PrompterLabel"));
sample_rate_label.set_text (buf);
}
+void
+ARDOUR_UI::update_format ()
+{
+ if (!_session) {
+ format_label.set_text ("");
+ return;
+ }
+
+ stringstream s;
+
+ switch (_session->config.get_native_file_header_format ()) {
+ case BWF:
+ s << "BWF";
+ break;
+ case WAVE:
+ s << "WAV";
+ break;
+ case WAVE64:
+ s << "WAV64";
+ break;
+ case CAF:
+ s << "CAF";
+ break;
+ case AIFF:
+ s << "AIFF";
+ break;
+ case iXML:
+ s << "iXML";
+ break;
+ case RF64:
+ s << "RF64";
+ break;
+ }
+
+ s << " ";
+
+ switch (_session->config.get_native_file_data_format ()) {
+ case FormatFloat:
+ s << "32-float";
+ break;
+ case FormatInt24:
+ s << "24-int";
+ break;
+ case FormatInt16:
+ s << "16-int";
+ break;
+ }
+
+ format_label.set_text (s.str ());
+}
+
void
ARDOUR_UI::update_cpu_load ()
{
ARDOUR_UI::update_buffer_load ()
{
char buf[64];
- uint32_t c, p;
if (_session) {
- c = _session->capture_load ();
- p = _session->playback_load ();
-
snprintf (buf, sizeof (buf), _("Buffers p:%" PRIu32 "%% c:%" PRIu32 "%%"),
_session->playback_load(), _session->capture_load());
buffer_load_label.set_text (buf);
//cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " _session->record_status() = " << _session->record_status() << endl;
}
-void
+void
ARDOUR_UI::transport_roll ()
{
if (!_session) {
void
ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
{
-
+
if (!_session) {
return;
}
/* drop out of loop/range playback but leave transport rolling */
if (_session->get_play_loop()) {
if (Config->get_seamless_loop()) {
- /* the disk buffers contain copies of the loop - we can't
+ /* the disk buffers contain copies of the loop - we can't
just keep playing, so stop the transport. the user
can restart as they wish.
*/
} else if (_session->get_play_range ()) {
affect_transport = false;
_session->request_play_range (0, true);
- }
- }
+ }
+ }
if (affect_transport) {
if (rolling) {
if (join_play_range_button.get_active()) {
_session->request_play_range (&editor->get_selection().time, true);
}
-
+
_session->request_transport_speed (1.0f);
}
}
if (!_session) {
return;
}
-
+
if (_session->get_play_loop()) {
if (_session->transport_rolling()) {
-
+
Location * looploc = _session->locations()->auto_loop_location();
-
+
if (looploc) {
_session->request_locate (looploc->start(), true);
_session->request_play_loop (false);
}
-
+
} else {
_session->request_play_loop (false);
}
} else {
-
+
Location * looploc = _session->locations()->auto_loop_location();
-
+
if (looploc) {
_session->request_play_loop (true);
}
auto_loop_button.set_visual_state (0);
} else if (_session->get_play_loop ()) {
-
+
auto_loop_button.set_visual_state (1);
play_selection_button.set_visual_state (0);
roll_button.set_visual_state (0);
} else {
-
+
roll_button.set_visual_state (1);
play_selection_button.set_visual_state (0);
auto_loop_button.set_visual_state (0);
prompter.set_name ("Prompter");
prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
prompter.set_title (_("Take Snapshot"));
- prompter.set_title (_("Take Snapshot"));
prompter.set_prompt (_("Name of new snapshot"));
if (!switch_to_it) {
char timebuf[128];
time_t n;
struct tm local_time;
-
+
time (&n);
localtime_r (&n, &local_time);
strftime (timebuf, sizeof(timebuf), "%FT%T", &local_time);
}
}
+/** Ask the user for the name of a new shapshot and then take it.
+ */
+
+void
+ARDOUR_UI::rename_session ()
+{
+ if (!_session) {
+ return;
+ }
+
+ ArdourPrompter prompter (true);
+ string name;
+
+ prompter.set_name ("Prompter");
+ prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT);
+ prompter.set_title (_("Rename Session"));
+ prompter.set_prompt (_("New session name"));
+
+ again:
+ switch (prompter.run()) {
+ case RESPONSE_ACCEPT:
+ {
+ prompter.get_result (name);
+
+ bool do_rename = (name.length() != 0);
+
+ if (do_rename) {
+ if (name.find ('/') != string::npos) {
+ MessageDialog msg (_("To ensure compatibility with various systems\n"
+ "session names may not contain a '/' character"));
+ msg.run ();
+ goto again;
+ }
+ if (name.find ('\\') != string::npos) {
+ MessageDialog msg (_("To ensure compatibility with various systems\n"
+ "session names may not contain a '\\' character"));
+ msg.run ();
+ goto again;
+ }
+
+ switch (_session->rename (name)) {
+ case -1: {
+ MessageDialog msg (_("That name is already in use by another directory/folder. Please try again."));
+ msg.set_position (WIN_POS_MOUSE);
+ msg.run ();
+ goto again;
+ break;
+ }
+ case 0:
+ break;
+ default: {
+ MessageDialog msg (_("Renaming this session failed.\nThings could be seriously messed up at this point"));
+ msg.set_position (WIN_POS_MOUSE);
+ msg.run ();
+ break;
+ }
+ }
+ }
+
+ break;
+ }
+
+ default:
+ break;
+ }
+}
+
void
ARDOUR_UI::save_state (const string & name, bool switch_to_it)
{
}
}
+ node->add_child_nocopy (gui_object_state->get_state());
+
_session->add_extra_xml (*node);
-
+
save_state_canfail (name, switch_to_it);
}
return ret;
}
}
- cerr << "SS canfail\n";
+
save_ardour_state (); /* XXX cannot fail? yeah, right ... */
return 0;
}
ARDOUR_UI::primary_clock_value_changed ()
{
if (_session) {
- _session->request_locate (primary_clock.current_time ());
+ _session->request_locate (primary_clock->current_time ());
}
}
ARDOUR_UI::big_clock_value_changed ()
{
if (_session) {
- _session->request_locate (big_clock.current_time ());
+ _session->request_locate (big_clock->current_time ());
}
}
ARDOUR_UI::secondary_clock_value_changed ()
{
if (_session) {
- _session->request_locate (secondary_clock.current_time ());
+ _session->request_locate (secondary_clock->current_time ());
}
}
dialog.run ();
}
-void
-ARDOUR_UI::fontconfig_dialog ()
-{
-#ifdef GTKOSX
- /* X11 users will always have fontconfig info around, but new GTK-OSX users
- may not and it can take a while to build it. Warn them.
- */
-
- std::string fontconfig = Glib::build_filename (Glib::get_home_dir(), ".fontconfig");
-
- if (!Glib::file_test (fontconfig, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
- MessageDialog msg (*_startup,
- string_compose (_("Welcome to %1.\n\n"
- "The program will take a bit longer to start up\n"
- "while the system fonts are checked.\n\n"
- "This will only be done once, and you will\n"
- "not see this message again\n"), PROGRAM_NAME),
- true,
- Gtk::MESSAGE_INFO,
- Gtk::BUTTONS_OK);
- pop_back_splash ();
- msg.show_all ();
- msg.present ();
- msg.run ();
- }
-#endif
-}
-
-void
-ARDOUR_UI::parse_cmdline_path (const std::string& cmdline_path, std::string& session_name, std::string& session_path, bool& existing_session)
-{
- existing_session = false;
-
- if (Glib::file_test (cmdline_path, Glib::FILE_TEST_IS_DIR)) {
- session_path = cmdline_path;
- existing_session = true;
- } else if (Glib::file_test (cmdline_path, Glib::FILE_TEST_IS_REGULAR)) {
- session_path = Glib::path_get_dirname (string (cmdline_path));
- existing_session = true;
- } else {
- /* it doesn't exist, assume the best */
- session_path = Glib::path_get_dirname (string (cmdline_path));
- }
-
- session_name = basename_nosuffix (string (cmdline_path));
-}
-
-int
-ARDOUR_UI::load_cmdline_session (const std::string& session_name, const std::string& session_path, bool& existing_session)
-{
- /* when this is called, the backend audio system must be running */
-
- /* the main idea here is to deal with the fact that a cmdline argument for the session
- can be interpreted in different ways - it could be a directory or a file, and before
- we load, we need to know both the session directory and the snapshot (statefile) within it
- that we are supposed to use.
- */
-
- if (session_name.length() == 0 || session_path.length() == 0) {
- return false;
- }
-
- if (Glib::file_test (session_path, Glib::FILE_TEST_IS_DIR)) {
-
- std::string predicted_session_file;
-
- predicted_session_file = session_path;
- predicted_session_file += '/';
- predicted_session_file += session_name;
- predicted_session_file += ARDOUR::statefile_suffix;
-
- if (Glib::file_test (predicted_session_file, Glib::FILE_TEST_EXISTS)) {
- existing_session = true;
- }
-
- } else if (Glib::file_test (session_path, Glib::FILE_TEST_EXISTS)) {
-
- if (session_path.find (ARDOUR::statefile_suffix) == session_path.length() - 7) {
- /* existing .ardour file */
- existing_session = true;
- }
-
- } else {
- existing_session = false;
- }
-
- /* lets just try to load it */
-
- if (create_engine ()) {
- backend_audio_error (false, _startup);
- return -1;
- }
-
- return load_session (session_path, session_name);
-}
-
bool
ARDOUR_UI::ask_about_loading_existing_session (const std::string& session_path)
{
int ret = -1;
bool likely_new = false;
- if (! load_template.empty()) {
+ if (!load_template.empty()) {
should_be_new = true;
template_name = load_template;
}
to find the session.
*/
- if (ARDOUR_COMMAND_LINE::session_name.find (statefile_suffix) != string::npos) {
+ string::size_type suffix = ARDOUR_COMMAND_LINE::session_name.find (statefile_suffix);
+
+ if (suffix != string::npos) {
session_path = Glib::path_get_dirname (ARDOUR_COMMAND_LINE::session_name);
+ session_name = ARDOUR_COMMAND_LINE::session_name.substr (0, suffix);
+ session_name = Glib::path_get_basename (session_name);
} else {
session_path = ARDOUR_COMMAND_LINE::session_name;
+ session_name = Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name);
}
- session_name = Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name);
-
} else {
bool const apply = run_startup (should_be_new, load_template);
/* not connected to the AudioEngine, so quit to avoid an infinite loop */
exit (1);
}
-
+
if (!ARDOUR_COMMAND_LINE::immediate_save.empty()) {
_session->save_state (ARDOUR_COMMAND_LINE::immediate_save, false);
exit (1);
goto_editor_window ();
}
-/** @return -2 if the load failed because we are not connected to the AudioEngine */
+/** @param snap_name Snapshot name (without .ardour suffix).
+ * @return -2 if the load failed because we are not connected to the AudioEngine.
+ */
int
ARDOUR_UI::load_session (const std::string& path, const std::string& snap_name, std::string mix_template)
{
if (removed == 0) {
MessageDialog msgd (*editor,
- _("No files were ready for cleanup"),
+ _("No files were ready for clean-up"),
true,
Gtk::MESSAGE_INFO,
(Gtk::ButtonsType)(Gtk::BUTTONS_OK) );
+ msgd.set_title (_("Clean-up"));
msgd.set_secondary_text (_("If this seems suprising, \n\
check for any existing snapshots.\n\
These may still include regions that\n\
}
- MessageDialog checker (_("Are you sure you want to cleanup?"),
+ MessageDialog checker (_("Are you sure you want to clean-up?"),
true,
Gtk::MESSAGE_QUESTION,
(Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
- checker.set_secondary_text(_("Cleanup is a destructive operation.\n\
-ALL undo/redo information will be lost if you cleanup.\n\
-Cleanup will move all unused files to a \"dead\" location."));
+ checker.set_title (_("Clean-up"));
+
+ checker.set_secondary_text(_("Clean-up is a destructive operation.\n\
+ALL undo/redo information will be lost if you clean-up.\n\
+Clean-up will move all unused files to a \"dead\" location."));
checker.add_button (Stock::CANCEL, RESPONSE_CANCEL);
- checker.add_button (_("Clean Up"), RESPONSE_ACCEPT);
+ checker.add_button (_("Clean-up"), RESPONSE_ACCEPT);
checker.set_default_response (RESPONSE_CANCEL);
checker.set_name (_("CleanupDialog"));
checker.hide();
display_cleanup_results (rep,
- _("cleaned files"),
+ _("Cleaned Files"),
_("\
The following %1 files were not in use and \n\
have been moved to:\n\n\
%2\n\n\
After a restart of Ardour,\n\n\
-Session -> Cleanup -> Flush Wastebasket\n\n\
+Session -> Clean-up -> Flush Wastebasket\n\n\
will release an additional\n\
%3 %4bytes of disk space.\n"),
_("\
-The following file was not in use and \n \
+The following file was not in use and \n\
has been moved to:\n \
%2\n\n\
After a restart of Ardour,\n\n\
-Session -> Cleanup -> Flush Wastebasket\n\n\
+Session -> Clean-up -> Flush Wastebasket\n\n\
will release an additional\n\
%3 %4bytes of disk space.\n"
));
} else {
node = Config->instant_xml(X_("Editor"));
}
-
+
if (!node) {
if (getenv("ARDOUR_INSTANT_XML_PATH")) {
node = Config->instant_xml(getenv("ARDOUR_INSTANT_XML_PATH"));
ARDOUR_UI::update_transport_clocks (framepos_t pos)
{
if (Config->get_primary_clock_delta_edit_cursor()) {
- primary_clock.set (pos, false, editor->get_preferred_edit_position(), 1);
+ primary_clock->set (pos, false, editor->get_preferred_edit_position(), 1);
} else {
- primary_clock.set (pos, 0, true);
+ primary_clock->set (pos, 0, true);
}
if (Config->get_secondary_clock_delta_edit_cursor()) {
- secondary_clock.set (pos, false, editor->get_preferred_edit_position(), 2);
+ secondary_clock->set (pos, false, editor->get_preferred_edit_position(), 2);
} else {
- secondary_clock.set (pos);
+ secondary_clock->set (pos);
}
if (big_clock_window->get()) {
- big_clock.set (pos);
+ big_clock->set (pos);
}
}
bool const h = _session->have_rec_enabled_track ();
if (r == Session::Recording && h) {
- big_clock.set_widget_name ("BigClockRecording");
+ big_clock->set_widget_name ("BigClockRecording");
} else {
- big_clock.set_widget_name ("BigClockNonRecording");
+ big_clock->set_widget_name ("BigClockNonRecording");
}
}
XMLNode* node = new XMLNode(X_("ClockModes"));
for (vector<AudioClock*>::iterator x = AudioClock::clocks.begin(); x != AudioClock::clocks.end(); ++x) {
- node->add_property ((*x)->name().c_str(), enum_2_string ((*x)->mode()));
+ XMLNode* child = new XMLNode (X_("Clock"));
+
+ child->add_property (X_("name"), (*x)->name());
+ child->add_property (X_("mode"), enum_2_string ((*x)->mode()));
+ child->add_property (X_("on"), ((*x)->off() ? X_("no") : X_("yes")));
+
+ node->add_child_nocopy (*child);
}
_session->add_extra_xml (*node);
_session->set_dirty ();
}
-
-
ARDOUR_UI::TransportControllable::TransportControllable (std::string name, ARDOUR_UI& u, ToggleType tp)
: Controllable (name), ui (u), type(tp)
{
projects / ardour.git / blobdiff