#include "midi++/manager.h"
#include "ardour/ardour.h"
-#include "ardour/callback.h"
+#include "ardour/audioengine.h"
+#include "ardour/audiofilesource.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/plugin_manager.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"
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"
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[])
: Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp)
, gui_object_state (new GUIObjectState)
- , primary_clock (new AudioClock (X_("primary"), false, X_("transport"), true, true, false, true))
- , secondary_clock (new AudioClock (X_("secondary"), false, X_("secondary"), 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 */
, _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
-
about = 0;
splash = 0;
_startup = 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, ui_bind (&ARDOUR_UI::feedback_detected, this), gui_context ());
- ARDOUR::Session::SuccessfulGraphSort.connect (forever_connections, MISSING_INVALIDATOR, ui_bind (&ARDOUR_UI::successful_graph_sort, this), gui_context ());
+ 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 */
/** @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)
+ARDOUR_UI::run_startup (bool should_be_new, std::string load_template)
{
delete _startup;
_startup = new ArdourStartup ();
_startup->set_new_only (should_be_new);
if (!load_template.empty()) {
- _startup->set_load_template( load_template );
+ _startup->set_load_template (load_template);
}
_startup->present ();
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));
update_cpu_load ();
update_sample_rate (engine->frame_rate());
- 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);
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&
if (_session) {
int tries = 0;
- if (_session->transport_rolling() && (++tries < 8)) {
- _session->request_stop (false, true);
- usleep (10000);
- }
-
if (_session->dirty()) {
vector<string> actions;
actions.push_back (_("Don't quit"));
if (!engine->connected()) {
- snprintf (buf, sizeof (buf), _("disconnected"));
+ snprintf (buf, sizeof (buf), "%s", _("disconnected"));
} else {
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;
}
hrs = frames / (fr * 3600);
if (hrs > 24) {
- snprintf (buf, sizeof (buf), _("Disk: <span foreground=\"green\">>24 hrs</span>"));
+ snprintf (buf, sizeof (buf), "%s", _("Disk: <span foreground=\"green\">>24 hrs</span>"));
} else {
frames -= hrs * fr * 3600;
mins = frames / (fr * 60);
}
disk_space_label.set_markup (buf);
-
- // An attempt to make the disk space label flash red when space has run out.
-
- if (frames < fr * 60 * 5) {
- /* disk_space_box.style ("disk_space_label_empty"); */
- } else {
- /* disk_space_box.style ("disk_space_label"); */
- }
-
}
gint
recent_session_display.set_model (recent_session_model);
return;
}
- //
+
// sort them alphabetically
sort (rs.begin(), rs.end(), cmp);
vector<string*>* states;
vector<const gchar*> item;
- string fullpath = (*i).to_string();
+ string fullpath = i->to_string();
/* 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;
}
recent_session_display.show();
scroller->show();
- //session_selector_window->get_vbox()->show();
}
void
}
}
- } /*else {
- if ((route = _session->new_midi_route ()) == 0) {
- error << _("could not create new midi bus") << endmsg;
- }
- }*/
+ }
}
catch (...) {
_session->disable_record (false, true);
}
}
- //cerr << "ARDOUR_UI::transport_record () called roll = " << roll << " _session->record_status() = " << _session->record_status() << endl;
}
void
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
gint
ARDOUR_UI::_blink (void *arg)
-
{
((ARDOUR_UI *) arg)->blink ();
return TRUE;
/* /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);
- //}
}
}
{
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);
try {
splash = new Splash;
} catch (...) {
- cerr << "Splash could not be created\n";
return;
}
}
void
ARDOUR_UI::hide_splash ()
{
- if (splash) {
- splash->hide();
- }
+ delete splash;
+ splash = 0;
}
void
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 ();
}
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());
}
projects / ardour.git / blobdiff