#include "pbd/stateful_diff_command.h"
#include "ardour/analyser.h"
-#include "ardour/ardour.h"
#include "ardour/audio_buffer.h"
#include "ardour/audio_diskstream.h"
#include "ardour/audio_port.h"
#include "ardour/audioengine.h"
#include "ardour/audiofilesource.h"
-
#include "ardour/audioplaylist.h"
#include "ardour/audioregion.h"
#include "ardour/butler.h"
-#include "ardour/configuration.h"
-#include "ardour/cycle_timer.h"
#include "ardour/debug.h"
#include "ardour/io.h"
#include "ardour/playlist_factory.h"
#include "ardour/region_factory.h"
-#include "ardour/send.h"
#include "ardour/session.h"
+#include "ardour/session_playlists.h"
#include "ardour/source_factory.h"
#include "ardour/track.h"
+#include "ardour/types.h"
#include "ardour/utils.h"
-#include "ardour/session_playlists.h"
-#include "ardour/route.h"
#include "i18n.h"
#include <locale.h>
if ((playlist = boost::dynamic_pointer_cast<AudioPlaylist> (PlaylistFactory::create (DataType::AUDIO, _session, newname, hidden()))) != 0) {
- playlist->set_orig_diskstream_id (id());
return use_playlist (playlist);
} else {
newname = Playlist::bump_name (_playlist->name(), _session);
if ((playlist = boost::dynamic_pointer_cast<AudioPlaylist>(PlaylistFactory::create (audio_playlist(), newname))) != 0) {
- playlist->set_orig_diskstream_id (id());
return use_playlist (playlist);
} else {
return -1;
* that someone can read playback_distance worth of data from.
*/
int
-AudioDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool& need_butler)
+AudioDiskstream::process (framepos_t transport_frame, pframes_t nframes, framecnt_t& playback_distance)
{
uint32_t n;
boost::shared_ptr<ChannelList> c = channels.reader();
ChannelList::iterator chan;
- int ret = -1;
framecnt_t rec_offset = 0;
framecnt_t rec_nframes = 0;
bool collect_playback = false;
bool can_record = _session.actively_recording ();
- framecnt_t playback_distance = 0;
+ playback_distance = 0;
if (!_io || !_io->active()) {
return 0;
if (record_enabled()) {
- OverlapType ot = coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
+ Evoral::OverlapType ot = Evoral::coverage (first_recordable_frame, last_recordable_frame, transport_frame, transport_frame + nframes);
calculate_record_range (ot, transport_frame, nframes, rec_nframes, rec_offset);
if (rec_nframes && !was_recording) {
if (rec_nframes > total) {
DiskOverrun ();
- goto out;
+ return -1;
}
boost::shared_ptr<AudioPort> const ap = _io->audio (n);
cerr << _name << " Need " << necessary_samples << " total = " << total << endl;
cerr << "underrun for " << _name << endl;
DiskUnderrun ();
- goto out;
+ return -1;
} else {
_speed = _target_speed;
}
- ret = 0;
-
- if (commit (playback_distance)) {
- need_butler = true;
- }
-
- out:
- return ret;
+ return 0;
}
+/** Update various things including playback_sample, read pointer on each channel's playback_buf
+ * and write pointer on each channel's capture_buf. Also wout whether the butler is needed.
+ * @return true if the butler is required.
+ */
bool
AudioDiskstream::commit (framecnt_t playback_distance)
{
// cerr << _name << ": there are " << capture_info.size() << " capture_info records\n";
_playlist->clear_changes ();
+ _playlist->set_capture_insertion_in_progress (true);
_playlist->freeze ();
for (buffer_position = c->front()->write_source->last_capture_start_frame(), ci = capture_info.begin(); ci != capture_info.end(); ++ci) {
i_am_the_modifier++;
- if (_playlist->explicit_relayering()) {
- /* We are in `explicit relayering' mode, so we must specify which layer this new region
- should end up on. Put it at the top.
- */
- region->set_layer (_playlist->top_layer() + 1);
- region->set_pending_explicit_relayer (true);
- }
-
_playlist->add_region (region, (*ci)->start, 1, non_layered());
+ _playlist->set_layer (region, DBL_MAX);
i_am_the_modifier--;
buffer_position += (*ci)->frames;
}
_playlist->thaw ();
+ _playlist->set_capture_insertion_in_progress (false);
_session.add_command (new StatefulDiffCommand (_playlist));
}
if (Config->get_monitoring_model() == HardwareMonitoring) {
for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
- (*chan)->source.ensure_monitor_input (!(_session.config.get_auto_input() && rolling));
+ (*chan)->source.request_jack_monitors_input (!(_session.config.get_auto_input() && rolling));
capturing_sources.push_back ((*chan)->write_source);
(*chan)->write_source->mark_streaming_write_started ();
}
boost::shared_ptr<ChannelList> c = channels.reader();
if (Config->get_monitoring_model() == HardwareMonitoring) {
for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
- (*chan)->source.ensure_monitor_input (false);
+ (*chan)->source.request_jack_monitors_input (false);
}
}
capturing_sources.clear ();
}
void
-AudioDiskstream::monitor_input (bool yn)
+AudioDiskstream::request_jack_monitors_input (bool yn)
{
boost::shared_ptr<ChannelList> c = channels.reader();
for (ChannelList::iterator chan = c->begin(); chan != c->end(); ++chan) {
- (*chan)->source.ensure_monitor_input (yn);
+ (*chan)->source.request_jack_monitors_input (yn);
}
}
}
void
-AudioDiskstream::ChannelSource::ensure_monitor_input (bool yn) const
+AudioDiskstream::ChannelSource::request_jack_monitors_input (bool yn) const
{
if (name.empty()) {
return;
}
- return AudioEngine::instance()->ensure_monitor_input (name, yn);
+ return AudioEngine::instance()->request_jack_monitors_input (name, yn);
}
AudioDiskstream::ChannelInfo::ChannelInfo (framecnt_t playback_bufsize, framecnt_t capture_bufsize, framecnt_t speed_size, framecnt_t wrap_size)
projects / ardour.git / blobdiff