diff options
author | Robin Gareus <robin@gareus.org> | 2015-10-05 16:17:49 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2015-10-05 16:17:49 +0200 |
commit | 22b07e0233a29d9633ffa825a79503befaf2e16e (patch) | |
tree | 1d8b06056f8e12197158f5d906319767d3dedda5 /libs/ardour/ardour | |
parent | e11ba7b79d68bc1070b170236c22123966d7bcc3 (diff) |
NOOP, remove trailing tabs/whitespace.
Diffstat (limited to 'libs/ardour/ardour')
45 files changed, 121 insertions, 121 deletions
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 25e2518c83..ddea43f889 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -69,7 +69,7 @@ namespace ARDOUR { LIBARDOUR_API void make_property_quarks (); extern LIBARDOUR_API PBD::PropertyChange bounds_change; - + extern LIBARDOUR_API const char* const ardour_config_info; LIBARDOUR_API void find_bindings_files (std::map<std::string,std::string>&); diff --git a/libs/ardour/ardour/async_midi_port.h b/libs/ardour/ardour/async_midi_port.h index db86fda798..e28c6922d2 100644 --- a/libs/ardour/ardour/async_midi_port.h +++ b/libs/ardour/ardour/async_midi_port.h @@ -77,7 +77,7 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port { static pthread_t get_process_thread () { return _process_thread; } static bool is_process_thread(); - private: + private: bool _currently_in_cycle; MIDI::timestamp_t _last_write_timestamp; bool have_timer; @@ -90,7 +90,7 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port { int create_port (); /** Channel used to signal to the MidiControlUI that input has arrived */ - + std::string _connections; PBD::ScopedConnection connect_connection; PBD::ScopedConnection halt_connection; diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h index 91f463cc7f..f3ec2ed25a 100644 --- a/libs/ardour/ardour/audio_buffer.h +++ b/libs/ardour/ardour/audio_buffer.h @@ -103,7 +103,7 @@ public: const Sample* const src_raw = src + src_offset; mix_buffers_no_gain(dst_raw, src_raw, len); - + _silent = false; _written = true; } diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index e4a5dc356d..17e2223680 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -71,7 +71,7 @@ class LIBARDOUR_API AudioTrack : public Track private: boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &); - + int deprecated_use_diskstream_connections (); void set_state_part_two (); void set_state_part_three (); diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index fe5327fd03..41654a811a 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -93,7 +93,7 @@ class LIBARDOUR_API AUPlugin : public ARDOUR::Plugin bool parameter_is_control (uint32_t) const; bool parameter_is_input (uint32_t) const; bool parameter_is_output (uint32_t) const; - + void set_info (PluginInfoPtr); int set_state(const XMLNode& node, int); diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index e2ae52996d..330af8d900 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -243,10 +243,10 @@ class LIBARDOUR_API AudioEngine : public SessionHandlePtr, public PortManager * countdown, whose duration will be reduced to half of its previous * value. */ - + PBD::Signal0<void> BecameSilent; void reset_silence_countdown (); - + private: AudioEngine (); @@ -308,10 +308,10 @@ class LIBARDOUR_API AudioEngine : public SessionHandlePtr, public PortManager #ifdef SILENCE_AFTER framecnt_t _silence_countdown; uint32_t _silence_hit_cnt; -#endif +#endif }; - + } // namespace ARDOUR #endif /* __ardour_audioengine_h__ */ diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 3de6de11fa..45b7fea520 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -140,7 +140,7 @@ class LIBARDOUR_API AudioRegion : public Region void set_default_fade_out (); framecnt_t verify_xfade_bounds (framecnt_t, bool start); - + void set_envelope_active (bool yn); void set_default_envelope (); @@ -187,7 +187,7 @@ class LIBARDOUR_API AudioRegion : public Region private: friend class ::AudioRegionReadTest; friend class ::PlaylistReadTest; - + PBD::Property<bool> _envelope_active; PBD::Property<bool> _default_fade_in; PBD::Property<bool> _default_fade_out; diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index cfeaeafa86..bc47f2fe06 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -52,9 +52,9 @@ public: AutomationListProperty (PBD::PropertyDescriptor<boost::shared_ptr<AutomationList> > d, Ptr o, Ptr c) : PBD::SharedStatefulProperty<AutomationList> (d.property_id, o, c) {} - + PBD::PropertyBase* clone () const; - + private: /* No copy-construction nor assignment */ AutomationListProperty (AutomationListProperty const &); diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h index 8d196b36d7..0c14d2a049 100644 --- a/libs/ardour/ardour/control_protocol_manager.h +++ b/libs/ardour/ardour/control_protocol_manager.h @@ -65,10 +65,10 @@ class LIBARDOUR_API ControlProtocolManager : public PBD::Stateful, public ARDOUR void load_mandatory_protocols (); void midi_connectivity_established (); void drop_protocols (); - + int activate (ControlProtocolInfo&); int deactivate (ControlProtocolInfo&); - + std::list<ControlProtocolInfo*> control_protocol_info; static const std::string state_node_name; diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index e19eef719f..13e1cdcda3 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -114,7 +114,7 @@ public: private: bool _no_outs_cuz_we_no_monitor; boost::shared_ptr<MuteMaster> _mute_master; - + static bool panners_legal; static PBD::Signal0<void> PannersLegal; diff --git a/libs/ardour/ardour/engine_state_controller.h b/libs/ardour/ardour/engine_state_controller.h index 76ed08b3ab..7cf4e057dc 100644 --- a/libs/ardour/ardour/engine_state_controller.h +++ b/libs/ardour/ardour/engine_state_controller.h @@ -472,7 +472,7 @@ class EngineStateController std::string device_name; ///< state device name ARDOUR::framecnt_t sample_rate; ///< sample rate used by the device in this state ARDOUR::pframes_t buffer_size; ///< buffer size used by the device in this state - + PortStateList input_channel_states; ///< states of device Audio inputs PortStateList multi_out_channel_states; ///< states of device Audio inputs in Multi Out mode PortStateList stereo_out_channel_states; ///< states of device Audio inputs in Stereo Out mode diff --git a/libs/ardour/ardour/export_format_specification.h b/libs/ardour/ardour/export_format_specification.h index 87a7729887..1223fa2d4b 100644 --- a/libs/ardour/ardour/export_format_specification.h +++ b/libs/ardour/ardour/export_format_specification.h @@ -114,36 +114,36 @@ class LIBARDOUR_API ExportFormatSpecification : public ExportFormatBase { std::string format_name () const { return _format_name; } Type type () const { return _type; } - + FormatId format_id () const { if (!format_ids.empty() ) return *format_ids.begin(); else return FormatId(0); } - + Endianness endianness () const { if (!endiannesses.empty() ) return *endiannesses.begin(); else return Endianness(0); } - + SampleFormat sample_format () const { if (!sample_formats.empty() ) return *sample_formats.begin(); else return SampleFormat(0); } - + SampleRate sample_rate () const { if (!sample_rates.empty() ) return *sample_rates.begin(); else return SampleRate(0); - + } - + Quality quality () const { if (!qualities.empty() ) return *qualities.begin(); diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index 0929c3303f..00fb74b426 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -47,7 +47,7 @@ public: virtual ~FileSource (); const std::string& path() const { return _path; } - + virtual bool safe_file_extension (const std::string& path) const = 0; int move_to_trash (const std::string& trash_dir_name); @@ -79,7 +79,7 @@ public: const std::string& origin() const { return _origin; } virtual void set_path (const std::string&); - + static PBD::Signal2<int,std::string,std::vector<std::string> > AmbiguousFileName; void existence_check (); diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h index 7a2ac9455a..2d4a0adb30 100644 --- a/libs/ardour/ardour/graph.h +++ b/libs/ardour/ardour/graph.h @@ -45,7 +45,7 @@ class Graph; class Route; class Session; -class GraphEdges; +class GraphEdges; typedef boost::shared_ptr<GraphNode> node_ptr_t; diff --git a/libs/ardour/ardour/graphnode.h b/libs/ardour/ardour/graphnode.h index 55867eac4c..aa04d9b20a 100644 --- a/libs/ardour/ardour/graphnode.h +++ b/libs/ardour/ardour/graphnode.h @@ -37,7 +37,7 @@ typedef boost::shared_ptr<GraphNode> node_ptr_t; typedef std::set< node_ptr_t > node_set_t; typedef std::list< node_ptr_t > node_list_t; -/** A node on our processing graph, ie a Route */ +/** A node on our processing graph, ie a Route */ class LIBARDOUR_API GraphNode { public: diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index b55a976023..17ebf86034 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -71,7 +71,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream void set_record_enabled (bool yn); void set_record_safe (bool yn); - + void reset_tracker (); void resolve_tracker (Evoral::EventSink<framepos_t>& buffer, framepos_t time); diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h index b410f3d5af..eb90dc1e35 100644 --- a/libs/ardour/ardour/midi_port.h +++ b/libs/ardour/ardour/midi_port.h @@ -57,7 +57,7 @@ class LIBARDOUR_API MidiPort : public Port { void set_always_parse (bool yn); void set_trace_on (bool yn); - + MIDI::Parser& self_parser() { return _self_parser; } protected: @@ -72,7 +72,7 @@ class LIBARDOUR_API MidiPort : public Port { bool _input_active; bool _always_parse; bool _trace_on; - + /* Naming this is tricky. AsyncMIDIPort inherits (for now, aug 2013) from * both MIDI::Port, which has _parser, and this (ARDOUR::MidiPort). We * need parsing support in this object, independently of what the diff --git a/libs/ardour/ardour/midi_scene_change.h b/libs/ardour/ardour/midi_scene_change.h index 41167f167d..245b749272 100644 --- a/libs/ardour/ardour/midi_scene_change.h +++ b/libs/ardour/ardour/midi_scene_change.h @@ -62,6 +62,6 @@ class MIDISceneChange : public SceneChange }; } /* namespace */ - + #endif /* __libardour_scene_change_h__ */ diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index 2ba57e4e01..c48f384ce9 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -150,7 +150,7 @@ private: MidiChannelFilter _capture_filter; virtual boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &); - + boost::shared_ptr<MidiDiskstream> midi_diskstream () const; void write_out_of_band_data (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, framecnt_t nframes); diff --git a/libs/ardour/ardour/midiport_manager.h b/libs/ardour/ardour/midiport_manager.h index fade9c8beb..4e0f98cb3c 100644 --- a/libs/ardour/ardour/midiport_manager.h +++ b/libs/ardour/ardour/midiport_manager.h @@ -42,7 +42,7 @@ class LIBARDOUR_API MidiPortManager { public: MidiPortManager(); virtual ~MidiPortManager (); - + /* Ports used for control. These are read/written to outside of the * process callback (asynchronously with respect to when data * actually arrives). diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index 56c65a4dc2..1838fb5f56 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -159,7 +159,7 @@ public: int set_state (const XMLNode&, int version); XMLNode& get_state (); - + boost::shared_ptr<Pannable> pannable() const { return _pannable; } static bool equivalent (pan_t a, pan_t b) { diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 1b3f1d530f..de5a5dcb05 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -237,7 +237,7 @@ public: void set_layer (boost::shared_ptr<Region>, double); void set_capture_insertion_in_progress (bool yn); - + protected: friend class Session; diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index c927c1c061..f9831afcad 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -144,11 +144,11 @@ class LIBARDOUR_API Plugin : public PBD::StatefulDestructible, public Latent struct PresetRecord { PresetRecord () : number (-1), user (true) {} PresetRecord (const std::string& u, const std::string& l, int n = -1, bool s = true) : uri (u), label (l), number (n), user (s) {} - + bool operator!= (PresetRecord const & a) const { return number != a.number || uri != a.uri || label != a.label; } - + std::string uri; std::string label; int number; // if <0, invalid diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h index f9578a188d..8788778a3a 100644 --- a/libs/ardour/ardour/plugin_insert.h +++ b/libs/ardour/ardour/plugin_insert.h @@ -191,7 +191,7 @@ class LIBARDOUR_API PluginInsert : public Processor struct Match { Match () : method (Impossible), plugins (0) {} Match (MatchingMethod m, int32_t p, ChanCount h = ChanCount ()) : method (m), plugins (p), hide (h) {} - + MatchingMethod method; ///< method to employ int32_t plugins; ///< number of copies of the plugin that we need ChanCount hide; ///< number of channels to hide diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h index 663bb92324..2c081ddfa3 100644 --- a/libs/ardour/ardour/plugin_manager.h +++ b/libs/ardour/ardour/plugin_manager.h @@ -135,7 +135,7 @@ class LIBARDOUR_API PluginManager : public boost::noncopyable { int windows_vst_discover_from_path (std::string path, bool cache_only = false); int windows_vst_discover (std::string path, bool cache_only = false); - + int lxvst_discover_from_path (std::string path, bool cache_only = false); int lxvst_discover (std::string path, bool cache_only = false); diff --git a/libs/ardour/ardour/port_manager.h b/libs/ardour/ardour/port_manager.h index d76016c6a3..97b7a9c2f5 100644 --- a/libs/ardour/ardour/port_manager.h +++ b/libs/ardour/ardour/port_manager.h @@ -106,11 +106,11 @@ class LIBARDOUR_API PortManager public: PortRegistrationFailure (std::string const & why = "") : reason (why) {} - + ~PortRegistrationFailure () throw () {} - + const char *what() const throw () { return reason.c_str(); } - + private: std::string reason; }; @@ -157,7 +157,7 @@ class LIBARDOUR_API PortManager * Realtime safe. */ void cycle_start (pframes_t nframes); - + /** Signal the end of an audio cycle. * This signifies that the cycle began with @ref cycle_start has ended. * This MUST be called at the end of each cycle. @@ -167,7 +167,7 @@ class LIBARDOUR_API PortManager }; - + } // namespace #endif /* __libardour_port_manager_h__ */ diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 54cfd57fea..60999bf73a 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -153,7 +153,7 @@ class LIBARDOUR_API Region Evoral::Range<framepos_t> last_range () const { return Evoral::Range<framepos_t> (_last_position, _last_position + _last_length - 1); } - + Evoral::Range<framepos_t> range () const { return Evoral::Range<framepos_t> (first_frame(), last_frame()); } @@ -354,7 +354,7 @@ class LIBARDOUR_API Region virtual void set_position_internal (framepos_t pos, bool allow_bbt_recompute); virtual void set_length_internal (framecnt_t); virtual void set_start_internal (framecnt_t); - + DataType _type; PBD::Property<bool> _sync_marked; @@ -366,15 +366,15 @@ class LIBARDOUR_API Region PBD::Property<framepos_t> _position; /** Sync position relative to the start of our file */ PBD::Property<framepos_t> _sync_position; - + SourceList _sources; /** Used when timefx are applied, so we can always use the original source */ SourceList _master_sources; AnalysisFeatureList _transients; - + boost::weak_ptr<ARDOUR::Playlist> _playlist; - + private: void mid_thaw (const PBD::PropertyChange&); diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index d5228fadb7..08d9affc91 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -117,7 +117,7 @@ public: * announce=false but they still need to be in the map soon after * creation. */ - + static void map_add (boost::shared_ptr<Region>); private: diff --git a/libs/ardour/ardour/revision.h b/libs/ardour/ardour/revision.h index 7d746f2e2f..da589278b2 100644 --- a/libs/ardour/ardour/revision.h +++ b/libs/ardour/ardour/revision.h @@ -25,7 +25,7 @@ namespace ARDOUR { extern LIBARDOUR_API const char* revision; - + extern "C" { LIBARDOUR_API const char* get_ardour_revision(); } diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index c4decd48c8..d59c1e0610 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -113,7 +113,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou virtual MonitorState monitoring_state () const; virtual MeterState metering_state () const; - + /* these are the core of the API of a Route. see the protected sections as well */ virtual int roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, @@ -152,7 +152,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou bool muted () const; void set_mute (bool yn, void* src); - + bool muted_by_others() const; /* controls use set_solo() to modify this route's solo state @@ -547,7 +547,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou uint32_t _solo_isolated_by_upstream; void mod_solo_isolated_by_upstream (bool, void*); - + bool _denormal_protection; bool _recordable : 1; @@ -668,7 +668,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou Route (Route const &); void maybe_note_meter_position (); - + /** true if we've made a note of a custom meter position in these variables */ bool _custom_meter_position_noted; /** the processor that came after the meter when it was last set to a custom position, diff --git a/libs/ardour/ardour/route_graph.h b/libs/ardour/ardour/route_graph.h index 77e74ceafd..e1e1049cd6 100644 --- a/libs/ardour/ardour/route_graph.h +++ b/libs/ardour/ardour/route_graph.h @@ -41,7 +41,7 @@ class LIBARDOUR_API GraphEdges { public: typedef std::map<GraphVertex, std::set<GraphVertex> > EdgeMap; - + void add (GraphVertex from, GraphVertex to, bool via_sends_only); bool has (GraphVertex from, GraphVertex to, bool* via_sends_only); std::set<GraphVertex> from (GraphVertex r) const; @@ -49,12 +49,12 @@ public: bool has_none_to (GraphVertex to) const; bool empty () const; void dump () const; - + private: void insert (EdgeMap& e, GraphVertex a, GraphVertex b); - + typedef std::multimap<GraphVertex, std::pair<GraphVertex, bool> > EdgeMapWithSends; - + EdgeMapWithSends::iterator find_in_from_to_with_sends (GraphVertex, GraphVertex); /** map of edges with from as `first' and to as `second' */ diff --git a/libs/ardour/ardour/scene_change.h b/libs/ardour/ardour/scene_change.h index 1513622ed0..adb65546b5 100644 --- a/libs/ardour/ardour/scene_change.h +++ b/libs/ardour/ardour/scene_change.h @@ -54,6 +54,6 @@ class SceneChange : public PBD::Stateful }; } /* namespace */ - + #endif /* __libardour_scene_change_h__ */ diff --git a/libs/ardour/ardour/scene_changer.h b/libs/ardour/ardour/scene_changer.h index 6019ed9c6c..4b837f4cdb 100644 --- a/libs/ardour/ardour/scene_changer.h +++ b/libs/ardour/ardour/scene_changer.h @@ -45,12 +45,12 @@ class SceneChanger : public SessionHandleRef public: SceneChanger (Session& s) : SessionHandleRef (s) {} virtual ~SceneChanger () {}; - + virtual void run (framepos_t start, framepos_t end) = 0; virtual void locate (framepos_t where) = 0; }; } /* namespace */ - + #endif /* __libardour_scene_change_h__ */ diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h index 17343bff96..f944dcabfb 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -72,7 +72,7 @@ class LIBARDOUR_API Send : public Delivery bool set_name (const std::string& str); std::string value_as_string (boost::shared_ptr<AutomationControl>) const; - + static uint32_t how_many_sends(); static std::string name_and_id_new_send (Session&, Delivery::Role r, uint32_t&, bool); diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 2e6024badb..3d280be016 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -312,7 +312,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop /* Timecode status signals */ PBD::Signal1<void, bool> MTCSyncStateChanged; - PBD::Signal1<void, bool> LTCSyncStateChanged; + PBD::Signal1<void, bool> LTCSyncStateChanged; /* Record status signals */ @@ -362,7 +362,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop /* Timecode state signals */ PBD::Signal0<void> MtcOrLtcInputPortChanged; - + void queue_event (SessionEvent*); void request_roll_at_and_return (framepos_t start, framepos_t return_to); @@ -427,7 +427,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop framecnt_t worst_input_latency () const { return _worst_input_latency; } framecnt_t worst_track_latency () const { return _worst_track_latency; } framecnt_t worst_playback_latency () const { return _worst_output_latency + _worst_track_latency; } - + struct SaveAs { std::string new_parent_folder; /* parent folder where new session folder will be created */ std::string new_name; /* name of newly saved session */ @@ -437,7 +437,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool copy_external; /* true if external media should be consolidated into the newly saved session; false otherwise */ std::string final_session_folder_name; /* filled in by * Session::save_as(), provides full path to newly saved session */ - + /* emitted as we make progress. 3 arguments passed to signal * handler: * @@ -582,7 +582,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop AudioEngine const & engine () const { return _engine; } static std::string default_track_name_pattern (DataType); - + /* Time */ framepos_t transport_frame () const {return _transport_frame; } @@ -625,7 +625,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop bool synced_to_engine() const { return _slave && config.get_external_sync() && Config->get_sync_source() == Engine; } bool synced_to_mtc () const { return config.get_external_sync() && Config->get_sync_source() == MTC && g_atomic_int_get (const_cast<gint*>(&_mtc_active)); } bool synced_to_ltc () const { return config.get_external_sync() && Config->get_sync_source() == LTC && g_atomic_int_get (const_cast<gint*>(&_ltc_active)); } - + double transport_speed() const { return _transport_speed; } bool transport_stopped() const { return _transport_speed == 0.0f; } bool transport_rolling() const { return _transport_speed != 0.0f; } @@ -877,7 +877,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void set_object_selection (framepos_t start, framepos_t end); void clear_range_selection (); void clear_object_selection (); - + /* buffers for gain and pan */ gain_t* gain_automation_buffer () const; @@ -901,7 +901,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void* ptr, float opt ); - + static PBD::Signal0<void> SendFeedback; /* Speakers */ @@ -1025,7 +1025,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop boost::shared_ptr<MidiPort> scene_in () const; boost::shared_ptr<MidiPort> scene_out () const; - + boost::shared_ptr<MidiPort> midi_clock_output_port () const; boost::shared_ptr<MidiPort> midi_clock_input_port () const; boost::shared_ptr<MidiPort> mtc_output_port () const; @@ -1039,7 +1039,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void reconnect_ltc_input (); void reconnect_ltc_output (); - + protected: friend class AudioEngine; void set_block_size (pframes_t nframes); @@ -1115,7 +1115,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop PBD::ScopedConnection mtc_status_connection; void ltc_status_changed (bool); PBD::ScopedConnection ltc_status_connection; - + void initialize_latencies (); void set_worst_io_latencies (); void set_worst_playback_latency (); @@ -1319,7 +1319,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop int post_engine_init (); int immediately_post_engine (); void remove_empty_sounds (); - + void session_loaded (); void setup_midi_control (); @@ -1485,7 +1485,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void set_track_loop (bool); bool select_playhead_priority_target (framepos_t&); void follow_playhead_priority (); - + /* These are synchronous and so can only be called from within the process * cycle */ @@ -1712,7 +1712,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop */ Evoral::Range<framepos_t> _range_selection; Evoral::Range<framepos_t> _object_selection; - + /* main outs */ uint32_t main_outs; @@ -1770,7 +1770,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop ev->rt_slot = boost::bind (method, this, rl, targ, group_override); ev->rt_return = after; ev->event_loop = PBD::EventLoop::get_event_loop_for_thread (); - + return ev; } @@ -1824,16 +1824,16 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop /* Scene Changing */ SceneChanger* _scene_changer; - + /* persistent, non-track related MIDI ports */ MidiPortManager* _midi_ports; MIDI::MachineControl* _mmc; - + void setup_ltc (); void setup_click (); void setup_click_state (const XMLNode*); void setup_bundles (); - + void save_as_bring_callback (uint32_t, uint32_t, std::string); static int get_session_info_from_path (XMLTree& state_tree, const std::string& xmlpath); diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h index 02759bba7e..cca7f1274e 100644 --- a/libs/ardour/ardour/session_event.h +++ b/libs/ardour/ardour/session_event.h @@ -139,7 +139,7 @@ public: static void init_event_pool (); CrossThreadPool* event_pool() const { return own_pool; } - + private: static PerThreadPool* pool; CrossThreadPool* own_pool; diff --git a/libs/ardour/ardour/session_route.h b/libs/ardour/ardour/session_route.h index 61a5737afa..22bfc1f032 100644 --- a/libs/ardour/ardour/session_route.h +++ b/libs/ardour/ardour/session_route.h @@ -34,11 +34,11 @@ Session::foreach_route (T *obj, void (T::*func)(Route&), bool sort) { boost::shared_ptr<RouteList> r = routes.reader(); RouteList public_order (*r); - + if (sort) { public_order.sort (RoutePublicOrderSorter()); } - + for (RouteList::iterator i = public_order.begin(); i != public_order.end(); i++) { (obj->*func) (**i); } @@ -64,7 +64,7 @@ Session::foreach_route (T *obj, void (T::*func)(Route&, A), A arg1, bool sort) { boost::shared_ptr<RouteList> r = routes.reader(); RouteList public_order (*r); - + if (sort) { public_order.sort (RoutePublicOrderSorter()); } diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index bda47ceba0..cf8060d029 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -238,19 +238,19 @@ struct LIBARDOUR_API SafeTime { class LIBARDOUR_API TimecodeSlave : public Slave { public: TimecodeSlave () {} - + virtual Timecode::TimecodeFormat apparent_timecode_format() const = 0; - + /* this is intended to be used by a UI and polled from a timeout. it should return a string describing the current position of the TC source. it should NOT do any computation, but should use a cached value of the TC source position. */ virtual std::string approximate_current_position() const = 0; - + framepos_t timecode_offset; bool timecode_negative_offset; - + PBD::Signal1<void, bool> ActiveChanged; }; diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index 35e0c89297..8f58fda2fe 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -86,7 +86,7 @@ public: mutable framepos_t _smf_last_read_time; int open_for_write (); - + void ensure_disk_file (const Lock& lock); framecnt_t read_unlocked (const Lock& lock, diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 09b3d8b5eb..bb22a79c8e 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -158,7 +158,7 @@ class LIBARDOUR_API TempoSection : public MetricSection, public Tempo { the tempo section is located in. A value of 0.0 indicates that it occurs on the first beat of the bar, a value of 0.5 indicates that it occurs halfway through the bar and so on. - + this enables us to keep the tempo change at the same relative position within the bar if/when the meter changes. */ @@ -228,7 +228,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible BBTPoint (const MeterSection& m, const TempoSection& t, framepos_t f, uint32_t b, uint32_t e) : frame (f), meter (&m), tempo (&t), bar (b), beat (e) {} - + Timecode::BBT_Time bbt() const { return Timecode::BBT_Time (bar, beat, 0); } operator Timecode::BBT_Time() const { return bbt(); } operator framepos_t() const { return frame; } @@ -244,13 +244,13 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible void get_grid (BBTPointList::const_iterator&, BBTPointList::const_iterator&, framepos_t start, framepos_t end); - + /* TEMPO- AND METER-SENSITIVE FUNCTIONS bbt_time(), bbt_time_rt(), frame_time() and bbt_duration_at() are all sensitive to tempo and meter, and will give answers that align with the grid formed by tempo and meter sections. - + They SHOULD NOT be used to determine the position of events whose location is canonically defined in beats. */ @@ -266,7 +266,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible framecnt_t bbt_duration_at (framepos_t, const Timecode::BBT_Time&, int dir); /* TEMPO-SENSITIVE FUNCTIONS - + These next 4 functions will all take tempo in account and should be used to determine position (and in the last case, distance in beats) when tempo matters but meter does not. @@ -324,7 +324,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible void insert_time (framepos_t, framecnt_t); bool remove_time (framepos_t where, framecnt_t amount); //returns true if anything was moved - + int n_tempos () const; int n_meters () const; @@ -335,7 +335,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible friend class ::BBTTest; friend class ::FrameposPlusBeatsTest; friend class ::TempoTest; - + static Tempo _default_tempo; static Meter _default_meter; @@ -355,16 +355,16 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible BBTPointList::const_iterator bbt_before_or_at (framepos_t); BBTPointList::const_iterator bbt_before_or_at (const Timecode::BBT_Time&); BBTPointList::const_iterator bbt_after_or_at (framepos_t); - + framepos_t round_to_type (framepos_t fr, RoundMode dir, BBTPointType); void bbt_time (framepos_t, Timecode::BBT_Time&, const BBTPointList::const_iterator&); framecnt_t bbt_duration_at_unlocked (const Timecode::BBT_Time& when, const Timecode::BBT_Time& bbt, int dir); - + const MeterSection& first_meter() const; MeterSection& first_meter(); const TempoSection& first_tempo() const; TempoSection& first_tempo(); - + void do_insert (MetricSection* section); void add_tempo_locked (const Tempo&, Timecode::BBT_Time where, bool recompute); diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 2d67a0aa75..31ae261ea7 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -57,7 +57,7 @@ class LIBARDOUR_API Track : public Route, public PublicDiskstream PBD::Signal0<void> MonitoringChanged; MeterState metering_state () const; - + virtual int no_roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame, bool state_changing); @@ -221,13 +221,13 @@ class LIBARDOUR_API Track : public Route, public PublicDiskstream void maybe_declick (BufferSet&, framecnt_t, int); boost::shared_ptr<RecEnableControl> _rec_enable_control; - + framecnt_t check_initial_delay (framecnt_t nframes, framepos_t&); private: virtual boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &) = 0; - + void diskstream_playlist_changed (); void diskstream_record_enable_changed (); void diskstream_record_safe_changed (); diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index d073588b9e..f3767d471a 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -93,7 +93,7 @@ gain_to_slider_position (ARDOUR::gain_t g) K = 7.8990885960495589E+00 */ - + return 8.2857630370864188E-01 * pow(g,5.1526743785019269E-01) * exp (-g/7.8990885960495589E+00); #else return pow((6.0*log(g)/log(2.0)+192.0)/198.0, 8.0); @@ -110,9 +110,9 @@ slider_position_to_gain (double pos) #ifndef OLD_GAIN_MATH /* 5th order polynomial function fit to data from a TC Spectra console fader (image of fader gradations). - + y = a + bx1 + cx2 + dx3 + fx4 + gx5 - + a = -1.1945480381045521E-02 b = 1.5809476525537265E+00 c = -1.5850710838966151E+01 diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h index 3450e2a480..8e2e313c1f 100644 --- a/libs/ardour/ardour/vst_plugin.h +++ b/libs/ardour/ardour/vst_plugin.h @@ -56,7 +56,7 @@ public: bool parameter_is_control (uint32_t) const { return true; } bool parameter_is_input (uint32_t) const { return true; } bool parameter_is_output (uint32_t) const { return false; } - + int connect_and_run ( BufferSet&, ChanMapping in, ChanMapping out, pframes_t nframes, framecnt_t offset @@ -70,7 +70,7 @@ public: void print_parameter (uint32_t, char*, uint32_t len) const; bool has_editor () const; - + AEffect * plugin () const { return _plugin; } VSTState * state () const { return _state; } MidiBuffer * midi_buffer () const { return _midi_out_buf; } @@ -78,7 +78,7 @@ public: int set_state (XMLNode const &, int); int first_user_preset_index () const; - + protected: void set_plugin (AEffect *); gchar* get_chunk (bool) const; @@ -91,7 +91,7 @@ protected: XMLTree * presets_tree () const; std::string presets_file () const; void find_presets (); - + VSTHandle* _handle; VSTState* _state; AEffect* _plugin; diff --git a/libs/ardour/ardour/vst_types.h b/libs/ardour/ardour/vst_types.h index 9d4fc3450f..2e1c4074f2 100644 --- a/libs/ardour/ardour/vst_types.h +++ b/libs/ardour/ardour/vst_types.h @@ -44,12 +44,12 @@ struct LIBARDOUR_API _VSTInfo int numInputs; int numOutputs; int numParams; - + int wantMidi; int wantEvents; int hasEditor; int canProcessReplacing; - + char** ParamNames; char** ParamLabels; }; @@ -63,7 +63,7 @@ struct LIBARDOUR_API _VSTHandle void* dll; char* name; char* path; - + main_entry_t main_entry; int plugincnt; @@ -83,13 +83,13 @@ struct LIBARDOUR_API _VSTState void* windows_window; int xid; ///< X11 XWindow - + int want_resize; ///< Set to signal the plugin resized its UI void* extra_data; ///< Pointer to any extra data - + void * event_callback_thisptr; void (* eventProc) (void * event); - + VSTHandle* handle; int width; @@ -102,9 +102,9 @@ struct LIBARDOUR_API _VSTState int destroy; int vst_version; int has_editor; - + int program_set_without_editor; - + int want_program; int want_chunk; int n_pending_keys; @@ -112,7 +112,7 @@ struct LIBARDOUR_API _VSTState int wanted_chunk_size; float * want_params; float * set_params; - + VSTKey pending_keys[16]; int dispatcher_wantcall; diff --git a/libs/ardour/ardour/windows_vst_plugin.h b/libs/ardour/ardour/windows_vst_plugin.h index 17b72ac8da..c4648564af 100644 --- a/libs/ardour/ardour/windows_vst_plugin.h +++ b/libs/ardour/ardour/windows_vst_plugin.h @@ -26,7 +26,7 @@ struct LIBARDOUR_API _VSTHandle; typedef struct _VSTHandle VSTHandle; namespace ARDOUR { - + class AudioEngine; class Session; |