ardour/livetrax
13
0
Fork 0
Code

NO-OP: whitespace (re-align after boost:: -> std::)

Browse Source
This commit is contained in:
Robin Gareus 2023-04-03 00:17:37 +02:00
parent 4ba1ccc09b
commit b03358615c
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libs/ardour/ardour/export_channel.h
View File

@ -79,7 +79,7 @@ public:
class LIBARDOUR_API PortExportChannel : public ExportChannel
{
public:
typedef std::set<std::weak_ptr<AudioPort>, std::owner_less<std::weak_ptr<AudioPort> > > PortSet;
typedef std::set<std::weak_ptr<AudioPort>, std::owner_less<std::weak_ptr<AudioPort>>> PortSet;
PortExportChannel ();
~PortExportChannel ();
@ -102,10 +102,10 @@ public:
PortSet const& get_ports () const { return ports; }
private:
PortSet ports;
samplecnt_t _buffer_size;
boost::scoped_array<Sample> _buffer;
mutable AudioBuffer _buf;
PortSet ports;
samplecnt_t _buffer_size;
boost::scoped_array<Sample> _buffer;
mutable AudioBuffer _buf;
std::list<std::shared_ptr<PBD::RingBuffer<Sample>>> _delaylines;
};
@ -143,8 +143,8 @@ public:
private:
std::weak_ptr<MidiPort> _port;
mutable FixedDelay _delayline;
mutable MidiBuffer _buf;
mutable FixedDelay _delayline;
mutable MidiBuffer _buf;
};
/// Handles RegionExportChannels and does actual reading from region
@ -231,8 +231,8 @@ class LIBARDOUR_API RouteExportChannel : public ExportChannel
public:
RouteExportChannel (std::shared_ptr<CapturingProcessor> processor,
DataType type,
size_t channel,
DataType type,
size_t channel,
std::shared_ptr<ProcessorRemover> remover);
~RouteExportChannel ();

18
libs/ardour/export_channel.cc
View File

@ -22,13 +22,13 @@
#include "pbd/types_convert.h"
#include "ardour/export_channel.h"
#include "ardour/audio_buffer.h"
#include "ardour/audio_port.h"
#include "ardour/audio_track.h"
#include "ardour/audioengine.h"
#include "ardour/audioregion.h"
#include "ardour/capturing_processor.h"
#include "ardour/export_channel.h"
#include "ardour/export_failed.h"
#include "ardour/midi_port.h"
#include "ardour/session.h"
@ -102,8 +102,8 @@ PortExportChannel::operator< (ExportChannel const& other) const
return this < &other;
}
std::owner_less<std::weak_ptr<AudioPort> > cmp;
return std::lexicographical_compare (ports.begin(), ports.end(), pec->ports.begin(), pec->ports.end(), cmp);
std::owner_less<std::weak_ptr<AudioPort>> cmp;
return std::lexicographical_compare (ports.begin (), ports.end (), pec->ports.begin (), pec->ports.end (), cmp);
}
void
@ -114,7 +114,7 @@ PortExportChannel::read (Buffer const*& buf, samplecnt_t samples) const
if (ports.size () == 1 && _delaylines.size () == 1 && !ports.begin ()->expired () && _delaylines.front ()->bufsize () == _buffer_size + 1) {
std::shared_ptr<AudioPort> p = ports.begin ()->lock ();
AudioBuffer& ab (p->get_audio_buffer (samples)); // unsets AudioBuffer::_written
AudioBuffer& ab (p->get_audio_buffer (samples)); // unsets AudioBuffer::_written
ab.set_written (true);
buf = &ab;
return;
@ -242,7 +242,7 @@ PortExportMIDI::read (Buffer const*& buf, samplecnt_t samples) const
void
PortExportMIDI::get_state (XMLNode* node) const
{
XMLNode* port_node;
XMLNode* port_node;
std::shared_ptr<MidiPort> p = _port.lock ();
if (p && (port_node = node->add_child ("MIDIPort"))) {
port_node->set_property ("name", p->name ());
@ -349,8 +349,8 @@ RegionExportChannelFactory::update_buffers (samplecnt_t samples)
}
RouteExportChannel::RouteExportChannel (std::shared_ptr<CapturingProcessor> processor,
DataType type,
size_t channel,
DataType type,
size_t channel,
std::shared_ptr<ProcessorRemover> remover)
: _processor (processor)
, _type (type)
@ -367,8 +367,8 @@ void
RouteExportChannel::create_from_route (std::list<ExportChannelPtr>& result, std::shared_ptr<Route> route)
{
std::shared_ptr<CapturingProcessor> processor = route->add_export_point ();
uint32_t n_audio = processor->input_streams ().n_audio ();
uint32_t n_midi = processor->input_streams ().n_midi ();
uint32_t n_audio = processor->input_streams ().n_audio ();
uint32_t n_midi = processor->input_streams ().n_midi ();
std::shared_ptr<ProcessorRemover> remover (new ProcessorRemover (route, processor));
result.clear ();