, _suspend_timecode_transmission (0)
{
_locations = new Locations (*this);
-#ifdef HAVE_LTC
ltc_encoder = NULL;
-#endif
if (how_many_dsp_threads () > 1) {
/* For now, only create the graph if we are using >1 DSP threads, as
_state_of_the_state = StateOfTheState (CannotSave|Deletion);
+ /* disconnect from any and all signals that we are connected to */
+
+ drop_connections ();
+
_engine.remove_session ();
/* deregister all ports - there will be no process or any other
Port::PortDrop (); /* EMIT SIGNAL */
-#ifdef HAVE_LTC
ltc_tx_cleanup();
-#endif
/* clear history so that no references to objects are held any more */
}
if (location->end() <= location->start()) {
- error << _("Session: you can't use a mark for auto loop") << endmsg;
+ error << _("You cannot use this location for auto-loop because it has zero or negative length") << endmsg;
return;
}
sync_time_vars();
- Automatable::set_automation_interval (ceil ((double) frames_per_second * (0.001 * Config->get_automation_interval())));
-
clear_clicks ();
// XXX we need some equivalent to this, somehow
RouteList new_routes;
list<boost::shared_ptr<MidiTrack> > ret;
- cerr << "Adding MIDI track with in = " << input << " out = " << output << endl;
-
bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("MIDI");
while (how_many) {
catch (AudioEngine::PortRegistrationFailure& pfe) {
- error << string_compose (_("No more JACK ports are available. You will need to stop %1 and restart JACK with ports if you need this many tracks."), PROGRAM_NAME) << endmsg;
+ error << string_compose (_("No more JACK ports are available. You will need to stop %1 and restart JACK with more ports if you need this many tracks."), PROGRAM_NAME) << endmsg;
goto failed;
}
bus->add_internal_return ();
ret.push_back (bus);
+
+ ARDOUR::GUIIdle ();
}
void
Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output_auto_connect, bool save)
+{
+ try {
+ PBD::Unwinder<bool> aip (_adding_routes_in_progress, true);
+ add_routes_inner (new_routes, input_auto_connect, output_auto_connect);
+
+ } catch (...) {
+ error << _("Adding new tracks/busses failed") << endmsg;
+ }
+
+ graph_reordered ();
+
+ update_latency (true);
+ update_latency (false);
+
+ set_dirty();
+
+ if (save) {
+ save_state (_current_snapshot_name);
+ }
+
+ RouteAdded (new_routes); /* EMIT SIGNAL */
+}
+
+void
+Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool output_auto_connect)
{
ChanCount existing_inputs;
ChanCount existing_outputs;
}
}
+
if (input_auto_connect || output_auto_connect) {
auto_connect_route (r, existing_inputs, existing_outputs, true, input_auto_connect);
}
reasonable defaults because they also affect the remote control
ID in most situations.
*/
-
+
if (!r->has_order_key (EditorSort)) {
if (r->is_hidden()) {
/* use an arbitrarily high value */
order++;
}
}
+
+ ARDOUR::GUIIdle ();
}
if (_monitor_out && IO::connecting_legal) {
-
- {
- Glib::Threads::Mutex::Lock lm (_engine.process_lock());
-
- for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
- if ((*x)->is_monitor()) {
- /* relax */
- } else if ((*x)->is_master()) {
+ Glib::Threads::Mutex::Lock lm (_engine.process_lock());
+
+ for (RouteList::iterator x = new_routes.begin(); x != new_routes.end(); ++x) {
+ if ((*x)->is_monitor()) {
+ /* relax */
+ } else if ((*x)->is_master()) {
/* relax */
- } else {
- (*x)->enable_monitor_send ();
- }
+ } else {
+ (*x)->enable_monitor_send ();
}
}
-
- resort_routes ();
- }
-
- set_dirty();
-
- if (save) {
- save_state (_current_snapshot_name);
}
-
- RouteAdded (new_routes); /* EMIT SIGNAL */
}
void
DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed from %1\n", (*i)->name()));
if ((*i)->feeds (route, &via_sends_only)) {
+ DEBUG_TRACE (DEBUG::Solo, string_compose ("\tthere is a feed from %1\n", (*i)->name()));
if (!via_sends_only) {
if (!route->soloed_by_others_upstream()) {
(*i)->mod_solo_by_others_downstream (delta);
}
+ } else {
+ DEBUG_TRACE (DEBUG::Solo, string_compose ("\tthere is a send-only feed from %1\n", (*i)->name()));
}
in_signal_flow = true;
} else {
- DEBUG_TRACE (DEBUG::Solo, "\tno feed from\n");
+ DEBUG_TRACE (DEBUG::Solo, string_compose ("\tno feed from %1\n", (*i)->name()));
}
DEBUG_TRACE (DEBUG::Solo, string_compose ("check feed to %1\n", (*i)->name()));
if (!route->soloed_by_others_downstream()) {
DEBUG_TRACE (DEBUG::Solo, string_compose ("\tmod %1 by %2\n", (*i)->name(), delta));
(*i)->mod_solo_by_others_upstream (delta);
+ } else {
+ DEBUG_TRACE (DEBUG::Solo, "\talready soloed by others downstream\n");
}
+ } else {
+ DEBUG_TRACE (DEBUG::Solo, string_compose ("\tfeed to %1 ignored, sends-only\n", (*i)->name()));
}
in_signal_flow = true;
} else {
*/
for (RouteList::iterator i = uninvolved.begin(); i != uninvolved.end(); ++i) {
- DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1\n", (*i)->name()));
+ DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1, which neither feeds or is fed by %2\n", (*i)->name(), route->name()));
(*i)->mute_changed (this);
}
_solo_isolated_cnt = isolated;
IsolatedChanged (); /* EMIT SIGNAL */
}
+
+ DEBUG_TRACE (DEBUG::Solo, string_compose ("solo state updated by session, soloed? %1 listeners %2 isolated %3\n",
+ something_soloed, listeners, isolated));
}
boost::shared_ptr<RouteList>
from a set_state() call or creating new tracks. Ditto for deletion.
*/
- if (_state_of_the_state & (InitialConnecting|Deletion)) {
+ if ((_state_of_the_state & (InitialConnecting|Deletion)) || _adding_routes_in_progress) {
return;
}
bool
Session::have_rec_enabled_track () const
{
- return g_atomic_int_get (&_have_rec_enabled_track) == 1;
+ return g_atomic_int_get (const_cast<gint*>(&_have_rec_enabled_track)) == 1;
}
/** Update the state of our rec-enabled tracks flag */
if (session_dirs.size() == 1) {
switch (type) {
case DataType::AUDIO:
- s.push_back ( _session_dir->sound_path());
+ s.push_back (_session_dir->sound_path());
break;
case DataType::MIDI:
s.push_back (_session_dir->midi_path());
if (type == DataType::AUDIO) {
const string sound_path_2X = _session_dir->sound_path_2X();
if (Glib::file_test (sound_path_2X, Glib::FILE_TEST_EXISTS|Glib::FILE_TEST_IS_DIR)) {
- s.push_back (sound_path_2X);
+ if (find (s.begin(), s.end(), sound_path_2X) == s.end()) {
+ s.push_back (sound_path_2X);
+ }
}
}
}
for (vector<string>::iterator i = dirs.begin(); i != dirs.end(); ++i) {
-
- vector<string>::iterator si;
-
- for (si = s.begin(); si != s.end(); ++si) {
- if ((*si) == *i) {
- break;
- }
- }
-
- if (si == s.end()) {
+ if (find (s.begin(), s.end(), *i) == s.end()) {
s.push_back (*i);
}
}
{
DEBUG_TRACE (DEBUG::Latency, string_compose ("JACK latency callback: %1\n", (playback ? "PLAYBACK" : "CAPTURE")));
- if (_state_of_the_state & (InitialConnecting|Deletion)) {
+ if ((_state_of_the_state & (InitialConnecting|Deletion)) || _adding_routes_in_progress) {
return;
}
projects / ardour.git / blobdiff