#include <iostream>
#include <sys/resource.h>
+#include <sys/types.h>
+#include <sys/sysctl.h>
#include <gtkmm/messagedialog.h>
#include <gtkmm/accelmap.h>
#include "midi++/manager.h"
#include "ardour/ardour.h"
-#include "ardour/callback.h"
+#include "ardour/audioengine.h"
+#include "ardour/audiofilesource.h"
+#include "ardour/automation_watch.h"
+#include "ardour/diskstream.h"
+#include "ardour/filename_extensions.h"
+#include "ardour/port.h"
+#include "ardour/process_thread.h"
#include "ardour/profile.h"
+#include "ardour/recent_sessions.h"
#include "ardour/session_directory.h"
#include "ardour/session_route.h"
#include "ardour/session_state_utils.h"
#include "ardour/session_utils.h"
-#include "ardour/port.h"
-#include "ardour/audioengine.h"
-#include "ardour/playlist.h"
-#include "ardour/utils.h"
-#include "ardour/audio_diskstream.h"
-#include "ardour/audiofilesource.h"
-#include "ardour/recent_sessions.h"
-#include "ardour/port.h"
-#include "ardour/audio_track.h"
-#include "ardour/midi_track.h"
-#include "ardour/filesystem_paths.h"
-#include "ardour/filename_extensions.h"
-#include "ardour/process_thread.h"
+#include "ardour/slave.h"
+
+#include "timecode/time.h"
typedef uint64_t microseconds_t;
#include "gui_thread.h"
#include "keyboard.h"
#include "location_ui.h"
+#include "main_clock.h"
#include "missing_file_dialog.h"
#include "missing_plugin_dialog.h"
#include "mixer_ui.h"
+#include "mouse_cursors.h"
#include "opts.h"
#include "processor_box.h"
#include "prompter.h"
using namespace PBD;
using namespace Gtkmm2ext;
using namespace Gtk;
+using namespace std;
ARDOUR_UI *ARDOUR_UI::theArdourUI = 0;
UIConfiguration *ARDOUR_UI::ui_config = 0;
sigc::signal<void> ARDOUR_UI::SuperRapidScreenUpdate;
sigc::signal<void, framepos_t, bool, framepos_t> ARDOUR_UI::Clock;
-bool could_be_a_valid_path (const string& path);
-
-ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[])
+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 AudioClock (X_("primary"), false, X_("TransportClockDisplay"), true, true, false, true))
- , secondary_clock (new AudioClock (X_("secondary"), false, X_("SecondaryClockDisplay"), true, true, false, true))
+ , 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, "BigClockNonRecording", true, true, false, false))
+ , big_clock (new AudioClock (X_("bigclock"), false, "big", true, true, false, false))
/* transport */
, play_selection_controllable (new TransportControllable ("transport play selection", *this, TransportControllable::PlaySelection))
, rec_controllable (new TransportControllable ("transport rec-enable", *this, TransportControllable::RecordEnable))
- , auto_return_button (_("Auto Return"))
- , auto_play_button (_("Auto Play"))
- , auto_input_button (_("Auto Input"))
- // , click_button (_("Click"))
- , time_master_button (_("time\nmaster"))
+ , auto_return_button (ArdourButton::led_default_elements)
+ , follow_edits_button (ArdourButton::led_default_elements)
+ , auto_input_button (ArdourButton::led_default_elements)
- , auditioning_alert_button (_("AUDITION"))
- , solo_alert_button (_("SOLO"))
+ , auditioning_alert_button (_("audition"))
+ , solo_alert_button (_("solo"))
+ , feedback_alert_button (_("feedback"))
, error_log_button (_("Errors"))
, _status_bar_visibility (X_("status-bar"))
+ , _feedback_exists (false)
{
- using namespace Gtk::Menu_Helpers;
-
- Gtkmm2ext::init();
-
-
-#ifdef TOP_MENUBAR
- // _auto_display_errors = false;
- /*
- * This was commented out as it wasn't defined
- * in A3 IIRC. If this is not needed it should
- * be completely removed.
- */
-#endif
+ Gtkmm2ext::init(localedir);
about = 0;
splash = 0;
big_clock_resize_in_progress = false;
session_selector_window = 0;
last_key_press_time = 0;
- _will_create_new_session_automatically = false;
add_route_dialog = 0;
route_params = 0;
bundle_manager = 0;
auto_loop_button.set_name ("transport button");
play_selection_button.set_name ("transport button");
rec_button.set_name ("transport recenable button");
- join_play_range_button.set_name ("transport button");
-
- roll_button.set_tweaks (ArdourButton::ShowHover);
- stop_button.set_tweaks (ArdourButton::ShowHover);
- auto_loop_button.set_tweaks (ArdourButton::ShowHover);
- play_selection_button.set_tweaks (ArdourButton::ShowHover);
- rec_button.set_tweaks (ArdourButton::ShowHover);
- join_play_range_button.set_tweaks (ArdourButton::ShowHover);
+ midi_panic_button.set_name ("transport button");
- goto_start_button.set_tweaks (ArdourButton::Tweaks(ArdourButton::ShowClick|ArdourButton::ShowHover));
- goto_end_button.set_tweaks (ArdourButton::Tweaks(ArdourButton::ShowClick|ArdourButton::ShowHover));
+ goto_start_button.set_tweaks (ArdourButton::ShowClick);
+ goto_end_button.set_tweaks (ArdourButton::ShowClick);
+ midi_panic_button.set_tweaks (ArdourButton::ShowClick);
last_configure_time= 0;
last_peak_grab = 0;
/* handle dialog requests */
- ARDOUR::Session::Dialog.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::session_dialog, this, _1), gui_context());
+ ARDOUR::Session::Dialog.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::session_dialog, this, _1), gui_context());
/* handle pending state with a dialog (PROBLEM: needs to return a value and thus cannot be x-thread) */
/* handle requests to quit (coming from JACK session) */
- ARDOUR::Session::Quit.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::finish, this), gui_context ());
+ ARDOUR::Session::Quit.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::finish, this), gui_context ());
+
+ /* tell the user about feedback */
+
+ ARDOUR::Session::FeedbackDetected.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::feedback_detected, this), gui_context ());
+ ARDOUR::Session::SuccessfulGraphSort.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::successful_graph_sort, this), gui_context ());
/* handle requests to deal with missing files */
/* lets get this party started */
try {
- if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization)) {
+ if (ARDOUR::init (ARDOUR_COMMAND_LINE::use_vst, ARDOUR_COMMAND_LINE::try_hw_optimization, localedir)) {
throw failed_constructor ();
}
setup_gtk_ardour_enums ();
setup_profile ();
- GainMeter::setup_slider_pix ();
- RouteTimeAxisView::setup_slider_pix ();
- SendProcessorEntry::setup_slider_pix ();
SessionEvent::create_per_thread_pool ("GUI", 512);
} catch (failed_constructor& err) {
_process_thread = new ProcessThread ();
_process_thread->init ();
-}
-/** @return true if a session was chosen and `apply' clicked, otherwise false if `cancel' was clicked */
-bool
-ARDOUR_UI::run_startup (bool should_be_new, string load_template)
-{
- delete _startup;
- _startup = new ArdourStartup ();
-
- XMLNode* audio_setup = Config->extra_xml ("AudioSetup");
-
- if (audio_setup && _startup->engine_control()) {
- _startup->engine_control()->set_state (*audio_setup);
- }
-
- _startup->set_new_only (should_be_new);
- if (!load_template.empty()) {
- _startup->set_load_template( load_template );
- }
- _startup->present ();
-
- main().run();
-
- _startup->hide ();
-
- switch (_startup->response()) {
- case RESPONSE_OK:
- return true;
- default:
- return false;
- }
+ DPIReset.connect (sigc::mem_fun (*this, &ARDOUR_UI::resize_text_widgets));
}
+
int
ARDOUR_UI::create_engine ()
{
engine->Stopped.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_stopped, this), gui_context());
engine->Running.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::engine_running, this), gui_context());
- engine->SampleRateChanged.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
+ engine->SampleRateChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::update_sample_rate, this, _1), gui_context());
engine->Halted.connect_same_thread (forever_connections, boost::bind (&ARDOUR_UI::engine_halted, this, _1, false));
ARDOUR::init_post_engine ();
+ /* load up the UI manager */
+
ActionManager::init ();
+
_tooltips.enable();
if (setup_windows ()) {
vector<string>::iterator n;
vector<string>::iterator k;
for (n = names.begin(), k = keys.begin(); n != names.end(); ++n, ++k) {
- cerr << "Action: " << (*n) << " bound to " << (*k) << endl;
+ cout << "Action: " << (*n) << " bound to " << (*k) << endl;
}
exit (0);
#ifndef GTKOSX
/* OS X provides a nearly-always visible wallclock, so don't be stupid */
update_wall_clock ();
- Glib::signal_timeout().connect (sigc::mem_fun(*this, &ARDOUR_UI::update_wall_clock), 60000);
+ Glib::signal_timeout().connect_seconds (sigc::mem_fun(*this, &ARDOUR_UI::update_wall_clock), 1);
#endif
update_disk_space ();
update_cpu_load ();
update_sample_rate (engine->frame_rate());
+ update_timecode_format ();
- Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
+ Config->ParameterChanged.connect (forever_connections, MISSING_INVALIDATOR, boost::bind (&ARDOUR_UI::parameter_changed, this, _1), gui_context());
boost::function<void (string)> pc (boost::bind (&ARDOUR_UI::parameter_changed, this, _1));
Config->map_parameters (pc);
}
void
-ARDOUR_UI::pop_back_splash ()
+ARDOUR_UI::pop_back_splash (Gtk::Window& win)
{
if (Splash::instance()) {
- // Splash::instance()->pop_back();
- Splash::instance()->hide ();
+ Splash::instance()->pop_back_for (win);
}
}
return true;
} else {
have_configure_timeout = false;
- cerr << "config event-driven save\n";
save_ardour_state ();
return false;
}
if ((prop = node.property ("shuttle")) != 0) {
shuttle_box->controllable()->set_id (prop->value());
}
-
}
XMLNode&
}
}
-void
-ARDOUR_UI::backend_audio_error (bool we_set_params, Gtk::Window* toplevel)
-{
- string title;
- if (we_set_params) {
- title = string_compose (_("%1 could not start JACK"), PROGRAM_NAME);
- } else {
- title = string_compose (_("%1 could not connect to JACK."), PROGRAM_NAME);
- }
-
- MessageDialog win (title,
- false,
- Gtk::MESSAGE_INFO,
- Gtk::BUTTONS_NONE);
-
- if (we_set_params) {
- win.set_secondary_text(_("There are several possible reasons:\n\
-\n\
-1) You requested audio parameters that are not supported..\n\
-2) JACK is running as another user.\n\
-\n\
-Please consider the possibilities, and perhaps try different parameters."));
- } else {
- win.set_secondary_text(_("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 \"ardour\".\n\
-\n\
-Please consider the possibilities, and perhaps (re)start JACK."));
- }
-
- if (toplevel) {
- win.set_transient_for (*toplevel);
- }
-
- if (we_set_params) {
- win.add_button (Stock::OK, RESPONSE_CLOSE);
- } else {
- win.add_button (Stock::QUIT, RESPONSE_CLOSE);
- }
-
- win.set_default_response (RESPONSE_CLOSE);
-
- win.show_all ();
- win.set_position (Gtk::WIN_POS_CENTER);
- pop_back_splash ();
-
- /* we just don't care about the result, but we want to block */
-
- win.run ();
-}
-
void
ARDOUR_UI::startup ()
{
struct rlimit limits;
int64_t ram;
long pages, page_size;
-
- if ((page_size = sysconf (_SC_PAGESIZE)) < 0 ||(pages = sysconf (_SC_PHYS_PAGES)) < 0) {
+#ifdef __FreeBSD__
+ size_t pages_len=sizeof(pages);
+ if ((page_size = getpagesize()) < 0 ||
+ sysctlbyname("hw.availpages", &pages, &pages_len, NULL, 0))
+#else
+ if ((page_size = sysconf (_SC_PAGESIZE)) < 0 ||(pages = sysconf (_SC_PHYS_PAGES)) < 0)
+#endif
+ {
ram = 0;
} else {
ram = (int64_t) pages * (int64_t) page_size;
"This might cause %1 to run out of memory before your system "
"runs out of memory. \n\n"
"You can view the memory limit with 'ulimit -l', "
- "and it is normally controlled by /etc/security/limits.conf"),
- PROGRAM_NAME).c_str());
+ "and it is normally controlled by %2"),
+ PROGRAM_NAME).c_str(),
+#ifdef __FreeBSD__
+ X_("/etc/login.conf")
+#else
+ X_(" /etc/security/limits.conf")
+#endif
+ );
+
+ msg.set_default_response (RESPONSE_OK);
VBox* vbox = msg.get_vbox();
HBox hbox;
CheckButton cb (_("Do not show this window again"));
cb.signal_toggled().connect (sigc::mem_fun (*this, &ARDOUR_UI::no_memory_warning));
-
+
hbox.pack_start (cb, true, false);
vbox->pack_start (hbox);
cb.show();
vbox->show();
hbox.show ();
- pop_back_splash ();
+ pop_back_splash (msg);
editor->ensure_float (msg);
msg.run ();
ARDOUR_UI::finish()
{
if (_session) {
- int tries = 0;
-
- if (_session->transport_rolling() && (++tries < 8)) {
- _session->request_stop (false, true);
- usleep (10000);
- }
if (_session->dirty()) {
vector<string> actions;
if (save_state_canfail ("")) {
/* failed - don't quit */
MessageDialog msg (*editor,
- _("\
-Ardour was unable to save your session.\n\n\
+ string_compose (_("\
+%1 was unable to save your session.\n\n\
If you still wish to quit, please use the\n\n\
-\"Just quit\" option."));
- pop_back_splash();
+\"Just quit\" option."), PROGRAM_NAME));
+ pop_back_splash(msg);
msg.run ();
return;
}
*/
save_ardour_state ();
+ loading_message (string_compose (_("Please wait while %1 cleans up..."), PROGRAM_NAME));
+
if (_session) {
// _session->set_deletion_in_progress ();
_session->set_clean ();
return -1;
}
+
gint
ARDOUR_UI::every_second ()
{
update_cpu_load ();
update_buffer_load ();
update_disk_space ();
+ update_timecode_format ();
return TRUE;
}
if (!engine->connected()) {
- snprintf (buf, sizeof (buf), _("disconnected"));
+ snprintf (buf, sizeof (buf), "%s", _("disconnected"));
} else {
}
stringstream s;
- s << "File: <span foreground=\"green\">";
+ s << _("File:") << X_(" <span foreground=\"green\">");
switch (_session->config.get_native_file_header_format ()) {
case BWF:
- s << "BWF";
+ s << _("BWF");
break;
case WAVE:
- s << "WAV";
+ s << _("WAV");
break;
case WAVE64:
- s << "WAV64";
+ s << _("WAV64");
break;
case CAF:
- s << "CAF";
+ s << _("CAF");
break;
case AIFF:
- s << "AIFF";
+ s << _("AIFF");
break;
case iXML:
- s << "iXML";
+ s << _("iXML");
break;
case RF64:
- s << "RF64";
+ s << _("RF64");
break;
}
switch (_session->config.get_native_file_data_format ()) {
case FormatFloat:
- s << "32-float";
+ s << _("32-float");
break;
case FormatInt24:
- s << "24-int";
+ s << _("24-int");
break;
case FormatInt16:
- s << "16-int";
+ s << _("16-int");
break;
}
- s << "</span>";
+ s << X_("</span>");
format_label.set_markup (s.str ());
}
{
char buf[64];
- /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::build_menu_bar
+ /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::resize_text_widgets
should also be changed.
*/
uint32_t const playback = _session ? _session->playback_load () : 100;
uint32_t const capture = _session ? _session->capture_load () : 100;
- /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::build_menu_bar
+ /* If this text is changed, the set_size_request_to_display_given_text call in ARDOUR_UI::resize_text_widgets
should also be changed.
*/
return;
}
- framecnt_t frames = _session->available_capture_duration();
+ boost::optional<framecnt_t> opt_frames = _session->available_capture_duration();
char buf[64];
framecnt_t fr = _session->frame_rate();
- if (frames == max_framecnt) {
- snprintf (buf, sizeof (buf), _("Disk: <span foreground=\"green\">24hrs+</span>"));
+ if (!opt_frames) {
+ /* Available space is unknown */
+ snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">Unknown</span>"));
+ } else if (opt_frames.get_value_or (0) == max_framecnt) {
+ snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">24hrs+</span>"));
} else {
rec_enabled_streams = 0;
_session->foreach_route (this, &ARDOUR_UI::count_recenabled_streams);
+ framecnt_t frames = opt_frames.get_value_or (0);
+
if (rec_enabled_streams) {
frames /= rec_enabled_streams;
}
int secs;
hrs = frames / (fr * 3600);
- frames -= hrs * fr * 3600;
- mins = frames / (fr * 60);
- frames -= mins * fr * 60;
- secs = frames / fr;
-
- bool const low = (hrs == 0 && mins <= 30);
- snprintf (
- buf, sizeof(buf),
- _("Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"),
- low ? X_("red") : X_("green"),
- hrs, mins, secs
- );
+ if (hrs > 24) {
+ snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">>24 hrs</span>"));
+ } else {
+ frames -= hrs * fr * 3600;
+ mins = frames / (fr * 60);
+ frames -= mins * fr * 60;
+ secs = frames / fr;
+
+ bool const low = (hrs == 0 && mins <= 30);
+
+ snprintf (
+ buf, sizeof(buf),
+ _("Disk: <span foreground=\"%s\">%02dh:%02dm:%02ds</span>"),
+ low ? X_("red") : X_("green"),
+ hrs, mins, secs
+ );
+ }
}
disk_space_label.set_markup (buf);
+}
+
+void
+ARDOUR_UI::update_timecode_format ()
+{
+ char buf[64];
- // An attempt to make the disk space label flash red when space has run out.
+ if (_session) {
+ bool matching;
+ TimecodeSlave* tcslave;
+ SyncSource sync_src = Config->get_sync_source();
- if (frames < fr * 60 * 5) {
- /* disk_space_box.style ("disk_space_label_empty"); */
+ if ((sync_src == LTC || sync_src == MTC) && (tcslave = dynamic_cast<TimecodeSlave*>(_session->slave())) != 0) {
+ matching = (tcslave->apparent_timecode_format() == _session->config.get_timecode_format());
+ } else {
+ matching = true;
+ }
+
+ snprintf (buf, sizeof (buf), S_("Timecode|TC: <span foreground=\"%s\">%s</span>"),
+ matching ? X_("green") : X_("red"),
+ Timecode::timecode_format_name (_session->config.get_timecode_format()).c_str());
} else {
- /* disk_space_box.style ("disk_space_label"); */
+ snprintf (buf, sizeof (buf), "TC: n/a");
}
-}
+ timecode_format_label.set_markup (buf);
+}
gint
ARDOUR_UI::update_wall_clock ()
{
time_t now;
struct tm *tm_now;
- char buf[16];
+ static int last_min = -1;
time (&now);
tm_now = localtime (&now);
+ if (last_min != tm_now->tm_min) {
+ char buf[16];
+ sprintf (buf, "%02d:%02d", tm_now->tm_hour, tm_now->tm_min);
+ wall_clock_label.set_text (buf);
+ last_min = tm_now->tm_min;
+ }
- sprintf (buf, "%02d:%02d", tm_now->tm_hour, tm_now->tm_min);
- wall_clock_label.set_text (buf);
-
- return TRUE;
-}
-
-gint
-ARDOUR_UI::session_menu (GdkEventButton */*ev*/)
-{
- session_popup_menu->popup (0, 0);
return TRUE;
}
void
ARDOUR_UI::redisplay_recent_sessions ()
{
- std::vector<sys::path> session_directories;
+ std::vector<std::string> session_directories;
RecentSessionsSorter cmp;
recent_session_display.set_model (Glib::RefPtr<TreeModel>(0));
recent_session_display.set_model (recent_session_model);
return;
}
- //
+
// sort them alphabetically
sort (rs.begin(), rs.end(), cmp);
session_directories.push_back ((*i).second);
}
- for (vector<sys::path>::const_iterator i = session_directories.begin();
+ for (vector<std::string>::const_iterator i = session_directories.begin();
i != session_directories.end(); ++i)
{
- std::vector<sys::path> state_file_paths;
+ std::vector<std::string> state_file_paths;
// now get available states for this session
vector<string*>* states;
vector<const gchar*> item;
- string fullpath = (*i).to_string();
+ string fullpath = *i;
/* remove any trailing / */
- if (fullpath[fullpath.length()-1] == '/') {
- fullpath = fullpath.substr (0, fullpath.length()-1);
+ if (fullpath[fullpath.length() - 1] == '/') {
+ fullpath = fullpath.substr (0, fullpath.length() - 1);
}
/* check whether session still exists */
if (!Glib::file_test(fullpath.c_str(), Glib::FILE_TEST_EXISTS)) {
/* session doesn't exist */
- cerr << "skipping non-existent session " << fullpath << endl;
continue;
}
row[recent_session_columns.visible_name] = Glib::path_get_basename (fullpath);
row[recent_session_columns.fullpath] = fullpath;
+ row[recent_session_columns.tip] = Glib::Markup::escape_text (fullpath);
if (state_file_names.size() > 1) {
child_row[recent_session_columns.visible_name] = *i2;
child_row[recent_session_columns.fullpath] = fullpath;
+ child_row[recent_session_columns.tip] = Glib::Markup::escape_text (fullpath);
}
}
}
+ recent_session_display.set_tooltip_column(1); // recent_session_columns.tip
recent_session_display.set_model (recent_session_model);
}
recent_session_display.show();
scroller->show();
- //session_selector_window->get_vbox()->show();
}
void
_("%1 is not connected to JACK\n"
"You cannot open or close sessions in this condition"),
PROGRAM_NAME));
- pop_back_splash ();
+ pop_back_splash (msg);
msg.run ();
return false;
}
open_session_selector->add_button (Gtk::Stock::CANCEL, Gtk::RESPONSE_CANCEL);
open_session_selector->add_button (Gtk::Stock::OPEN, Gtk::RESPONSE_ACCEPT);
open_session_selector->set_default_response(Gtk::RESPONSE_ACCEPT);
+
+ if (_session) {
+ string session_parent_dir = Glib::path_get_dirname(_session->path());
+ string::size_type last_dir_sep = session_parent_dir.rfind(G_DIR_SEPARATOR);
+ session_parent_dir = session_parent_dir.substr(0, last_dir_sep);
+ open_session_selector->set_current_folder(session_parent_dir);
+ } else {
+ open_session_selector->set_current_folder(Config->get_default_session_parent_dir());
+ }
+
+ open_session_selector->add_shortcut_folder (Config->get_default_session_parent_dir());
FileFilter session_filter;
session_filter.add_pattern ("*.ardour");
void
-ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many, string const & name_template)
+ARDOUR_UI::session_add_mixed_track (const ChanCount& input, const ChanCount& output, RouteGroup* route_group,
+ uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
{
list<boost::shared_ptr<MidiTrack> > tracks;
}
try {
- if (disk) {
-
- tracks = _session->new_midi_track (ARDOUR::Normal, route_group, how_many, name_template);
-
- if (tracks.size() != how_many) {
- if (how_many == 1) {
- error << _("could not create a new midi track") << endmsg;
- } else {
- error << string_compose (_("could not create %1 new midi tracks"), how_many) << endmsg;
- }
- }
- } /*else {
- if ((route = _session->new_midi_route ()) == 0) {
- error << _("could not create new midi bus") << endmsg;
- }
- }*/
+ tracks = _session->new_midi_track (input, output, instrument, ARDOUR::Normal, route_group, how_many, name_template);
+
+ if (tracks.size() != how_many) {
+ error << string_compose(P_("could not create %1 new mixed track", "could not create %1 new mixed tracks", how_many), how_many) << endmsg;
+ }
}
catch (...) {
msg.run ();
}
}
+
+
+void
+ARDOUR_UI::session_add_midi_route (bool disk, RouteGroup* route_group, uint32_t how_many, const string& name_template, PluginInfoPtr instrument)
+{
+ ChanCount one_midi_channel;
+ one_midi_channel.set (DataType::MIDI, 1);
+ if (disk) {
+ session_add_mixed_track (one_midi_channel, one_midi_channel, route_group, how_many, name_template, instrument);
+ }
+}
void
ARDOUR_UI::session_add_audio_route (
tracks = _session->new_audio_track (input_channels, output_channels, mode, route_group, how_many, name_template);
if (tracks.size() != how_many) {
- if (how_many == 1) {
- error << _("could not create a new audio track") << endmsg;
- } else {
- error << string_compose (_("could only create %1 of %2 new audio %3"),
- tracks.size(), how_many, (track ? _("tracks") : _("busses"))) << endmsg;
- }
+ error << string_compose (P_("could not create %1 new audio track", "could not create %1 new audio tracks", how_many), how_many)
+ << endmsg;
}
} else {
routes = _session->new_audio_route (input_channels, output_channels, route_group, how_many, name_template);
if (routes.size() != how_many) {
- if (how_many == 1) {
- error << _("could not create a new audio bus") << endmsg;
- } else {
- error << string_compose (_("could not create %1 new audio busses"), how_many) << endmsg;
- }
+ error << string_compose (P_("could not create %1 new audio bus", "could not create %1 new audio busses", how_many), how_many)
+ << endmsg;
}
}
}
to create a new track or bus.\n\
You should save %1, exit and\n\
restart JACK with more ports."), PROGRAM_NAME));
- pop_back_splash ();
+ pop_back_splash (msg);
msg.run ();
}
}
-void
-ARDOUR_UI::do_transport_locate (framepos_t new_position, bool with_roll)
-{
- framecnt_t _preroll = 0;
-
- if (_session) {
- // XXX CONFIG_CHANGE FIX - requires AnyTime handling
- // _preroll = _session->convert_to_frames_at (new_position, Config->get_preroll());
-
- if (new_position > _preroll) {
- new_position -= _preroll;
- } else {
- new_position = 0;
- }
-
- _session->request_locate (new_position, with_roll);
- }
-}
-
void
ARDOUR_UI::transport_goto_start ()
{
_session->request_stop (false, true);
}
-void
-ARDOUR_UI::transport_stop_and_forget_capture ()
-{
- if (_session) {
- _session->request_stop (true, true);
- }
-}
-
-void
-ARDOUR_UI::remove_last_capture()
-{
- if (editor) {
- editor->remove_last_capture();
- }
-}
-
void
ARDOUR_UI::transport_record (bool roll)
{
switch (_session->record_status()) {
case Session::Disabled:
if (_session->ntracks() == 0) {
- MessageDialog msg (*editor, _("Please create 1 or more track\nbefore trying to record.\nCheck the Session menu."));
+ MessageDialog msg (*editor, _("Please create one or more tracks before trying to record.\nYou can do this with the \"Add Track or Bus\" option in the Session menu."));
msg.run ();
return;
}
_session->disable_record (false, true);
}
}
- //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " _session->record_status() = " << _session->record_status() << endl;
}
void
#if 0
if (_session->config.get_external_sync()) {
- switch (_session->config.get_sync_source()) {
+ switch (Config->get_sync_source()) {
case JACK:
break;
default:
if (!Config->get_seamless_loop()) {
_session->request_play_loop (false, true);
}
- } else if (_session->get_play_range () && !join_play_range_button.active_state()) {
+ } else if (_session->get_play_range () && !Config->get_always_play_range()) {
/* stop playing a range if we currently are */
_session->request_play_range (0, true);
}
- if (join_play_range_button.active_state()) {
- _session->request_play_range (&editor->get_selection().time, true);
- }
-
if (!rolling) {
_session->request_transport_speed (1.0f);
}
}
+bool
+ARDOUR_UI::get_smart_mode() const
+{
+ return ( editor->get_smart_mode() );
+}
+
+
void
ARDOUR_UI::toggle_roll (bool with_abort, bool roll_out_of_bounded_mode)
{
}
if (_session->config.get_external_sync()) {
- switch (_session->config.get_sync_source()) {
+ switch (Config->get_sync_source()) {
case JACK:
break;
default:
if (rolling) {
_session->request_stop (with_abort, true);
} else {
- if (join_play_range_button.active_state()) {
+ if ( Config->get_always_play_range() ) {
_session->request_play_range (&editor->get_selection().time, true);
}
void
ARDOUR_UI::toggle_session_auto_loop ()
{
- if (!_session) {
+ Location * looploc = _session->locations()->auto_loop_location();
+
+ if (!_session || !looploc) {
return;
}
if (_session->transport_rolling()) {
- Location * looploc = _session->locations()->auto_loop_location();
-
- if (looploc) {
- _session->request_locate (looploc->start(), true);
- _session->request_play_loop (false);
- }
+ _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);
- }
+ _session->request_play_loop (true);
}
+
+ //show the loop markers
+ looploc->set_hidden (false, this);
}
void
editor->play_selection ();
}
+void
+ARDOUR_UI::transport_play_preroll ()
+{
+ if (!_session) {
+ return;
+ }
+ editor->play_with_preroll ();
+}
+
void
ARDOUR_UI::transport_rewind (int option)
{
void
ARDOUR_UI::transport_forward (int option)
{
- float current_transport_speed;
-
- if (_session) {
- current_transport_speed = _session->transport_speed();
-
- if (current_transport_speed <= 0.0f) {
- switch (option) {
- case 0:
- _session->request_transport_speed (1.0f);
- break;
- case 1:
- _session->request_transport_speed (4.0f);
- break;
- case -1:
- _session->request_transport_speed (0.5f);
- break;
- }
- } else {
- /* speed up */
- _session->request_transport_speed (current_transport_speed * 1.5f);
+ if (!_session) {
+ return;
+ }
+
+ float current_transport_speed = _session->transport_speed();
+
+ if (current_transport_speed <= 0.0f) {
+ switch (option) {
+ case 0:
+ _session->request_transport_speed (1.0f);
+ break;
+ case 1:
+ _session->request_transport_speed (4.0f);
+ break;
+ case -1:
+ _session->request_transport_speed (0.5f);
+ break;
}
-
+ } else {
+ /* speed up */
+ _session->request_transport_speed (current_transport_speed * 1.5f);
}
}
void
ARDOUR_UI::toggle_record_enable (uint32_t rid)
{
- if (_session == 0) {
+ if (!_session) {
return;
}
t->set_record_enabled (!t->record_enabled(), this);
}
}
- if (_session == 0) {
- return;
- }
}
void
auto_loop_button.unset_active_state ();
play_selection_button.unset_active_state ();
roll_button.unset_active_state ();
- stop_button.set_active_state (Gtkmm2ext::Active);
+ stop_button.set_active_state (Gtkmm2ext::ExplicitActive);
return;
}
if (_session->get_play_range()) {
- play_selection_button.set_active_state (Gtkmm2ext::Active);
+ play_selection_button.set_active_state (Gtkmm2ext::ExplicitActive);
roll_button.unset_active_state ();
auto_loop_button.unset_active_state ();
} else if (_session->get_play_loop ()) {
- auto_loop_button.set_active_state (Gtkmm2ext::Active);
- play_selection_button.unset_active_state ();
- roll_button.unset_active_state ();
+ auto_loop_button.set_active (true);
+ play_selection_button.set_active (false);
+ roll_button.set_active (false);
} else {
- roll_button.set_active_state (Gtkmm2ext::Active);
- play_selection_button.unset_active_state ();
- auto_loop_button.unset_active_state ();
+ roll_button.set_active (true);
+ play_selection_button.set_active (false);
+ auto_loop_button.set_active (false);
}
- if (join_play_range_button.active_state()) {
+ if (Config->get_always_play_range()) {
/* light up both roll and play-selection if they are joined */
- roll_button.set_active_state (Gtkmm2ext::Active);
- play_selection_button.set_active_state (Gtkmm2ext::Active);
+ roll_button.set_active (true);
+ play_selection_button.set_active (true);
}
- stop_button.unset_active_state ();
+ stop_button.set_active (false);
} else {
- stop_button.set_active_state (Gtkmm2ext::Active);
- roll_button.unset_active_state ();
- play_selection_button.unset_active_state ();
- auto_loop_button.unset_active_state ();
+ stop_button.set_active (true);
+ roll_button.set_active (false);
+ play_selection_button.set_active (false);
+ auto_loop_button.set_active (false);
update_disk_space ();
}
}
}
MessageDialog msg (*editor, msgstr);
- pop_back_splash ();
+ pop_back_splash (msg);
+ msg.set_keep_above (true);
msg.run ();
-
+
if (free_reason) {
- free ((char*) reason);
+ free (const_cast<char*> (reason));
}
}
return 0;
}
-void
-ARDOUR_UI::setup_theme ()
-{
- theme_manager->setup_theme();
-}
-
void
ARDOUR_UI::update_clocks ()
{
clock_signal_connection.disconnect ();
}
-void
-ARDOUR_UI::toggle_clocking ()
-{
-#if 0
- if (clock_button.get_active()) {
- start_clocking ();
- } else {
- stop_clocking ();
- }
-#endif
-}
-
gint
ARDOUR_UI::_blink (void *arg)
-
{
((ARDOUR_UI *) arg)->blink ();
return TRUE;
}
-/** Ask the user for the name of a new shapshot and then take it.
+/** Ask the user for the name of a new snapshot and then take it.
*/
void
bool do_save = (snapname.length() != 0);
if (do_save) {
- if (snapname.find ('/') != string::npos) {
- MessageDialog msg (_("To ensure compatibility with various systems\n"
- "snapshot names may not contain a '/' character"));
- msg.run ();
- goto again;
- }
- if (snapname.find ('\\') != string::npos) {
- MessageDialog msg (_("To ensure compatibility with various systems\n"
- "snapshot names may not contain a '\\' character"));
- msg.run ();
- goto again;
- }
- if (snapname.find (':') != string::npos) {
- MessageDialog msg (_("To ensure compatibility with various systems\n"
- "snapshot names may not contain a ':' character"));
+ char illegal = Session::session_name_is_legal(snapname);
+ if (illegal) {
+ MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
+ "snapshot names may not contain a '%1' character"), illegal));
msg.run ();
goto again;
}
}
- vector<sys::path> p;
+ vector<std::string> p;
get_state_files_in_directory (_session->session_directory().root_path(), p);
vector<string> n = get_file_names_no_extension (p);
if (find (n.begin(), n.end(), snapname) != n.end()) {
}
}
-/** Ask the user for the name of a new shapshot and then take it.
+/** Ask the user for a new session name and then rename the session to it.
*/
void
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"));
+ char illegal = Session::session_name_is_legal (name);
+
+ if (illegal) {
+ MessageDialog msg (string_compose (_("To ensure compatibility with various systems\n"
+ "session names may not contain a '%1' character"), illegal));
msg.run ();
goto again;
}
if (r == Session::Enabled || (r == Session::Recording && !h)) {
if (onoff) {
- rec_button.set_active_state (Active);
+ rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
} else {
- rec_button.set_active_state (Mid);
+ rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
}
} else if (r == Session::Recording && h) {
- rec_button.set_active_state (Mid);
+ rec_button.set_active_state (Gtkmm2ext::ExplicitActive);
} else {
rec_button.unset_active_state ();
}
msg.set_title (_("Open Existing Session"));
msg.set_wmclass (X_("existing_session"), PROGRAM_NAME);
msg.set_position (Gtk::WIN_POS_MOUSE);
- pop_back_splash ();
+ pop_back_splash (msg);
switch (msg.run()) {
case RESPONSE_YES:
bus_profile.input_ac = AutoConnectOption (0);
}
- /// @todo some minor tweaks.
-
bus_profile.output_ac = AutoConnectOption (0);
if (_startup->connect_outputs ()) {
/* /path/to/foo/foo.ardour => /path/to/foo, foo */
load_session (Glib::path_get_dirname (path), basename_nosuffix (path));
}
- } else {
+ } else {
ARDOUR_COMMAND_LINE::session_name = path;
-
- /*
- * new_session_dialog doens't exist in A3
- * Try to remove all references to it to
- * see if it will compile. NOTE: this will
- * likely cause a runtime issue is my somewhat
- * uneducated guess.
- */
-
- //if (new_session_dialog) {
-
-
- /* make it break out of Dialog::run() and
- start again.
- */
-
- //new_session_dialog->response (1);
- //}
}
}
-void
-ARDOUR_UI::end_loading_messages ()
-{
- // hide_splash ();
-}
-
-void
-ARDOUR_UI::loading_message (const std::string& /*msg*/)
-{
- // show_splash ();
- // splash->message (msg);
- flush_pending ();
-}
-
/** @param quit_on_cancel true if exit() should be called if the user clicks `cancel' in the new session dialog */
int
ARDOUR_UI::get_session_parameters (bool quit_on_cancel, bool should_be_new, string load_template)
int ret = -1;
bool likely_new = false;
+ /* deal with any existing DIRTY session now, rather than later. don't
+ * treat a non-dirty session this way, so that it stays visible
+ * as we bring up the new session dialog.
+ */
+
+ if (_session && _session->dirty()) {
+ if (unload_session (false)) {
+ /* unload cancelled by user */
+ return 0;
+ }
+ ARDOUR_COMMAND_LINE::session_name = "";
+ }
+
if (!load_template.empty()) {
should_be_new = true;
template_name = load_template;
while (ret != 0) {
- if (!should_be_new && !ARDOUR_COMMAND_LINE::session_name.empty()) {
+ if (!ARDOUR_COMMAND_LINE::session_name.empty()) {
/* if they named a specific statefile, use it, otherwise they are
just giving a session folder, and we want to use it as is
session_path = ARDOUR_COMMAND_LINE::session_name;
session_name = Glib::path_get_basename (ARDOUR_COMMAND_LINE::session_name);
}
-
} else {
+ session_path = "";
+ session_name = "";
+ }
- bool const apply = run_startup (should_be_new, load_template);
-
- if (!apply) {
- if (quit_on_cancel) {
- exit (1);
- } else {
- return ret;
- }
- }
-
- /* if we run the startup dialog again, offer more than just "new session" */
-
- should_be_new = false;
-
- session_name = _startup->session_name (likely_new);
-
- string::size_type suffix = session_name.find (statefile_suffix);
-
- if (suffix != string::npos) {
- session_name = session_name.substr (0, suffix);
+ delete _startup;
+ _startup = new ArdourStartup (should_be_new, session_name, session_path, load_template);
+
+ if (!_startup->ready_without_display()) {
+ _startup->present ();
+ main().run();
+ _startup->hide ();
+ }
+
+ switch (_startup->response()) {
+ case RESPONSE_OK:
+ break;
+ default:
+ if (quit_on_cancel) {
+ exit (1);
+ } else {
+ return ret;
}
+ }
- /* this shouldn't happen, but we catch it just in case it does */
+ /* if we run the startup dialog again, offer more than just "new session" */
+
+ should_be_new = false;
+
+ session_name = _startup->session_name (likely_new);
+
+ string::size_type suffix = session_name.find (statefile_suffix);
+
+ if (suffix != string::npos) {
+ session_name = session_name.substr (0, suffix);
+ }
+
+ /* this shouldn't happen, but we catch it just in case it does */
+
+ if (session_name.empty()) {
+ continue;
+ }
+
+ if (_startup->use_session_template()) {
+ template_name = _startup->session_template_name();
+ _session_is_new = true;
+ }
+
+ if (session_name[0] == G_DIR_SEPARATOR ||
+ (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == G_DIR_SEPARATOR) ||
+ (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == G_DIR_SEPARATOR)) {
+
+ /* absolute path or cwd-relative path specified for session name: infer session folder
+ from what was given.
+ */
+
+ session_path = Glib::path_get_dirname (session_name);
+ session_name = Glib::path_get_basename (session_name);
+
+ } else {
- if (session_name.empty()) {
+ session_path = _startup->session_folder();
+
+ char illegal = Session::session_name_is_legal (session_name);
+
+ if (illegal) {
+ MessageDialog msg (*_startup,
+ string_compose (_("To ensure compatibility with various systems\n"
+ "session names may not contain a '%1' character"),
+ illegal));
+ msg.run ();
+ ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
continue;
}
-
- if (_startup->use_session_template()) {
- template_name = _startup->session_template_name();
- _session_is_new = true;
- }
-
- if (session_name[0] == G_DIR_SEPARATOR ||
- (session_name.length() > 2 && session_name[0] == '.' && session_name[1] == G_DIR_SEPARATOR) ||
- (session_name.length() > 3 && session_name[0] == '.' && session_name[1] == '.' && session_name[2] == G_DIR_SEPARATOR)) {
-
- /* absolute path or cwd-relative path specified for session name: infer session folder
- from what was given.
- */
-
- session_path = Glib::path_get_dirname (session_name);
- session_name = Glib::path_get_basename (session_name);
-
- } else {
-
- session_path = _startup->session_folder();
-
- if (session_name.find ('/') != string::npos) {
- MessageDialog msg (*_startup,
- _("To ensure compatibility with various systems\n"
- "session names may not contain a '/' character"));
- msg.run ();
- ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
- continue;
- }
-
- if (session_name.find ('\\') != string::npos) {
- MessageDialog msg (*_startup,
- _("To ensure compatibility with various systems\n"
- "session names may not contain a '\\' character"));
- msg.run ();
- ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
- continue;
- }
- }
}
-
+
if (create_engine ()) {
break;
}
} else {
if (!likely_new) {
- MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
- msg.run ();
- ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
- continue;
- }
+ if (_startup) {
+ pop_back_splash (*_startup);
+ } else {
+ hide_splash ();
+ }
- if (session_name.find ('/') != std::string::npos) {
- MessageDialog msg (*_startup,
- _("To ensure compatibility with various systems\n"
- "session names may not contain a '/' character"));
+ MessageDialog msg (string_compose (_("There is no existing session at \"%1\""), session_path));
msg.run ();
ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
continue;
}
- if (session_name.find ('\\') != std::string::npos) {
- MessageDialog msg (*_startup,
- _("To ensure compatibility with various systems\n"
- "session names may not contain a '\\' character"));
+ char illegal = Session::session_name_is_legal(session_name);
+ if (illegal) {
+ pop_back_splash (*_startup);
+ MessageDialog msg (*_startup, string_compose(_("To ensure compatibility with various systems\n"
+ "session names may not contain a '%1' character"), illegal));
msg.run ();
ARDOUR_COMMAND_LINE::session_name = ""; // cancel that
continue;
msg.set_title (_("Port Registration Error"));
msg.set_secondary_text (_("Click the Close button to try again."));
msg.set_position (Gtk::WIN_POS_CENTER);
- pop_back_splash ();
+ pop_back_splash (msg);
msg.present ();
int response = msg.run ();
msg.set_secondary_text (_("Click the Refresh button to try again."));
msg.add_button (Stock::REFRESH, 1);
msg.set_position (Gtk::WIN_POS_CENTER);
- pop_back_splash ();
+ pop_back_splash (msg);
msg.present ();
int response = msg.run ();
catch (...) {
MessageDialog msg (string_compose(_("Could not create session in \"%1\""), path));
- pop_back_splash ();
+ pop_back_splash (msg);
msg.run ();
return -1;
}
{
if (about == 0) {
about = new About;
- about->signal_response().connect(sigc::mem_fun (*this, &ARDOUR_UI::about_signal_response) );
+ about->signal_response().connect (sigc::mem_fun (*this, &ARDOUR_UI::about_signal_response));
}
about->set_transient_for(*editor);
void
ARDOUR_UI::launch_reference ()
{
- PBD::open_uri("http://ardour.org/refmanual");
+ PBD::open_uri ("http://ardour.org/refmanual");
}
void
hide_about();
}
+void
+ARDOUR_UI::loading_message (const std::string& msg)
+{
+ if (ARDOUR_COMMAND_LINE::no_splash) {
+ return;
+ }
+
+ if (!splash) {
+ show_splash ();
+ }
+
+ splash->message (msg);
+}
+
void
ARDOUR_UI::show_splash ()
{
}
}
- splash->show ();
- splash->present ();
- splash->queue_draw ();
- splash->get_window()->process_updates (true);
- flush_pending ();
+ splash->display ();
}
void
ARDOUR_UI::hide_splash ()
{
- if (splash) {
- splash->hide();
- }
+ delete splash;
+ splash = 0;
}
void
-ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* list_title,
- const string& plural_msg, const string& singular_msg)
+ARDOUR_UI::display_cleanup_results (ARDOUR::CleanupReport& rep, const gchar* list_title, const bool msg_delete)
{
size_t removed;
_("No files were ready for clean-up"),
true,
Gtk::MESSAGE_INFO,
- (Gtk::ButtonsType)(Gtk::BUTTONS_OK) );
+ Gtk::BUTTONS_OK);
msgd.set_title (_("Clean-up"));
msgd.set_secondary_text (_("If this seems suprising, \n\
check for any existing snapshots.\n\
dimage->set_alignment(ALIGN_LEFT, ALIGN_TOP);
- const string dead_directory = _session->session_directory().dead_path().to_string();
+ const string dead_directory = _session->session_directory().dead_path();
/* subst:
%1 - number of files removed
bprefix = X_("");
space_adjusted = rep.space;
} else if (rep.space < 1000000) {
- bprefix = X_("kilo");
+ bprefix = _("kilo");
space_adjusted = truncf((float)rep.space / 1000.0);
} else if (rep.space < 1000000 * 1000) {
- bprefix = X_("mega");
+ bprefix = _("mega");
space_adjusted = truncf((float)rep.space / (1000.0 * 1000.0));
} else {
- bprefix = X_("giga");
+ bprefix = _("giga");
space_adjusted = truncf((float)rep.space / (1000.0 * 1000 * 1000.0));
}
- if (removed > 1) {
- txt.set_text (string_compose (plural_msg, removed, dead_directory, space_adjusted, bprefix));
+ if (msg_delete) {
+ txt.set_markup (string_compose (P_("\
+The following file was deleted from %2,\n\
+releasing %3 %4bytes of disk space", "\
+The following %1 files were deleted from %2,\n\
+releasing %3 %4bytes of disk space", removed),
+ removed, Glib::Markup::escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME));
} else {
- txt.set_text (string_compose (singular_msg, removed, dead_directory, space_adjusted, bprefix));
+ txt.set_markup (string_compose (P_("\
+The following file was not in use and \n\
+has been moved to: %2\n\n\
+After a restart of %5\n\n\
+<span face=\"mono\">Session -> Clean-up -> Flush Wastebasket</span>\n\n\
+will release an additional %3 %4bytes of disk space.\n", "\
+The following %1 files were not in use and \n\
+have been moved to: %2\n\n\
+After a restart of %5\n\n\
+<span face=\"mono\">Session -> Clean-up -> Flush Wastebasket</span>\n\n\
+will release an additional %3 %4bytes of disk space.\n", removed),
+ removed, Glib::Markup::escape_text (dead_directory), space_adjusted, bprefix, PROGRAM_NAME));
}
dhbox.pack_start (*dimage, true, false, 5);
MessageDialog checker (_("Are you sure you want to clean-up?"),
true,
Gtk::MESSAGE_QUESTION,
- (Gtk::ButtonsType)(Gtk::BUTTONS_NONE));
+ Gtk::BUTTONS_NONE);
checker.set_title (_("Clean-up"));
editor->finish_cleanup ();
checker.hide();
- display_cleanup_results (rep,
- _("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 -> 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\
-has been moved to:\n \
-%2\n\n\
-After a restart of Ardour,\n\n\
-Session -> Clean-up -> Flush Wastebasket\n\n\
-will release an additional\n\
-%3 %4bytes of disk space.\n"
- ));
-
+ display_cleanup_results (rep, _("Cleaned Files"), false);
}
void
return;
}
- display_cleanup_results (rep,
- _("deleted file"),
- _("The following %1 files were deleted from\n\
-%2,\n\
-releasing %3 %4bytes of disk space"),
- _("The following file was deleted from\n\
-%2,\n\
-releasing %3 %4bytes of disk space"));
+ display_cleanup_results (rep, _("deleted file"), true);
}
void
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);
}
return;
}
+ PBD::ScopedConnection idle_connection;
+
+ if (count > 8) {
+ ARDOUR::GUIIdle.connect (idle_connection, MISSING_INVALIDATOR, boost::bind (&Gtkmm2ext::UI::flush_pending, this), gui_context());
+ }
+
string template_path = add_route_dialog->track_template();
if (!template_path.empty()) {
return;
}
- uint32_t input_chan = add_route_dialog->channels ();
- uint32_t output_chan;
+ ChanCount input_chan= add_route_dialog->channels ();
+ ChanCount output_chan;
string name_template = add_route_dialog->name_template ();
- bool track = add_route_dialog->track ();
+ PluginInfoPtr instrument = add_route_dialog->requested_instrument ();
RouteGroup* route_group = add_route_dialog->route_group ();
-
AutoConnectOption oac = Config->get_output_auto_connect();
if (oac & AutoConnectMaster) {
- output_chan = (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan);
+ output_chan.set (DataType::AUDIO, (_session->master_out() ? _session->master_out()->n_inputs().n_audio() : input_chan.n_audio()));
+ output_chan.set (DataType::MIDI, 0);
} else {
output_chan = input_chan;
}
/* XXX do something with name template */
- if (add_route_dialog->type() == ARDOUR::DataType::MIDI) {
- if (track) {
- session_add_midi_track (route_group, count, name_template);
- } else {
- MessageDialog msg (*editor,
- _("Sorry, MIDI Busses are not supported at this time."));
- msg.run ();
- //session_add_midi_bus();
- }
- } else {
- if (track) {
- session_add_audio_track (input_chan, output_chan, add_route_dialog->mode(), route_group, count, name_template);
- } else {
- session_add_audio_bus (input_chan, output_chan, route_group, count, name_template);
- }
+ switch (add_route_dialog->type_wanted()) {
+ case AddRouteDialog::AudioTrack:
+ session_add_audio_track (input_chan.n_audio(), output_chan.n_audio(), add_route_dialog->mode(), route_group, count, name_template);
+ break;
+ case AddRouteDialog::MidiTrack:
+ session_add_midi_track (route_group, count, name_template, instrument);
+ break;
+ case AddRouteDialog::MixedTrack:
+ session_add_mixed_track (input_chan, output_chan, route_group, count, name_template, instrument);
+ break;
+ case AddRouteDialog::AudioBus:
+ session_add_audio_bus (input_chan.n_audio(), output_chan.n_audio(), route_group, count, name_template);
+ break;
}
+
+ /* idle connection will end at scope end */
}
XMLNode*
HBox* hbox = new HBox();
Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG);
ArdourDialog dialog (_("Crash Recovery"), true);
- Label message (_("\
-This session appears to have been in\n\
-middle of recording when ardour or\n\
+ Label message (string_compose (_("\
+This session appears to have been in the\n\
+middle of recording when %1 or\n\
the computer was shutdown.\n\
\n\
-Ardour can recover any captured audio for\n\
+%1 can recover any captured audio for\n\
you, or it can ignore it. Please decide\n\
-what you would like to do.\n"));
+what you would like to do.\n"), PROGRAM_NAME));
image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
hbox->pack_end (message, PACK_EXPAND_PADDING, 12);
ARDOUR_UI::sr_mismatch_dialog (framecnt_t desired, framecnt_t actual)
{
HBox* hbox = new HBox();
- Image* image = new Image (Stock::DIALOG_QUESTION, ICON_SIZE_DIALOG);
+ Image* image = new Image (Stock::DIALOG_WARNING, ICON_SIZE_DIALOG);
ArdourDialog dialog (_("Sample Rate Mismatch"), true);
Label message (string_compose (_("\
-This session was created with a sample rate of %1 Hz\n\
-\n\
-The audioengine is currently running at %2 Hz\n"), desired, actual));
+This session was created with a sample rate of %1 Hz, but\n\
+%2 is currently running at %3 Hz. If you load this session,\n\
+audio may be played at the wrong sample rate.\n"), desired, PROGRAM_NAME, actual));
image->set_alignment(ALIGN_CENTER, ALIGN_TOP);
hbox->pack_start (*image, PACK_EXPAND_WIDGET, 12);
ARDOUR_UI::disconnect_from_jack ()
{
if (engine) {
- if( engine->disconnect_from_jack ()) {
+ if (engine->disconnect_from_jack ()) {
MessageDialog msg (*editor, _("Could not disconnect from JACK"));
msg.run ();
}
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());
} else {
- primary_clock->set (pos, 0, true);
+ primary_clock->set (pos);
}
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());
} else {
secondary_clock->set (pos);
}
// we make insensitive
if (yn) {
- rec_button.set_active_state (Mid);
+ rec_button.set_active_state (Gtkmm2ext::ImplicitActive);
rec_button.set_sensitive (false);
} else {
rec_button.unset_active_state ();;
return;
}
- Session::RecordState const r = _session->record_status ();
- bool const h = _session->have_rec_enabled_track ();
-
- if (r == Session::Recording && h) {
- big_clock->set_widget_name ("BigClockRecording");
+ if (_session->record_status () == Session::Recording && _session->have_rec_enabled_track ()) {
+ big_clock->set_active (true);
} else {
- big_clock->set_widget_name ("BigClockNonRecording");
+ big_clock->set_active (false);
}
}
action = X_("Stop");
break;
case GotoStart:
- action = X_("Goto Start");
+ action = X_("GotoStart");
break;
case GotoEnd:
- action = X_("Goto End");
+ action = X_("GotoEnd");
break;
case AutoLoop:
action = X_("Loop");
break;
case PlaySelection:
- action = X_("Play Selection");
+ action = X_("PlaySelection");
break;
case RecordEnable:
action = X_("Record");
void
ARDOUR_UI::setup_profile ()
{
- if (gdk_screen_width() < 1200) {
+ if (gdk_screen_width() < 1200 || getenv ("ARDOUR_NARROW_SCREEN")) {
Profile->set_small_screen ();
}
-
if (getenv ("ARDOUR_SAE")) {
Profile->set_sae ();
Profile->set_single_package ();
bool already_enabled = !ARDOUR::translations_are_disabled ();
if (ract->get_active ()) {
-/* we don't care about errors */
+ /* we don't care about errors */
int fd = ::open (i18n_killer.c_str(), O_RDONLY|O_CREAT, 0644);
close (fd);
} else {
-/* we don't care about errors */
+ /* we don't care about errors */
unlink (i18n_killer.c_str());
}
{
_process_thread->drop_buffers ();
}
+
+void
+ARDOUR_UI::feedback_detected ()
+{
+ _feedback_exists = true;
+}
+
+void
+ARDOUR_UI::successful_graph_sort ()
+{
+ _feedback_exists = false;
+}
+
+void
+ARDOUR_UI::midi_panic ()
+{
+ if (_session) {
+ _session->midi_panic();
+ }
+}
projects / ardour.git / blobdiff