X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fsession.cc;h=7afeebb416b0c0c649201e40f177640638553637;hb=c9023ae73d6d70fead3e827811b384e2b171e4d6;hp=b7b5667d0663bfd960f84329a12d3d49a7009262;hpb=94c8b672c4e294384348f405d179f13e33e72ee5;p=ardour.git diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index b7b5667d06..7afeebb416 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -92,6 +92,7 @@ #include "ardour/source_factory.h" #include "ardour/speakers.h" #include "ardour/track.h" +#include "ardour/user_bundle.h" #include "ardour/utils.h" #include "midi++/port.h" @@ -164,8 +165,6 @@ Session::Session (AudioEngine &eng, , _worst_input_latency (0) , _worst_track_latency (0) , _have_captured (false) - , _meter_hold (0) - , _meter_falloff (0) , _non_soloed_outs_muted (false) , _listen_cnt (0) , _solo_isolated_cnt (0) @@ -211,6 +210,7 @@ Session::Session (AudioEngine &eng, , cumulative_rf_motion (0) , rf_scale (1.0) , _locations (new Locations (*this)) + , _ignore_skips_updates (false) , step_speed (0) , outbound_mtc_timecode_frame (0) , next_quarter_frame_to_send (-1) @@ -266,7 +266,7 @@ Session::Session (AudioEngine &eng, , _step_editors (0) , _suspend_timecode_transmission (0) , _speakers (new Speakers) - , _order_hint (0) + , _order_hint (-1) , ignore_route_processor_changes (false) , _scene_changer (0) , _midi_ports (0) @@ -443,6 +443,10 @@ Session::immediately_post_engine () return -1; } + /* TODO, connect in different thread. (PortRegisteredOrUnregistered may be in RT context) + * can we do that? */ + _engine.PortRegisteredOrUnregistered.connect_same_thread (*this, boost::bind (&Session::setup_bundles, this)); + return 0; } @@ -480,6 +484,7 @@ Session::destroy () /* clear state tree so that no references to objects are held any more */ delete state_tree; + state_tree = 0; /* reset dynamic state version back to default */ @@ -489,9 +494,13 @@ Session::destroy () delete _butler; _butler = 0; - delete midi_control_ui; delete _all_route_group; + DEBUG_TRACE (DEBUG::Destruction, "delete route groups\n"); + for (list::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) { + delete *i; + } + if (click_data != default_click) { delete [] click_data; } @@ -557,16 +566,11 @@ Session::destroy () sources.clear (); } - DEBUG_TRACE (DEBUG::Destruction, "delete route groups\n"); - for (list::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) { - - delete *i; - } - /* not strictly necessary, but doing it here allows the shared_ptr debugging to work */ playlists.reset (); delete _scene_changer; _scene_changer = 0; + delete midi_control_ui; midi_control_ui = 0; delete _mmc; _mmc = 0; delete _midi_ports; _midi_ports = 0; @@ -686,6 +690,19 @@ Session::setup_click_state (const XMLNode* node) void Session::setup_bundles () { + + { + RCUWriter writer (_bundles); + boost::shared_ptr b = writer.get_copy (); + for (BundleList::iterator i = b->begin(); i != b->end();) { + if (boost::dynamic_pointer_cast(*i)) { + ++i; + continue; + } + i = b->erase(i); + } + } + vector inputs[DataType::num_types]; vector outputs[DataType::num_types]; for (uint32_t i = 0; i < DataType::num_types; ++i) { @@ -705,13 +722,18 @@ Session::setup_bundles () for (uint32_t np = 0; np < outputs[DataType::AUDIO].size(); ++np) { char buf[32]; - snprintf (buf, sizeof (buf), _("out %" PRIu32), np+1); + std::string pn = _engine.get_pretty_name_by_name (outputs[DataType::AUDIO][np]); + if (!pn.empty()) { + snprintf (buf, sizeof (buf), _("out %s"), pn.substr(0,12).c_str()); + } else { + snprintf (buf, sizeof (buf), _("out %" PRIu32), np+1); + } boost::shared_ptr c (new Bundle (buf, true)); c->add_channel (_("mono"), DataType::AUDIO); c->set_port (0, outputs[DataType::AUDIO][np]); - add_bundle (c); + add_bundle (c, false); } /* stereo output bundles */ @@ -726,7 +748,7 @@ Session::setup_bundles () c->add_channel (_("R"), DataType::AUDIO); c->set_port (1, outputs[DataType::AUDIO][np + 1]); - add_bundle (c); + add_bundle (c, false); } } @@ -734,13 +756,18 @@ Session::setup_bundles () for (uint32_t np = 0; np < inputs[DataType::AUDIO].size(); ++np) { char buf[32]; - snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1); + std::string pn = _engine.get_pretty_name_by_name (inputs[DataType::AUDIO][np]); + if (!pn.empty()) { + snprintf (buf, sizeof (buf), _("in %s"), pn.substr(0,12).c_str()); + } else { + snprintf (buf, sizeof (buf), _("in %" PRIu32), np+1); + } boost::shared_ptr c (new Bundle (buf, false)); c->add_channel (_("mono"), DataType::AUDIO); c->set_port (0, inputs[DataType::AUDIO][np]); - add_bundle (c); + add_bundle (c, false); } /* stereo input bundles */ @@ -756,7 +783,7 @@ Session::setup_bundles () c->add_channel (_("R"), DataType::AUDIO); c->set_port (1, inputs[DataType::AUDIO][np + 1]); - add_bundle (c); + add_bundle (c, false); } } @@ -764,26 +791,36 @@ Session::setup_bundles () for (uint32_t np = 0; np < inputs[DataType::MIDI].size(); ++np) { string n = inputs[DataType::MIDI][np]; - boost::erase_first (n, X_("alsa_pcm:")); - + std::string pn = _engine.get_pretty_name_by_name (n); + if (!pn.empty()) { + n = pn; + } else { + boost::erase_first (n, X_("alsa_pcm:")); + } boost::shared_ptr c (new Bundle (n, false)); c->add_channel ("", DataType::MIDI); c->set_port (0, inputs[DataType::MIDI][np]); - add_bundle (c); + add_bundle (c, false); } /* MIDI output bundles */ for (uint32_t np = 0; np < outputs[DataType::MIDI].size(); ++np) { string n = outputs[DataType::MIDI][np]; - boost::erase_first (n, X_("alsa_pcm:")); - + std::string pn = _engine.get_pretty_name_by_name (n); + if (!pn.empty()) { + n = pn; + } else { + boost::erase_first (n, X_("alsa_pcm:")); + } boost::shared_ptr c (new Bundle (n, true)); c->add_channel ("", DataType::MIDI); c->set_port (0, outputs[DataType::MIDI][np]); - add_bundle (c); + add_bundle (c, false); } + // we trust the backend to only calls us if there's a change + BundleAddedOrRemoved (); /* EMIT SIGNAL */ } void @@ -881,7 +918,7 @@ Session::add_monitor_section () return; } - boost::shared_ptr r (new Route (*this, _("monitor"), Route::MonitorOut, DataType::AUDIO)); + boost::shared_ptr r (new Route (*this, _("Monitor"), Route::MonitorOut, DataType::AUDIO)); if (r->init ()) { return; @@ -1207,6 +1244,7 @@ Session::auto_loop_changed (Location* location) } last_loopend = location->end(); + set_dirty (); } void @@ -1235,9 +1273,9 @@ Session::set_auto_punch_location (Location* location) punch_connections.drop_connections (); - location->start_changed.connect_same_thread (punch_connections, boost::bind (&Session::auto_punch_start_changed, this, _1)); - location->end_changed.connect_same_thread (punch_connections, boost::bind (&Session::auto_punch_end_changed, this, _1)); - location->changed.connect_same_thread (punch_connections, boost::bind (&Session::auto_punch_changed, this, _1)); + location->StartChanged.connect_same_thread (punch_connections, boost::bind (&Session::auto_punch_start_changed, this, location)); + location->EndChanged.connect_same_thread (punch_connections, boost::bind (&Session::auto_punch_end_changed, this, location)); + location->Changed.connect_same_thread (punch_connections, boost::bind (&Session::auto_punch_changed, this, location)); location->set_auto_punch (true, this); @@ -1246,6 +1284,25 @@ Session::set_auto_punch_location (Location* location) auto_punch_location_changed (location); } +void +Session::set_session_extents (framepos_t start, framepos_t end) +{ + Location* existing; + if ((existing = _locations->session_range_location()) == 0) { + //if there is no existing session, we need to make a new session location (should never happen) + existing = new Location (*this, 0, 0, _("session"), Location::IsSessionRange); + } + + if (end <= start) { + error << _("Session: you can't use that location for session start/end)") << endmsg; + return; + } + + existing->set( start, end ); + + set_dirty(); +} + void Session::set_auto_loop_location (Location* location) { @@ -1277,9 +1334,9 @@ Session::set_auto_loop_location (Location* location) loop_connections.drop_connections (); - location->start_changed.connect_same_thread (loop_connections, boost::bind (&Session::auto_loop_changed, this, _1)); - location->end_changed.connect_same_thread (loop_connections, boost::bind (&Session::auto_loop_changed, this, _1)); - location->changed.connect_same_thread (loop_connections, boost::bind (&Session::auto_loop_changed, this, _1)); + location->StartChanged.connect_same_thread (loop_connections, boost::bind (&Session::auto_loop_changed, this, location)); + location->EndChanged.connect_same_thread (loop_connections, boost::bind (&Session::auto_loop_changed, this, location)); + location->Changed.connect_same_thread (loop_connections, boost::bind (&Session::auto_loop_changed, this, location)); location->set_auto_loop (true, this); @@ -1293,51 +1350,179 @@ Session::set_auto_loop_location (Location* location) } void -Session::locations_added (Location *) +Session::update_loop (Location*) { set_dirty (); } void -Session::locations_changed () +Session::update_marks (Location*) { - _locations->apply (*this, &Session::handle_locations_changed); + set_dirty (); } void -Session::handle_locations_changed (Locations::LocationList& locations) +Session::update_skips (Location* loc, bool consolidate) { - Locations::LocationList::iterator i; - Location* location; - bool set_loop = false; - bool set_punch = false; + if (_ignore_skips_updates) { + return; + } + + Locations::LocationList skips; - for (i = locations.begin(); i != locations.end(); ++i) { + if (consolidate) { + PBD::Unwinder uw (_ignore_skips_updates, true); + consolidate_skips (loc); + } - location =* i; + sync_locations_to_skips (); + + set_dirty (); +} - if (location->is_auto_punch()) { - set_auto_punch_location (location); - set_punch = true; - } - if (location->is_auto_loop()) { - set_auto_loop_location (location); - set_loop = true; - } +void +Session::consolidate_skips (Location* loc) +{ + Locations::LocationList all_locations = _locations->list (); + + for (Locations::LocationList::iterator l = all_locations.begin(); l != all_locations.end(); ) { + + if (!(*l)->is_skip ()) { + ++l; + continue; + } + + /* don't test against self */ + + if (*l == loc) { + ++l; + continue; + } + + switch (Evoral::coverage ((*l)->start(), (*l)->end(), loc->start(), loc->end())) { + case Evoral::OverlapInternal: + case Evoral::OverlapExternal: + case Evoral::OverlapStart: + case Evoral::OverlapEnd: + /* adjust new location to cover existing one */ + loc->set_start (min (loc->start(), (*l)->start())); + loc->set_end (max (loc->end(), (*l)->end())); + /* we don't need this one any more */ + _locations->remove (*l); + /* the location has been deleted, so remove reference to it in our local list */ + l = all_locations.erase (l); + break; + + case Evoral::OverlapNone: + ++l; + break; + } + } +} + +void +Session::sync_locations_to_skips () +{ + /* This happens asynchronously (in the audioengine thread). After the clear is done, we will call + * Session::_sync_locations_to_skips() from the audioengine thread. + */ + clear_events (SessionEvent::Skip, boost::bind (&Session::_sync_locations_to_skips, this)); +} + +void +Session::_sync_locations_to_skips () +{ + /* called as a callback after existing Skip events have been cleared from a realtime audioengine thread */ - if (location->is_session_range()) { - _session_range_location = location; + Locations::LocationList const & locs (_locations->list()); + + for (Locations::LocationList::const_iterator i = locs.begin(); i != locs.end(); ++i) { + + Location* location = *i; + + if (location->is_skip() && location->is_skipping()) { + SessionEvent* ev = new SessionEvent (SessionEvent::Skip, SessionEvent::Add, location->start(), location->end(), 1.0); + queue_event (ev); } } +} - if (!set_loop) { - set_auto_loop_location (0); - } - if (!set_punch) { - set_auto_punch_location (0); - } - set_dirty(); +void +Session::location_added (Location *location) +{ + if (location->is_auto_punch()) { + set_auto_punch_location (location); + } + + if (location->is_auto_loop()) { + set_auto_loop_location (location); + } + + if (location->is_session_range()) { + /* no need for any signal handling or event setting with the session range, + because we keep a direct reference to it and use its start/end directly. + */ + _session_range_location = location; + } + + if (location->is_skip()) { + /* listen for per-location signals that require us to update skip-locate events */ + + location->StartChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, true)); + location->EndChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, true)); + location->Changed.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, true)); + location->FlagsChanged.connect_same_thread (skip_update_connections, boost::bind (&Session::update_skips, this, location, false)); + + update_skips (location, true); + } + + set_dirty (); +} + +void +Session::location_removed (Location *location) +{ + if (location->is_auto_loop()) { + set_auto_loop_location (0); + set_track_loop (false); + } + + if (location->is_auto_punch()) { + set_auto_punch_location (0); + } + + if (location->is_session_range()) { + /* this is never supposed to happen */ + error << _("programming error: session range removed!") << endl; + } + + if (location->is_skip()) { + + update_skips (location, false); + } + + set_dirty (); +} + +void +Session::locations_changed () +{ + _locations->apply (*this, &Session::_locations_changed); +} + +void +Session::_locations_changed (const Locations::LocationList& locations) +{ + /* There was some mass-change in the Locations object. + + We might be re-adding a location here but it doesn't actually matter + for all the locations that the Session takes an interest in. + */ + + for (Locations::LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { + location_added (*i); + } } void @@ -1358,7 +1543,7 @@ Session::enable_record () if (g_atomic_int_compare_and_exchange (&_record_status, rs, Recording)) { _last_record_location = _transport_frame; - _mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordStrobe)); + send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordStrobe)); if (Config->get_monitoring_model() == HardwareMonitoring && config.get_auto_input()) { set_track_monitor_input_status (true); @@ -1379,7 +1564,7 @@ Session::disable_record (bool rt_context, bool force) if ((!Config->get_latched_record_enable () && !play_loop) || force) { g_atomic_int_set (&_record_status, Disabled); - _mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordExit)); + send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordExit)); } else { if (rs == Recording) { g_atomic_int_set (&_record_status, Enabled); @@ -1433,7 +1618,7 @@ Session::maybe_enable_record () enable_record (); } } else { - _mmc->send (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordPause)); + send_immediate_mmc (MIDI::MachineControlCommand (MIDI::MachineControl::cmdRecordPause)); RecordStateChanged (); /* EMIT SIGNAL */ } @@ -1447,30 +1632,10 @@ Session::audible_frame () const framepos_t tf; framecnt_t offset; - /* the first of these two possible settings for "offset" - mean that the audible frame is stationary until - audio emerges from the latency compensation - "pseudo-pipeline". - - the second means that the audible frame is stationary - until audio would emerge from a physical port - in the absence of any plugin latency compensation - */ - offset = worst_playback_latency (); - if (offset > current_block_size) { - offset -= current_block_size; - } else { - /* XXX is this correct? if we have no external - physical connections and everything is internal - then surely this is zero? still, how - likely is that anyway? - */ - offset = current_block_size; - } - if (synced_to_engine()) { + /* Note: this is basically just sync-to-JACK */ tf = _engine.transport_frame(); } else { tf = _transport_frame; @@ -2050,6 +2215,14 @@ Session::auto_connect_route (boost::shared_ptr route, ChanCount& existing } } +void +Session::reconnect_existing_routes (bool withLock, bool reconnect_master, bool reconnect_inputs, bool reconnect_outputs) +{ + /* TRX does stuff here, ardour does not (but probably should). This is called after an engine reset (in particular). + */ +} + + /** Caller must not hold process lock * @param name_template string to use for the start of the name, or "" to use "Audio". */ @@ -2278,7 +2451,7 @@ Session::new_route_from_template (uint32_t how_many, const std::string& template /* generate a new name by adding a number to the end of the template name */ if (!find_route_name (route_name.c_str(), ++number, name, sizeof(name), true)) { fatal << _("Session: UINT_MAX routes? impossible!") << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } } @@ -2381,9 +2554,9 @@ Session::add_routes_inner (RouteList& new_routes, bool input_auto_connect, bool ChanCount existing_outputs; uint32_t order = next_control_id(); - if (_order_hint != 0) { + if (_order_hint > -1) { order = _order_hint; - _order_hint = 0; + _order_hint = -1; } count_existing_track_channels (existing_inputs, existing_outputs); @@ -2849,6 +3022,7 @@ Session::route_solo_changed (bool self_solo_change, void* /*src*/, boost::weak_p for (RouteList::iterator i = uninvolved.begin(); i != uninvolved.end(); ++i) { DEBUG_TRACE (DEBUG::Solo, string_compose ("mute change for %1, which neither feeds or is fed by %2\n", (*i)->name(), route->name())); + (*i)->act_on_mute (); (*i)->mute_changed (this); } @@ -3503,8 +3677,19 @@ Session::new_audio_source_path_for_embedded (const std::string& path) return newpath; } +/** Return true if there are no audio file sources that use @param name as + * the filename component of their path. + * + * Return false otherwise. + * + * This method MUST ONLY be used to check in-session, mono files since it + * hard-codes the channel of the audio file source we are looking for as zero. + * + * If/when Ardour supports native files in non-mono formats, the logic here + * will need to be revisited. + */ bool -Session::audio_source_name_is_unique (const string& name, uint32_t chan) +Session::audio_source_name_is_unique (const string& name) { std::vector sdirs = source_search_path (DataType::AUDIO); vector::iterator i; @@ -3537,7 +3722,7 @@ Session::audio_source_name_is_unique (const string& name, uint32_t chan) string possible_path = Glib::build_filename (spath, name); - if (audio_source_by_path_and_channel (possible_path, chan)) { + if (audio_source_by_path_and_channel (possible_path, 0)) { existing++; break; } @@ -3605,7 +3790,7 @@ Session::new_audio_source_path (const string& base, uint32_t nchan, uint32_t cha possible_name = format_audio_source_name (legalized, nchan, chan, destructive, take_required, cnt, some_related_source_name_exists); - if (audio_source_name_is_unique (possible_name, chan)) { + if (audio_source_name_is_unique (possible_name)) { break; } @@ -3632,7 +3817,7 @@ Session::new_audio_source_path (const string& base, uint32_t nchan, uint32_t cha return s; } -/** Return a unique name based on \a owner_name for a new internal MIDI source */ +/** Return a unique name based on `base` for a new internal MIDI source */ string Session::new_midi_source_path (const string& base) { @@ -3761,7 +3946,11 @@ Session::create_midi_source_by_stealing_name (boost::shared_ptr track) return boost::shared_ptr(); } - const string path = new_midi_source_path (name); + /* MIDI files are small, just put them in the first location of the + session source search path. + */ + + const string path = Glib::build_filename (source_search_path (DataType::MIDI).front(), name); return boost::dynamic_pointer_cast ( SourceFactory::createWritable ( @@ -3935,7 +4124,7 @@ Session::available_capture_duration () fatal << string_compose (_("programming error: %1"), X_("illegal native file data format")) << endmsg; - /*NOTREACHED*/ + abort(); /*NOTREACHED*/ } double scale = 4096.0 / sample_bytes_on_disk; @@ -3948,7 +4137,7 @@ Session::available_capture_duration () } void -Session::add_bundle (boost::shared_ptr bundle) +Session::add_bundle (boost::shared_ptr bundle, bool emit_signal) { { RCUWriter writer (_bundles); @@ -3956,7 +4145,9 @@ Session::add_bundle (boost::shared_ptr bundle) b->push_back (bundle); } - BundleAdded (bundle); /* EMIT SIGNAL */ + if (emit_signal) { + BundleAddedOrRemoved (); /* EMIT SIGNAL */ + } set_dirty(); } @@ -3978,7 +4169,7 @@ Session::remove_bundle (boost::shared_ptr bundle) } if (removed) { - BundleRemoved (bundle); /* EMIT SIGNAL */ + BundleAddedOrRemoved (); /* EMIT SIGNAL */ } set_dirty(); @@ -4011,9 +4202,9 @@ Session::tempo_map_changed (const PropertyChange&) } void -Session::update_locations_after_tempo_map_change (Locations::LocationList& loc) +Session::update_locations_after_tempo_map_change (const Locations::LocationList& loc) { - for (Locations::LocationList::iterator i = loc.begin(); i != loc.end(); ++i) { + for (Locations::LocationList::const_iterator i = loc.begin(); i != loc.end(); ++i) { (*i)->recompute_frames_from_bbt (); } } @@ -4261,7 +4452,7 @@ Session::freeze_all (InterThreadInfo& itt) } boost::shared_ptr -Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end, +Session::write_one_track (Track& track, framepos_t start, framepos_t end, bool /*overwrite*/, vector >& srcs, InterThreadInfo& itt, boost::shared_ptr endpoint, bool include_endpoint, @@ -4269,7 +4460,7 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end, { boost::shared_ptr result; boost::shared_ptr playlist; - boost::shared_ptr fsource; + boost::shared_ptr source; ChanCount diskstream_channels (track.n_channels()); framepos_t position; framecnt_t this_chunk; @@ -4291,8 +4482,8 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end, diskstream_channels = track.bounce_get_output_streams (diskstream_channels, endpoint, include_endpoint, for_export, for_freeze); - if (diskstream_channels.n_audio() < 1) { - error << _("Cannot write a range with no audio.") << endmsg; + if (diskstream_channels.n(track.data_type()) < 1) { + error << _("Cannot write a range with no data.") << endmsg; return result; } @@ -4318,26 +4509,27 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end, legal_playlist_name = legalize_for_path (playlist->name()); - for (uint32_t chan_n = 0; chan_n < diskstream_channels.n_audio(); ++chan_n) { + for (uint32_t chan_n = 0; chan_n < diskstream_channels.n(track.data_type()); ++chan_n) { string base_name = string_compose ("%1-%2-bounce", playlist->name(), chan_n); - string path = new_audio_source_path (legal_playlist_name, diskstream_channels.n_audio(), chan_n, false, true); + string path = ((track.data_type() == DataType::AUDIO) + ? new_audio_source_path (legal_playlist_name, diskstream_channels.n_audio(), chan_n, false, true) + : new_midi_source_path (legal_playlist_name)); if (path.empty()) { goto out; } try { - fsource = boost::dynamic_pointer_cast ( - SourceFactory::createWritable (DataType::AUDIO, *this, path, false, frame_rate())); + source = SourceFactory::createWritable (track.data_type(), *this, path, false, frame_rate()); } catch (failed_constructor& err) { - error << string_compose (_("cannot create new audio file \"%1\" for %2"), path, track.name()) << endmsg; + error << string_compose (_("cannot create new file \"%1\" for %2"), path, track.name()) << endmsg; goto out; } - srcs.push_back (fsource); + srcs.push_back (source); } /* tell redirects that care that we are about to use a much larger @@ -4361,8 +4553,13 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end, for (vector >::iterator src = srcs.begin(); src != srcs.end(); ++src) { boost::shared_ptr afs = boost::dynamic_pointer_cast(*src); - if (afs) + boost::shared_ptr ms; + if (afs) { afs->prepare_for_peakfile_writes (); + } else if ((ms = boost::dynamic_pointer_cast(*src))) { + Source::Lock lock(ms->mutex()); + ms->mark_streaming_write_started(lock); + } } while (to_do && !itt.cancel) { @@ -4387,11 +4584,21 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end, uint32_t n = 0; for (vector >::iterator src=srcs.begin(); src != srcs.end(); ++src, ++n) { boost::shared_ptr afs = boost::dynamic_pointer_cast(*src); + boost::shared_ptr ms; if (afs) { if (afs->write (buffers.get_audio(n).data(latency_skip), current_chunk) != current_chunk) { goto out; } + } else if ((ms = boost::dynamic_pointer_cast(*src))) { + Source::Lock lock(ms->mutex()); + + const MidiBuffer& buf = buffers.get_midi(0); + for (MidiBuffer::const_iterator i = buf.begin(); i != buf.end(); ++i) { + Evoral::Event ev = *i; + ev.set_time(ev.time() - position); + ms->append_event_frames(lock, ev, ms->timeline_position()); + } } } latency_skip = 0; @@ -4428,10 +4635,14 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end, for (vector >::iterator src=srcs.begin(); src != srcs.end(); ++src) { boost::shared_ptr afs = boost::dynamic_pointer_cast(*src); + boost::shared_ptr ms; if (afs) { afs->update_header (position, *xnow, now); afs->flush_header (); + } else if ((ms = boost::dynamic_pointer_cast(*src))) { + Source::Lock lock(ms->mutex()); + ms->mark_streaming_write_completed(lock); } } @@ -4450,12 +4661,7 @@ Session::write_one_track (AudioTrack& track, framepos_t start, framepos_t end, out: if (!result) { for (vector >::iterator src = srcs.begin(); src != srcs.end(); ++src) { - boost::shared_ptr afs = boost::dynamic_pointer_cast(*src); - - if (afs) { - afs->mark_for_remove (); - } - + (*src)->mark_for_remove (); (*src)->drop_references (); }