mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-06 14:54:56 +01:00
Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing). Whitespace changes only.
Vimmers, try let c_space_errors = 1 in your .vimrc to highlight this kind of stuff in red. I don't know the emacs equivalent... git-svn-id: svn://localhost/ardour2/branches/3.0@5773 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
8c4ce1e2ce
commit
bb9cc45cd2
730 changed files with 14946 additions and 14948 deletions
|
|
@ -72,7 +72,7 @@ public:
|
||||||
struct GainControl : public AutomationControl {
|
struct GainControl : public AutomationControl {
|
||||||
GainControl (std::string name, Session& session, Amp* a, const Evoral::Parameter ¶m,
|
GainControl (std::string name, Session& session, Amp* a, const Evoral::Parameter ¶m,
|
||||||
boost::shared_ptr<AutomationList> al = boost::shared_ptr<AutomationList>() )
|
boost::shared_ptr<AutomationList> al = boost::shared_ptr<AutomationList>() )
|
||||||
: AutomationControl (session, param, al, name )
|
: AutomationControl (session, param, al, name)
|
||||||
, _amp (a)
|
, _amp (a)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -228,7 +228,6 @@ class AudioDiskstream : public Diskstream
|
||||||
nframes_t& start, nframes_t cnt,
|
nframes_t& start, nframes_t cnt,
|
||||||
ChannelInfo* channel_info, int channel, bool reversed);
|
ChannelInfo* channel_info, int channel, bool reversed);
|
||||||
|
|
||||||
|
|
||||||
void finish_capture (bool rec_monitors_input, boost::shared_ptr<ChannelList>);
|
void finish_capture (bool rec_monitors_input, boost::shared_ptr<ChannelList>);
|
||||||
void transport_stopped (struct tm&, time_t, bool abort);
|
void transport_stopped (struct tm&, time_t, bool abort);
|
||||||
void transport_looped (nframes_t transport_frame);
|
void transport_looped (nframes_t transport_frame);
|
||||||
|
|
|
||||||
|
|
@ -48,8 +48,8 @@ class ElementImportHandler
|
||||||
* @param source XML tree to be parsed
|
* @param source XML tree to be parsed
|
||||||
* @see elements
|
* @see elements
|
||||||
*/
|
*/
|
||||||
ElementImportHandler (XMLTree const & source, ARDOUR::Session & session) :
|
ElementImportHandler (XMLTree const & source, ARDOUR::Session & session)
|
||||||
source (source), session (session) { }
|
: source (source), session (session) { }
|
||||||
|
|
||||||
virtual ~ElementImportHandler ();
|
virtual ~ElementImportHandler ();
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -139,9 +139,9 @@ class RegionExportChannel : public ExportChannel
|
||||||
|
|
||||||
private:
|
private:
|
||||||
|
|
||||||
RegionExportChannel (RegionExportChannelFactory & factory, uint32_t channel) :
|
RegionExportChannel (RegionExportChannelFactory & factory, uint32_t channel)
|
||||||
factory (factory),
|
: factory (factory)
|
||||||
channel (channel)
|
, channel (channel)
|
||||||
{}
|
{}
|
||||||
|
|
||||||
RegionExportChannelFactory & factory;
|
RegionExportChannelFactory & factory;
|
||||||
|
|
|
||||||
|
|
@ -33,8 +33,8 @@ namespace ARDOUR
|
||||||
class ExportFailed : public std::exception
|
class ExportFailed : public std::exception
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
ExportFailed (std::string const & reason) :
|
ExportFailed (std::string const & reason)
|
||||||
reason (reason.c_str())
|
: reason (reason.c_str())
|
||||||
{
|
{
|
||||||
PBD::error << string_compose (_("Export failed: %1"), reason) << endmsg;
|
PBD::error << string_compose (_("Export failed: %1"), reason) << endmsg;
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -111,8 +111,8 @@ class ExportFormatBase {
|
||||||
/// Class for managing selection and compatibility states
|
/// Class for managing selection and compatibility states
|
||||||
class SelectableCompatible {
|
class SelectableCompatible {
|
||||||
public:
|
public:
|
||||||
SelectableCompatible () :
|
SelectableCompatible ()
|
||||||
_selected (false), _compatible (true) { }
|
: _selected (false), _compatible (true) { }
|
||||||
~SelectableCompatible () {}
|
~SelectableCompatible () {}
|
||||||
|
|
||||||
sigc::signal<void, bool> SelectChanged;
|
sigc::signal<void, bool> SelectChanged;
|
||||||
|
|
|
||||||
|
|
@ -42,8 +42,8 @@ class ExportFormatCompatibility : public ExportFormatBase, public ExportFormatBa
|
||||||
|
|
||||||
~ExportFormatCompatibility () {};
|
~ExportFormatCompatibility () {};
|
||||||
|
|
||||||
ExportFormatCompatibility (ExportFormatBase const & other) :
|
ExportFormatCompatibility (ExportFormatBase const & other)
|
||||||
ExportFormatBase (other) {}
|
: ExportFormatBase (other) {}
|
||||||
|
|
||||||
void add_endianness (Endianness endianness) { endiannesses.insert (endianness); }
|
void add_endianness (Endianness endianness) { endiannesses.insert (endianness); }
|
||||||
void add_sample_format (SampleFormat format) { sample_formats.insert (format); }
|
void add_sample_format (SampleFormat format) { sample_formats.insert (format); }
|
||||||
|
|
|
||||||
|
|
@ -77,8 +77,8 @@ class ExportFormatManager : public sigc::trackable
|
||||||
|
|
||||||
class SampleRateState : public ExportFormatBase::SelectableCompatible {
|
class SampleRateState : public ExportFormatBase::SelectableCompatible {
|
||||||
public:
|
public:
|
||||||
SampleRateState (ExportFormatBase::SampleRate rate, Glib::ustring name) :
|
SampleRateState (ExportFormatBase::SampleRate rate, Glib::ustring name)
|
||||||
rate (rate) { set_name (name); }
|
: rate (rate) { set_name (name); }
|
||||||
ExportFormatBase::SampleRate rate;
|
ExportFormatBase::SampleRate rate;
|
||||||
};
|
};
|
||||||
typedef boost::shared_ptr<SampleRateState> SampleRatePtr;
|
typedef boost::shared_ptr<SampleRateState> SampleRatePtr;
|
||||||
|
|
|
||||||
|
|
@ -51,7 +51,7 @@ class JackPort : public virtual Port, public PortConnectableByName {
|
||||||
int reconnect ();
|
int reconnect ();
|
||||||
|
|
||||||
int connect (Port& other) {
|
int connect (Port& other) {
|
||||||
if( _flags & IsOutput ) {
|
if (_flags & IsOutput) {
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
return connect (other.name());
|
return connect (other.name());
|
||||||
|
|
|
||||||
|
|
@ -70,8 +70,7 @@ public:
|
||||||
boost::shared_ptr<MIDI::Name::MasterDeviceNames> master_device = master_device_by_model(model);
|
boost::shared_ptr<MIDI::Name::MasterDeviceNames> master_device = master_device_by_model(model);
|
||||||
|
|
||||||
if (master_device != 0 && custom_device_mode != "") {
|
if (master_device != 0 && custom_device_mode != "") {
|
||||||
return master_device->
|
return master_device->channel_name_set_by_device_mode_and_channel(custom_device_mode, channel);
|
||||||
channel_name_set_by_device_mode_and_channel(custom_device_mode, channel);
|
|
||||||
} else {
|
} else {
|
||||||
return boost::shared_ptr<ChannelNameSet>();
|
return boost::shared_ptr<ChannelNameSet>();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -57,8 +57,8 @@ public:
|
||||||
void unfreeze ();
|
void unfreeze ();
|
||||||
|
|
||||||
boost::shared_ptr<Region> bounce (InterThreadInfo&);
|
boost::shared_ptr<Region> bounce (InterThreadInfo&);
|
||||||
boost::shared_ptr<Region> bounce_range (nframes_t start, nframes_t end, InterThreadInfo&,
|
boost::shared_ptr<Region> bounce_range (
|
||||||
bool enable_processing);
|
nframes_t start, nframes_t end, InterThreadInfo&, bool enable_processing);
|
||||||
|
|
||||||
int set_state(const XMLNode& node);
|
int set_state(const XMLNode& node);
|
||||||
|
|
||||||
|
|
@ -97,8 +97,8 @@ protected:
|
||||||
int _set_state (const XMLNode&, bool call_base);
|
int _set_state (const XMLNode&, bool call_base);
|
||||||
|
|
||||||
private:
|
private:
|
||||||
void write_out_of_band_data (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame,
|
void write_out_of_band_data (
|
||||||
nframes_t nframes);
|
BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes);
|
||||||
|
|
||||||
int set_diskstream (boost::shared_ptr<MidiDiskstream> ds);
|
int set_diskstream (boost::shared_ptr<MidiDiskstream> ds);
|
||||||
void use_new_diskstream ();
|
void use_new_diskstream ();
|
||||||
|
|
|
||||||
|
|
@ -25,7 +25,7 @@
|
||||||
#include <unistd.h>
|
#include <unistd.h>
|
||||||
|
|
||||||
class MTDM {
|
class MTDM {
|
||||||
public:
|
public:
|
||||||
|
|
||||||
MTDM ();
|
MTDM ();
|
||||||
|
|
||||||
|
|
@ -36,7 +36,7 @@ class MTDM {
|
||||||
double del (void) { return _del; }
|
double del (void) { return _del; }
|
||||||
double err (void) { return _err; }
|
double err (void) { return _err; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
class Freq {
|
class Freq {
|
||||||
public:
|
public:
|
||||||
int p;
|
int p;
|
||||||
|
|
|
||||||
|
|
@ -185,7 +185,7 @@ class Multi2dPanner : public StreamPanner
|
||||||
|
|
||||||
class Panner : public SessionObject, public AutomatableControls
|
class Panner : public SessionObject, public AutomatableControls
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
struct Output {
|
struct Output {
|
||||||
float x;
|
float x;
|
||||||
float y;
|
float y;
|
||||||
|
|
|
||||||
|
|
@ -26,7 +26,7 @@
|
||||||
namespace ARDOUR {
|
namespace ARDOUR {
|
||||||
|
|
||||||
class RuntimeProfile {
|
class RuntimeProfile {
|
||||||
public:
|
public:
|
||||||
enum Element {
|
enum Element {
|
||||||
SmallScreen,
|
SmallScreen,
|
||||||
SAE,
|
SAE,
|
||||||
|
|
@ -46,7 +46,7 @@ class RuntimeProfile {
|
||||||
void set_single_package () { bits[SinglePackage] = true; }
|
void set_single_package () { bits[SinglePackage] = true; }
|
||||||
bool get_single_package () const { return bits[SinglePackage]; }
|
bool get_single_package () const { return bits[SinglePackage]; }
|
||||||
|
|
||||||
private:
|
private:
|
||||||
boost::dynamic_bitset<uint64_t> bits;
|
boost::dynamic_bitset<uint64_t> bits;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -856,7 +856,6 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable
|
||||||
GlobalRouteBooleanState before, after;
|
GlobalRouteBooleanState before, after;
|
||||||
Session& sess;
|
Session& sess;
|
||||||
void* src;
|
void* src;
|
||||||
|
|
||||||
};
|
};
|
||||||
|
|
||||||
class GlobalSoloStateCommand : public GlobalRouteStateCommand
|
class GlobalSoloStateCommand : public GlobalRouteStateCommand
|
||||||
|
|
|
||||||
|
|
@ -418,7 +418,8 @@ namespace ARDOUR {
|
||||||
};
|
};
|
||||||
|
|
||||||
struct TimeFXRequest : public InterThreadInfo {
|
struct TimeFXRequest : public InterThreadInfo {
|
||||||
TimeFXRequest() : time_fraction(0), pitch_fraction(0),
|
TimeFXRequest()
|
||||||
|
: time_fraction(0), pitch_fraction(0),
|
||||||
quick_seek(false), antialias(false), opts(0) {}
|
quick_seek(false), antialias(false), opts(0) {}
|
||||||
float time_fraction;
|
float time_fraction;
|
||||||
float pitch_fraction;
|
float pitch_fraction;
|
||||||
|
|
|
||||||
|
|
@ -38,8 +38,8 @@ using namespace ARDOUR;
|
||||||
using namespace PBD;
|
using namespace PBD;
|
||||||
|
|
||||||
CoreAudioSource::CoreAudioSource (Session& s, const XMLNode& node)
|
CoreAudioSource::CoreAudioSource (Session& s, const XMLNode& node)
|
||||||
: Source (s, node),
|
: Source (s, node)
|
||||||
AudioFileSource (s, node)
|
, AudioFileSource (s, node)
|
||||||
{
|
{
|
||||||
init ();
|
init ();
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue