Paul Davis
4abbabdcf9
commit fdbae82077db53add90df7448a06869dac89acc6 Author: Paul Davis <paul@linuxaudiosystems.com> Date: Wed Mar 27 21:45:28 2013 -0400 mammoth changes in basic signal flow, total redesign of MIDI channel filtering and more. commit 59343a8283698e02bc0f622313b29e98f449e4c8 Author: Paul Davis <paul@linuxaudiosystems.com> Date: Wed Mar 27 01:58:53 2013 -0400 initial working version after changes to MIDI channel filtering. may affect metering input too. testing not yet finished this commit merges many deep changes in ardour's internal architecture, combined with a total redesign of how MIDI channel filtering works. data in a track used to flow from JACK port buffers to diskstream's ringbuffers and was then copied from the ringbuffers into a BufferSet for use during Route::process_output_buffers(). The butler thread would handle the movement of data between the ringbuffers and disk. with this commit, data now flows from JACK port buffers into the BufferSet used for Route processing, and is copied from the BufferSet into the diskstream's ringbuffers (the butler thread continues to handle interactions with disk as usual). this change allowed a dramatic consolidation of code and simplification of most aspects of Track/Route::roll() and Track/Route::no_roll(). in particular, see Route::fill_buffers_with_input() which now concisely describes how we move data from JACK port buffers into the BufferSet for all Route types (including Tracks). this work was initially motivated by changing MIDI channel filtering so that we can process capture and playback independently. there is now a very clean pathway for this - see MidiTrack::roll() (NOTE: This needs implementing in the no-roll case too - a TODO item). the channel selector for MIDI tracks has been moved out of the track header and is now accessible via the context menu. more work is likely here, to make it (more) obvious to the user when filtering is going on.
163 lines
3.9 KiB
C++
163 lines
3.9 KiB
C++
/*
|
|
Copyright (C) 2000 Paul Davis
|
|
|
|
This program is free software; you can redistribute it and/or modify
|
|
it under the terms of the GNU General Public License as published by
|
|
the Free Software Foundation; either version 2 of the License, or
|
|
(at your option) any later version.
|
|
|
|
This program is distributed in the hope that it will be useful,
|
|
but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
GNU General Public License for more details.
|
|
|
|
You should have received a copy of the GNU General Public License
|
|
along with this program; if not, write to the Free Software
|
|
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
|
|
|
|
*/
|
|
|
|
#include <algorithm>
|
|
|
|
#include "pbd/xml++.h"
|
|
|
|
#include "ardour/amp.h"
|
|
#include "ardour/audioengine.h"
|
|
#include "ardour/buffer_set.h"
|
|
#include "ardour/io.h"
|
|
#include "ardour/meter.h"
|
|
#include "ardour/return.h"
|
|
#include "ardour/session.h"
|
|
|
|
#include "i18n.h"
|
|
|
|
using namespace ARDOUR;
|
|
using namespace PBD;
|
|
|
|
std::string
|
|
Return::name_and_id_new_return (Session& s, uint32_t& bitslot)
|
|
{
|
|
bitslot = s.next_return_id();
|
|
return string_compose (_("return %1"), bitslot + 1);
|
|
}
|
|
|
|
|
|
Return::Return (Session& s, bool internal)
|
|
: IOProcessor (s, (internal ? false : true), false,
|
|
name_and_id_new_return (s, _bitslot))
|
|
, _metering (false)
|
|
{
|
|
/* never muted */
|
|
|
|
_amp.reset (new Amp (_session));
|
|
_meter.reset (new PeakMeter (_session, name()));
|
|
}
|
|
|
|
Return::~Return ()
|
|
{
|
|
_session.unmark_return_id (_bitslot);
|
|
}
|
|
|
|
XMLNode&
|
|
Return::get_state(void)
|
|
{
|
|
return state (true);
|
|
}
|
|
|
|
XMLNode&
|
|
Return::state(bool full)
|
|
{
|
|
XMLNode& node = IOProcessor::state(full);
|
|
char buf[32];
|
|
node.add_property ("type", "return");
|
|
snprintf (buf, sizeof (buf), "%" PRIu32, _bitslot);
|
|
node.add_property ("bitslot", buf);
|
|
|
|
return node;
|
|
}
|
|
|
|
int
|
|
Return::set_state (const XMLNode& node, int version)
|
|
{
|
|
XMLNodeList nlist = node.children();
|
|
XMLNodeIterator niter;
|
|
const XMLProperty* prop;
|
|
const XMLNode* insert_node = &node;
|
|
|
|
/* Return has regular IO automation (gain, pan) */
|
|
|
|
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
|
|
if ((*niter)->name() == "IOProcessor") {
|
|
insert_node = *niter;
|
|
} else if ((*niter)->name() == X_("Automation")) {
|
|
// _io->set_automation_state (*(*niter), Evoral::Parameter(GainAutomation));
|
|
}
|
|
}
|
|
|
|
IOProcessor::set_state (*insert_node, version);
|
|
|
|
if (!node.property ("ignore-bitslot")) {
|
|
if ((prop = node.property ("bitslot")) == 0) {
|
|
_bitslot = _session.next_return_id();
|
|
} else {
|
|
_session.unmark_return_id (_bitslot);
|
|
sscanf (prop->value().c_str(), "%" PRIu32, &_bitslot);
|
|
_session.mark_return_id (_bitslot);
|
|
}
|
|
}
|
|
|
|
return 0;
|
|
}
|
|
|
|
void
|
|
Return::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool)
|
|
{
|
|
if ((!_active && !_pending_active) || _input->n_ports() == ChanCount::ZERO) {
|
|
return;
|
|
}
|
|
|
|
_input->collect_input (bufs, nframes, _configured_input);
|
|
bufs.set_count(_configured_output);
|
|
|
|
// Can't automate gain for sends or returns yet because we need different buffers
|
|
// so that we don't overwrite the main automation data for the route amp
|
|
// _amp->setup_gain_automation (start_frame, end_frame, nframes);
|
|
_amp->run (bufs, start_frame, end_frame, nframes, true);
|
|
|
|
if (_metering) {
|
|
if (_amp->gain_control()->get_value() == 0) {
|
|
_meter->reset();
|
|
} else {
|
|
_meter->run (bufs, start_frame, end_frame, nframes, true);
|
|
}
|
|
}
|
|
|
|
_active = _pending_active;
|
|
}
|
|
|
|
bool
|
|
Return::can_support_io_configuration (const ChanCount& in, ChanCount& out) const
|
|
{
|
|
out = in + _input->n_ports();
|
|
return true;
|
|
}
|
|
|
|
bool
|
|
Return::configure_io (ChanCount in, ChanCount out)
|
|
{
|
|
if (out != in + _input->n_ports()) {
|
|
return false;
|
|
}
|
|
|
|
// Ensure there are enough buffers (since we add some)
|
|
if (_session.get_scratch_buffers(in).count() < out) {
|
|
Glib::Threads::Mutex::Lock em (_session.engine().process_lock());
|
|
IO::PortCountChanged(out);
|
|
}
|
|
|
|
Processor::configure_io(in, out);
|
|
|
|
return true;
|
|
}
|
|
|