summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2014-12-30 14:41:22 -0500
committerDavid Robillard <d@drobilla.net>2014-12-30 14:41:22 -0500
commitc35e94a3c83028220f6eb494fdfe9c1960aaf751 (patch)
tree2b73df60308f20be8436001b82cfb0be1acd28ee /libs/ardour/ardour
parenta85827da1c9def35bcb4e43b657cdf0b1d728181 (diff)
Fix some mangled whitespace (noop).
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/midi_diskstream.h10
-rw-r--r--libs/ardour/ardour/midi_port.h14
-rw-r--r--libs/ardour/ardour/midi_scene_change.h2
-rw-r--r--libs/ardour/ardour/midi_scene_changer.h13
-rw-r--r--libs/ardour/ardour/midi_track.h30
-rw-r--r--libs/ardour/ardour/plugin.h18
-rw-r--r--libs/ardour/ardour/plugin_insert.h4
-rw-r--r--libs/ardour/ardour/processor.h6
-rw-r--r--libs/ardour/ardour/proxy_controllable.h17
-rw-r--r--libs/ardour/ardour/scene_change.h20
10 files changed, 68 insertions, 66 deletions
diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h
index fea758d622..7e72ef9a7e 100644
--- a/libs/ardour/ardour/midi_diskstream.h
+++ b/libs/ardour/ardour/midi_diskstream.h
@@ -66,7 +66,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
float capture_buffer_load() const;
void get_playback (MidiBuffer& dst, framecnt_t);
- void flush_playback (framepos_t, framepos_t);
+ void flush_playback (framepos_t, framepos_t);
void set_record_enabled (bool yn);
@@ -127,9 +127,11 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream
friend class Auditioner;
int seek (framepos_t which_sample, bool complete_refill = false);
- int process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_diskstream);
- frameoffset_t calculate_playback_distance (pframes_t nframes);
- bool commit (framecnt_t nframes);
+ int process (BufferSet&, framepos_t transport_frame, pframes_t nframes, framecnt_t &, bool need_diskstream);
+
+ frameoffset_t calculate_playback_distance (pframes_t nframes);
+ bool commit (framecnt_t nframes);
+
static framecnt_t midi_readahead;
private:
diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h
index f98fa803ae..0053a4dc72 100644
--- a/libs/ardour/ardour/midi_port.h
+++ b/libs/ardour/ardour/midi_port.h
@@ -46,7 +46,7 @@ class LIBARDOUR_API MidiPort : public Port {
void transport_stopped ();
void realtime_locate ();
void reset ();
- void require_resolve ();
+ void require_resolve ();
bool input_active() const { return _input_active; }
void set_input_active (bool yn);
@@ -55,20 +55,20 @@ class LIBARDOUR_API MidiPort : public Port {
MidiBuffer& get_midi_buffer (pframes_t nframes);
- void set_always_parse (bool yn);
- MIDI::Parser& self_parser() { return _self_parser; }
+ void set_always_parse (bool yn);
+ MIDI::Parser& self_parser() { return _self_parser; }
protected:
- friend class PortManager;
+ friend class PortManager;
- MidiPort (const std::string& name, PortFlags);
+ MidiPort (const std::string& name, PortFlags);
private:
MidiBuffer* _buffer;
bool _has_been_mixed_down;
bool _resolve_required;
bool _input_active;
- bool _always_parse;
+ bool _always_parse;
/* Naming this is tricky. AsyncMIDIPort inherits (for now, aug 2013) from
* both MIDI::Port, which has _parser, and this (ARDOUR::MidiPort). We
@@ -81,7 +81,7 @@ class LIBARDOUR_API MidiPort : public Port {
* into this object, somehow.
*/
- MIDI::Parser _self_parser;
+ MIDI::Parser _self_parser;
void resolve_notes (void* buffer, framepos_t when);
};
diff --git a/libs/ardour/ardour/midi_scene_change.h b/libs/ardour/ardour/midi_scene_change.h
index 450f18d3f2..41167f167d 100644
--- a/libs/ardour/ardour/midi_scene_change.h
+++ b/libs/ardour/ardour/midi_scene_change.h
@@ -53,7 +53,7 @@ class MIDISceneChange : public SceneChange
XMLNode& get_state();
int set_state (const XMLNode&, int version);
- bool operator==(const MIDISceneChange& other) const;
+ bool operator==(const MIDISceneChange& other) const;
private:
int _bank;
diff --git a/libs/ardour/ardour/midi_scene_changer.h b/libs/ardour/ardour/midi_scene_changer.h
index e336eb8754..6eff899b8e 100644
--- a/libs/ardour/ardour/midi_scene_changer.h
+++ b/libs/ardour/ardour/midi_scene_changer.h
@@ -45,12 +45,13 @@ class MIDISceneChanger : public SceneChanger
void set_recording (bool);
void locate (framepos_t);
- /** Signal emitted whenever any relevant MIDI input is detected.
- */
- PBD::Signal0<void> MIDIInputActivity;
- /** Signal emitted whenever any relevant MIDI output is sent.
- */
- PBD::Signal0<void> MIDIOutputActivity;
+ /** Signal emitted whenever any relevant MIDI input is detected.
+ */
+ PBD::Signal0<void> MIDIInputActivity;
+
+ /** Signal emitted whenever any relevant MIDI output is sent.
+ */
+ PBD::Signal0<void> MIDIOutputActivity;
private:
typedef std::multimap<framepos_t,boost::shared_ptr<MIDISceneChange> > Scenes;
diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h
index dbfd18c090..2af5b4cf87 100644
--- a/libs/ardour/ardour/midi_track.h
+++ b/libs/ardour/ardour/midi_track.h
@@ -115,30 +115,30 @@ public:
* If mode is ForceChannel, mask is simply a channel number which all events will
* be forced to while reading.
*/
- void set_capture_channel_mode (ChannelMode mode, uint16_t mask);
- void set_playback_channel_mode (ChannelMode mode, uint16_t mask);
- void set_playback_channel_mask (uint16_t mask);
- void set_capture_channel_mask (uint16_t mask);
+ void set_capture_channel_mode (ChannelMode mode, uint16_t mask);
+ void set_playback_channel_mode (ChannelMode mode, uint16_t mask);
+ void set_playback_channel_mask (uint16_t mask);
+ void set_capture_channel_mask (uint16_t mask);
ChannelMode get_playback_channel_mode() const {
return static_cast<ChannelMode>((g_atomic_int_get(&_playback_channel_mask) & 0xffff0000) >> 16);
}
- uint16_t get_playback_channel_mask() const {
+ uint16_t get_playback_channel_mask() const {
return g_atomic_int_get(&_playback_channel_mask) & 0x0000ffff;
}
ChannelMode get_capture_channel_mode() const {
return static_cast<ChannelMode>((g_atomic_int_get(&_capture_channel_mask) & 0xffff0000) >> 16);
}
- uint16_t get_capture_channel_mask() const {
+ uint16_t get_capture_channel_mask() const {
return g_atomic_int_get(&_capture_channel_mask) & 0x0000ffff;
}
boost::shared_ptr<MidiPlaylist> midi_playlist ();
- PBD::Signal0<void> PlaybackChannelMaskChanged;
- PBD::Signal0<void> PlaybackChannelModeChanged;
- PBD::Signal0<void> CaptureChannelMaskChanged;
- PBD::Signal0<void> CaptureChannelModeChanged;
+ PBD::Signal0<void> PlaybackChannelMaskChanged;
+ PBD::Signal0<void> PlaybackChannelModeChanged;
+ PBD::Signal0<void> CaptureChannelMaskChanged;
+ PBD::Signal0<void> CaptureChannelModeChanged;
PBD::Signal1<void, boost::weak_ptr<MidiSource> > DataRecorded;
boost::shared_ptr<MidiBuffer> get_gui_feed_buffer () const;
@@ -161,8 +161,8 @@ private:
NoteMode _note_mode;
bool _step_editing;
bool _input_active;
- uint32_t _playback_channel_mask; // 16 bits mode, 16 bits mask
- uint32_t _capture_channel_mask; // 16 bits mode, 16 bits mask
+ uint32_t _playback_channel_mask; // 16 bits mode, 16 bits mask
+ uint32_t _capture_channel_mask; // 16 bits mode, 16 bits mask
virtual boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &);
@@ -183,7 +183,7 @@ private:
void track_input_active (IOChange, void*);
void map_input_active (bool);
- void filter_channels (BufferSet& bufs, ChannelMode mode, uint32_t mask);
+ void filter_channels (BufferSet& bufs, ChannelMode mode, uint32_t mask);
/* if mode is ForceChannel, force mask to the lowest set channel or 1 if no
* channels are set.
@@ -194,7 +194,7 @@ private:
mask = force_mask (mode, mask);
g_atomic_int_set(&_playback_channel_mask, (uint32_t(mode) << 16) | uint32_t(mask));
}
- void _set_playback_channel_mask (uint16_t mask) {
+ void _set_playback_channel_mask (uint16_t mask) {
mask = force_mask (get_playback_channel_mode(), mask);
g_atomic_int_set(&_playback_channel_mask, (uint32_t(get_playback_channel_mode()) << 16) | uint32_t(mask));
}
@@ -202,7 +202,7 @@ private:
mask = force_mask (mode, mask);
g_atomic_int_set(&_capture_channel_mask, (uint32_t(mode) << 16) | uint32_t(mask));
}
- void _set_capture_channel_mask (uint16_t mask) {
+ void _set_capture_channel_mask (uint16_t mask) {
mask = force_mask (get_capture_channel_mode(), mask);
g_atomic_int_set(&_capture_channel_mask, (uint32_t(get_capture_channel_mode()) << 16) | uint32_t(mask));
}
diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h
index 480b64dc53..ed028e3572 100644
--- a/libs/ardour/ardour/plugin.h
+++ b/libs/ardour/ardour/plugin.h
@@ -166,25 +166,25 @@ class LIBARDOUR_API Plugin : public PBD::StatefulDestructible, public Latent
std::vector<PresetRecord> get_presets ();
- /** @return true if this plugin will respond to MIDI program
+ /** @return true if this plugin will respond to MIDI program
* change messages by changing presets.
*
* This is hard to return a correct value for because most plugin APIs
* do not specify plugin behaviour. However, if you want to force
- * the display of plugin built-in preset names rather than MIDI program
- * numbers, return true. If you want a generic description, return
+ * the display of plugin built-in preset names rather than MIDI program
+ * numbers, return true. If you want a generic description, return
* false.
- */
- virtual bool presets_are_MIDI_programs() const { return false; }
+ */
+ virtual bool presets_are_MIDI_programs() const { return false; }
- /** @return true if this plugin is General MIDI compliant, false
+ /** @return true if this plugin is General MIDI compliant, false
* otherwise.
*
* It is important to note that it is is almost impossible for a host
* (e.g. Ardour) to determine this for just about any plugin API
* known as of June 2012
*/
- virtual bool current_preset_uses_general_midi() const { return false; }
+ virtual bool current_preset_uses_general_midi() const { return false; }
/** @return Last preset to be requested; the settings may have
* been changed since; find out with parameter_changed_since_last_preset.
@@ -266,8 +266,8 @@ class LIBARDOUR_API Plugin : public PBD::StatefulDestructible, public Latent
/** Emitted when a property is changed in the plugin. */
PBD::Signal2<void, uint32_t, Variant> PropertyChanged;
- PBD::Signal1<void,uint32_t> StartTouch;
- PBD::Signal1<void,uint32_t> EndTouch;
+ PBD::Signal1<void,uint32_t> StartTouch;
+ PBD::Signal1<void,uint32_t> EndTouch;
protected:
diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h
index 6571732bb9..dfc7c1415a 100644
--- a/libs/ardour/ardour/plugin_insert.h
+++ b/libs/ardour/ardour/plugin_insert.h
@@ -207,8 +207,8 @@ class LIBARDOUR_API PluginInsert : public Processor
boost::shared_ptr<Plugin> plugin_factory (boost::shared_ptr<Plugin>);
void add_plugin (boost::shared_ptr<Plugin>);
- void start_touch (uint32_t param_id);
- void end_touch (uint32_t param_id);
+ void start_touch (uint32_t param_id);
+ void end_touch (uint32_t param_id);
};
} // namespace ARDOUR
diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h
index 4f8434f179..fa75876580 100644
--- a/libs/ardour/ardour/processor.h
+++ b/libs/ardour/ardour/processor.h
@@ -118,8 +118,8 @@ class LIBARDOUR_API Processor : public SessionObject, public Automatable, public
ProcessorWindowProxy * window_proxy () const { return _window_proxy; }
void set_window_proxy (ProcessorWindowProxy* wp);
- void set_owner (SessionObject*);
- SessionObject* owner() const;
+ void set_owner (SessionObject*);
+ SessionObject* owner() const;
protected:
virtual int set_state_2X (const XMLNode&, int version);
@@ -134,7 +134,7 @@ protected:
bool _pre_fader; ///< true if this processor is currently placed before the Amp, otherwise false
void* _ui_pointer;
ProcessorWindowProxy *_window_proxy;
- SessionObject* _owner;
+ SessionObject* _owner;
};
} // namespace ARDOUR
diff --git a/libs/ardour/ardour/proxy_controllable.h b/libs/ardour/ardour/proxy_controllable.h
index 522c3a2794..b2f230ec87 100644
--- a/libs/ardour/ardour/proxy_controllable.h
+++ b/libs/ardour/ardour/proxy_controllable.h
@@ -40,17 +40,16 @@ public:
, _getter (getter)
{}
- void set_value (double v) { if (_setter (v)) { Changed(); /* EMIT SIGNAL */ } }
- double get_value () const { return _getter (); }
+ void set_value (double v) { if (_setter (v)) { Changed(); /* EMIT SIGNAL */ } }
+ double get_value () const { return _getter (); }
- double internal_to_user (double i) const { return accurate_coefficient_to_dB (i);}
- double user_to_internal (double u) const { return dB_to_coefficient(u) ;}
+ double internal_to_user (double i) const { return accurate_coefficient_to_dB (i);}
+ double user_to_internal (double u) const { return dB_to_coefficient(u) ;}
- std::string get_user_string () const
- {
- char theBuf[32]; sprintf( theBuf, "%3.1f dB", accurate_coefficient_to_dB (get_value()));
- return std::string(theBuf);
- }
+ std::string get_user_string () const {
+ char theBuf[32]; sprintf( theBuf, "%3.1f dB", accurate_coefficient_to_dB (get_value()));
+ return std::string(theBuf);
+ }
private:
boost::function1<bool,double> _setter;
diff --git a/libs/ardour/ardour/scene_change.h b/libs/ardour/ardour/scene_change.h
index 4ad0ce5f39..ee711985b5 100644
--- a/libs/ardour/ardour/scene_change.h
+++ b/libs/ardour/ardour/scene_change.h
@@ -30,22 +30,22 @@ namespace ARDOUR
class SceneChange : public PBD::Stateful
{
public:
- SceneChange ();
- virtual ~SceneChange () {};
+ SceneChange ();
+ virtual ~SceneChange () {};
static boost::shared_ptr<SceneChange> factory (const XMLNode&, int version);
static std::string xml_node_name;
- uint32_t color() const;
- void set_color (uint32_t);
- bool color_out_of_bounds() const { return _color == out_of_bound_color; }
- static const uint32_t out_of_bound_color;
+ uint32_t color() const;
+ void set_color (uint32_t);
+ bool color_out_of_bounds() const { return _color == out_of_bound_color; }
+ static const uint32_t out_of_bound_color;
- PBD::Signal0<void> ColorChanged;
+ PBD::Signal0<void> ColorChanged;
- protected:
- /* derived classes are responsible for serializing & deserializing this value */
- uint32_t _color;
+protected:
+ /* derived classes are responsible for serializing & deserializing this value */
+ uint32_t _color;
};