diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-04 14:51:05 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-10-04 14:51:05 -0400 |
| commit | 4dc63966f0872efe768dad61eb9b8785d06b92d1 (patch) | |
| tree | e54104d57d6c2da7840979181368151fd0819c96 /libs/ardour | |
| parent | 297e80e020da94a56984b20782584bb1dd96ea34 (diff) | |
globally remove all trailing whitespace from ardour code base.
Paul Davis was responsible for introducing almost all of this.
Diffstat (limited to 'libs/ardour')
144 files changed, 1068 insertions, 1068 deletions
diff --git a/libs/ardour/ardour/analyser.h b/libs/ardour/ardour/analyser.h index cef71186cc..8e757ef4e9 100644 --- a/libs/ardour/ardour/analyser.h +++ b/libs/ardour/ardour/analyser.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/async_midi_port.h b/libs/ardour/ardour/async_midi_port.h index cbe9bb1a9c..db86fda798 100644 --- a/libs/ardour/ardour/async_midi_port.h +++ b/libs/ardour/ardour/async_midi_port.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1998-2010 Paul Barton-Davis + Copyright (C) 1998-2010 Paul Barton-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 @@ -51,9 +51,9 @@ class LIBARDOUR_API AsyncMIDIPort : public ARDOUR::MidiPort, public MIDI::Port { void cycle_start (pframes_t nframes); void cycle_end (pframes_t nframes); - + /* called from non-RT context */ - + void parse (framecnt_t timestamp); int write (const MIDI::byte *msg, size_t msglen, MIDI::timestamp_t timestamp); int read (MIDI::byte *buf, size_t bufsize); diff --git a/libs/ardour/ardour/audio_backend.h b/libs/ardour/ardour/audio_backend.h index a0893b846a..73310bddb6 100644 --- a/libs/ardour/ardour/audio_backend.h +++ b/libs/ardour/ardour/audio_backend.h @@ -37,7 +37,7 @@ #define ARDOURBACKEND_API LIBARDOUR_DLL_EXPORT #else #define ARDOURBACKEND_API LIBARDOUR_DLL_IMPORT -#endif +#endif #define ARDOURBACKEND_LOCAL LIBARDOUR_DLL_LOCAL namespace ARDOUR { @@ -46,7 +46,7 @@ struct LIBARDOUR_API AudioBackendInfo { const char* name; /** Using arg1 and arg2, initialize this audiobackend. - * + * * Returns zero on success, non-zero otherwise. */ int (*instantiate) (const std::string& arg1, const std::string& arg2); @@ -56,7 +56,7 @@ struct LIBARDOUR_API AudioBackendInfo { int (*deinstantiate) (void); /** Factory method to create an AudioBackend-derived class. - * + * * Returns a valid shared_ptr to the object if successfull, * or a "null" shared_ptr otherwise. */ @@ -85,7 +85,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { AudioBackend (AudioEngine& e, AudioBackendInfo& i) : PortEngine (e), _info (i), engine (e) {} virtual ~AudioBackend () {} - + enum ErrorCode { NoError = 0, BackendInitializationError = -64, @@ -156,7 +156,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { * before any device can be selected. Return false otherwise. * * Intended mainly to differentiate between meta-APIs like JACK - * which can still expose different backends (such as ALSA or CoreAudio + * which can still expose different backends (such as ALSA or CoreAudio * or FFADO or netjack) and those like ASIO or CoreAudio which * do not. */ @@ -180,7 +180,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { virtual int set_driver (const std::string& /*drivername*/) { return 0; } /** used to list device names along with whether or not they are currently - * available. + * available. */ struct DeviceStatus { std::string name; @@ -330,12 +330,12 @@ class LIBARDOUR_API AudioBackend : public PortEngine { virtual bool can_change_sample_rate_when_running () const = 0; /* Return true if the derived class can change the buffer size of the * device in use while the device is already being used. Return false - * otherwise. + * otherwise. */ virtual bool can_change_buffer_size_when_running () const = 0; /* Set the hardware parameters. - * + * * If called when the current state is stopped or paused, * the changes will not take effect until the state changes to running. * @@ -382,7 +382,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { * If @param yn is true, then the hardware will interleave * samples for successive channels; otherwise, the hardware will store * samples for a single channel contiguously. - * + * * Setting this does not change the fact that all data streams * to and from Ports are mono (essentially, non-interleaved) */ @@ -393,12 +393,12 @@ class LIBARDOUR_API AudioBackend : public PortEngine { /** Set the number of output channels that should be used */ virtual int set_output_channels (uint32_t) = 0; - /** Set the (additional) input latency that cannot be determined via + /** Set the (additional) input latency that cannot be determined via * the implementation's underlying code (e.g. latency from * external D-A/D-A converters. Units are samples. */ virtual int set_systemic_input_latency (uint32_t) = 0; - /** Set the (additional) output latency that cannot be determined via + /** Set the (additional) output latency that cannot be determined via * the implementation's underlying code (e.g. latency from * external D-A/D-A converters. Units are samples. */ @@ -432,7 +432,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { */ virtual std::string driver_name() const { return std::string(); } - /** Return the name of a control application for the + /** Return the name of a control application for the * selected/in-use device. If no such application exists, * or if no device has been selected or is in-use, * return an empty string. @@ -445,7 +445,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { virtual void launch_control_app () = 0; /* @return a vector of strings that describe the available - * MIDI options. + * MIDI options. * * These can be presented to the user to decide which * MIDI drivers, options etc. can be used. The returned strings @@ -477,11 +477,11 @@ class LIBARDOUR_API AudioBackend : public PortEngine { virtual bool can_set_systemic_midi_latencies () const = 0; /* State Control */ - + /** Start using the device named in the most recent call * to set_device(), with the parameters set by various * the most recent calls to set_sample_rate() etc. etc. - * + * * At some undetermined time after this function is successfully called, * the backend will start calling the ::process_callback() method of * the AudioEngine referenced by @param engine. These calls will @@ -507,28 +507,28 @@ class LIBARDOUR_API AudioBackend : public PortEngine { * this pattern, or possibly just this: * * http://stackoverflow.com/questions/12139786/good-pratice-default-arguments-for-pure-virtual-method - */ + */ int start (bool for_latency_measurement=false) { return _start (for_latency_measurement); } - /** Stop using the device currently in use. + /** Stop using the device currently in use. * * If the function is successfully called, no subsequent calls to the * process_callback() of @param engine will be made after the function * returns, until parameters are reset and start() are called again. - * + * * The backend is considered to be un-configured after a successful * return, and requires calls to set hardware parameters before it can be * start()-ed again. See pause() for a way to avoid this. stop() should - * only be used when reconfiguration is required OR when there are no + * only be used when reconfiguration is required OR when there are no * plans to use the backend in the future with a reconfiguration. * * Return zero if successful, 1 if the device is not in use, negative values on error */ virtual int stop () = 0; - /** Reset device. + /** Reset device. * * Return zero if successful, negative values on error */ @@ -557,8 +557,8 @@ class LIBARDOUR_API AudioBackend : public PortEngine { * from 0.0 to 1.0 * * E.g. if the buffer size represents 5msec and current processing - * takes 1msec, the returned value should be 0.2. - * + * takes 1msec, the returned value should be 0.2. + * * Implementations can feel free to smooth the values returned over * time (e.g. high pass filtering, or its equivalent). */ @@ -567,11 +567,11 @@ class LIBARDOUR_API AudioBackend : public PortEngine { /* Transport Control (JACK is the only audio API that currently offers the concept of shared transport control) */ - - /** Attempt to change the transport state to TransportRolling. + + /** Attempt to change the transport state to TransportRolling. */ virtual void transport_start () {} - /** Attempt to change the transport state to TransportStopped. + /** Attempt to change the transport state to TransportStopped. */ virtual void transport_stop () {} /** return the current transport state @@ -589,7 +589,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { * timebase, otherwise cease to be the time master for the same. * * Return zero on success, non-zero otherwise - * + * * JACK is the only currently known audio API with the concept of a shared * transport timebase. */ @@ -597,16 +597,16 @@ class LIBARDOUR_API AudioBackend : public PortEngine { virtual int usecs_per_cycle () const { return 1000000 * (buffer_size() / sample_rate()); } virtual size_t raw_buffer_size (DataType t) = 0; - + /* Process time */ - + /** return the time according to the sample clock in use, measured in * samples since an arbitrary zero time in the past. The value should * increase monotonically and linearly, without interruption from any * source (including CPU frequency scaling). * * It is extremely likely that any implementation will use a DLL, since - * this function can be called from any thread, at any time, and must be + * this function can be called from any thread, at any time, and must be * able to accurately determine the correct sample time. * * Can be called from any thread. @@ -620,7 +620,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { /** Return the time since the current buffer process cycle started, * in samples, according to the sample clock in use. - * + * * Can ONLY be called from within a process() callback tree (which * implies that it can only be called by a process thread) */ @@ -652,7 +652,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { virtual int create_process_thread (boost::function<void()> func) = 0; /** Wait for all processing threads to exit. - * + * * Return zero on success, non-zero on failure. */ virtual int join_process_threads () = 0; @@ -687,7 +687,7 @@ class LIBARDOUR_API AudioBackend : public PortEngine { } protected: - AudioBackendInfo& _info; + AudioBackendInfo& _info; AudioEngine& engine; virtual int _start (bool for_latency_measurement) = 0; @@ -696,4 +696,4 @@ class LIBARDOUR_API AudioBackend : public PortEngine { } // namespace #endif /* __libardour_audiobackend_h__ */ - + diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h index 33126b5baf..21a1789468 100644 --- a/libs/ardour/ardour/audio_diskstream.h +++ b/libs/ardour/ardour/audio_diskstream.h @@ -244,7 +244,7 @@ class LIBARDOUR_API AudioDiskstream : public Diskstream bool prep_record_enable (); bool prep_record_disable (); - + // Working buffers for do_refill (butler thread) static void allocate_working_buffers(); static void free_working_buffers(); diff --git a/libs/ardour/ardour/audio_port.h b/libs/ardour/ardour/audio_port.h index ca5f183a13..384de3ef5d 100644 --- a/libs/ardour/ardour/audio_port.h +++ b/libs/ardour/ardour/audio_port.h @@ -54,7 +54,7 @@ class LIBARDOUR_API AudioPort : public Port private: AudioBuffer* _buffer; - bool _buf_valid; + bool _buf_valid; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index 0bc8be81f4..e4a5dc356d 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -55,7 +55,7 @@ class LIBARDOUR_API AudioTrack : public Track bool bounceable (boost::shared_ptr<Processor>, bool include_endpoint) const; boost::shared_ptr<Region> bounce (InterThreadInfo&); - boost::shared_ptr<Region> bounce_range (framepos_t start, framepos_t end, InterThreadInfo&, + boost::shared_ptr<Region> bounce_range (framepos_t start, framepos_t end, InterThreadInfo&, boost::shared_ptr<Processor> endpoint, bool include_endpoint); int export_stuff (BufferSet& bufs, framepos_t start_frame, framecnt_t nframes, boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, bool for_freeze); diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index fcb1226e1a..e2ae52996d 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -75,7 +75,7 @@ class LIBARDOUR_API AudioEngine : public SessionHandlePtr, public PortManager ProcessThread* main_thread() const { return _main_thread; } - /* START BACKEND PROXY API + /* START BACKEND PROXY API * * See audio_backend.h for full documentation and semantics. These wrappers * just forward to a backend implementation. @@ -139,7 +139,7 @@ class LIBARDOUR_API AudioEngine : public SessionHandlePtr, public PortManager } framecnt_t processed_frames() const { return _processed_frames; } - + void set_session (Session *); void remove_session (); // not a replacement for SessionHandle::session_going_away() Session* session() const { return _session; } @@ -150,19 +150,19 @@ class LIBARDOUR_API AudioEngine : public SessionHandlePtr, public PortManager public: virtual const char *what() const throw() { return "could not connect to engine backend"; } }; - + void split_cycle (pframes_t offset); - + int reset_timebase (); - + void update_latencies (); - + /* this signal is sent for every process() cycle while freewheeling. (the regular process() call to session->process() is not made) */ - + PBD::Signal1<int, pframes_t> Freewheel; - + PBD::Signal0<void> Xrun; /** this signal is emitted if the sample rate changes */ @@ -175,30 +175,30 @@ class LIBARDOUR_API AudioEngine : public SessionHandlePtr, public PortManager PBD::Signal0<void> DeviceError; /* this signal is emitted if the device list changed */ - + PBD::Signal0<void> DeviceListChanged; - + /* this signal is sent if the backend ever disconnects us */ - + PBD::Signal1<void,const char*> Halted; - + /* these two are emitted when the engine itself is started and stopped */ - + PBD::Signal0<void> Running; PBD::Signal0<void> Stopped; /* these two are emitted when a device reset is initiated/finished */ - + PBD::Signal0<void> DeviceResetStarted; PBD::Signal0<void> DeviceResetFinished; static AudioEngine* instance() { return _instance; } static void destroy(); void died (); - + /* The backend will cause these at the appropriate time(s) */ int process_callback (pframes_t nframes); diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index 9172021e97..3de6de11fa 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -73,11 +73,11 @@ class LIBARDOUR_API AudioRegion : public Region bool speed_mismatch (float) const; boost::shared_ptr<AudioSource> audio_source (uint32_t n=0) const; - + // if several audio files associated with a region, // information about file with MAX channel count will be provided uint32_t get_related_audio_file_channel_count () const; - + void set_scale_amplitude (gain_t); gain_t scale_amplitude() const { return _scale_amplitude; } diff --git a/libs/ardour/ardour/buffer_manager.h b/libs/ardour/ardour/buffer_manager.h index c73b59b763..1614854a89 100644 --- a/libs/ardour/ardour/buffer_manager.h +++ b/libs/ardour/ardour/buffer_manager.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h index 44016b46a4..d8175877b8 100644 --- a/libs/ardour/ardour/coreaudiosource.h +++ b/libs/ardour/ardour/coreaudiosource.h @@ -40,7 +40,7 @@ class LIBARDOUR_API CoreAudioSource : public AudioFileSource { int update_header (framepos_t when, struct tm&, time_t); uint32_t channel_count () const { return n_channels; } - + int flush_header () {return 0;}; void set_header_timeline_position () {}; bool clamped_at_unity () const { return false; } diff --git a/libs/ardour/ardour/data_type.h b/libs/ardour/ardour/data_type.h index 2a4514a5cf..bc59aebeb6 100644 --- a/libs/ardour/ardour/data_type.h +++ b/libs/ardour/ardour/data_type.h @@ -81,7 +81,7 @@ public: default: return "unknown"; // reeeally shouldn't ever happen } } - + const char* to_i18n_string () const; inline operator uint32_t() const { return (uint32_t)_symbol; } diff --git a/libs/ardour/ardour/directory_names.h b/libs/ardour/ardour/directory_names.h index 5c0eae909c..c2b4783be9 100644 --- a/libs/ardour/ardour/directory_names.h +++ b/libs/ardour/ardour/directory_names.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/engine_state_controller.h b/libs/ardour/ardour/engine_state_controller.h index 737fb3b579..76ed08b3ab 100644 --- a/libs/ardour/ardour/engine_state_controller.h +++ b/libs/ardour/ardour/engine_state_controller.h @@ -1,20 +1,20 @@ /* Copyright (C) 2014 Waves Audio Ltd. - + 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. - + */ #ifndef __gtk2_ardour__engine_state_controller__ @@ -29,7 +29,7 @@ namespace ARDOUR { class AudioBackendInfo; - + /** * @class EngineStateController * @brief EngineStateController class. @@ -40,33 +40,33 @@ class AudioBackendInfo; class EngineStateController { public: - + // public data types: - - /** + + /** * @struct PortState * Structure which represents AudioPort state */ struct PortState { std::string name; ///< Audio Port name bool active; ///< Audio Port state - + PortState () : name("") , active(false) { } - + PortState (const std::string& name) : name(name) , active(false) { } - + bool operator==(const PortState& rhs) {return rhs.name == name; } - + }; - + /// @typedef Type for the list of all available audio ports typedef std::list<PortState> PortStateList; @@ -81,7 +81,7 @@ class EngineStateController bool available; ///< Midi Port availability - if it is physicaly available or not bool scene_connected; ///< Is midi port used for scene MIDI marker in/out bool mtc_in; ///< Is midi port used as MTC in - + MidiPortState(const std::string& name) : name(name) , active(false) @@ -89,89 +89,89 @@ class EngineStateController , scene_connected(false) , mtc_in(false) {} - + bool operator==(const MidiPortState& rhs) { return name == rhs.name; } }; - + /// @typedef Type for the list of MidiPorts ever registered in the system typedef std::list<MidiPortState> MidiPortStateList; - + //Interfaces - + /** Get an instance of EngineStateController singleton. * @return EngineStateController instance pointer */ static EngineStateController* instance (); - + /** Associate session with EngineStateController instance. */ void set_session (Session* session); - + /** Remove link to the associated session. */ void remove_session (); - + ////////////////////////////////////////////////////////////////////////////////////////////////////////// // General backend/device information methods - + /** Provides names of all available backends. * * @param[out] available_backends - vector of available backends */ void available_backends (std::vector<const AudioBackendInfo*>& available_backends); - + /** Provides the name of currently used backend. * * @return the name of currently used backend */ const std::string& get_current_backend_name() const; - + /** Provides the name of currently used device. * * @return the name of currently used device */ const std::string& get_current_device_name () const; - + /** Provides names for all available devices. * * @param[out] device_vector - vector of available devices */ void enumerate_devices (std::vector<ARDOUR::AudioBackend::DeviceStatus>& device_vector) const; - + /** Get sample rate used by current device. * * @return current sample rate */ ARDOUR::framecnt_t get_current_sample_rate () const; - + /** Get default sample rate for current backend. * * @return default sample rate for current backend */ ARDOUR::framecnt_t get_default_sample_rate () const; - + /** Get sample rates which are supported by current device and current backend. * * @param[out] sample_rates - vector of supported sample rates */ void available_sample_rates_for_current_device (std::vector<float>& sample_rates) const; - + /** Get buffer size used by current device. * * @return current buffer size */ ARDOUR::pframes_t get_current_buffer_size () const; - + /** Get default buffer size for current backend. * * @return default buffer size for current backend */ ARDOUR::pframes_t get_default_buffer_size () const; - + /** Get buffer sizes which are supported by current device and current backend. * * @param[out] buffer_sizes - vector of supported buffer_sizes @@ -180,7 +180,7 @@ class EngineStateController ///////////////////////////////////////////////////////////////////////////////////////////////////////////////// // device state control methods - + /** Get the number of all enabled Audio inputs. * * @return number of all enabled Audio inputs @@ -191,7 +191,7 @@ class EngineStateController * @return number of all enabled Audio outputs */ uint32_t get_available_outputs_count () const; - + /** Get vector of all enabled physical Audio input port names. * * @param[out] port_names - vector of all enabled Audio input names @@ -202,7 +202,7 @@ class EngineStateController * @param[out] port_names - vector of all enabled Audio input names */ void get_physical_audio_outputs (std::vector<std::string>& port_names); - + /** Get vector of all enabled physical MIDI input port names. * * @param[out] port_names - vector of all enabled MIDI input names @@ -213,7 +213,7 @@ class EngineStateController * @param[out] port_names - vector of all enabled MIDI output names */ void get_physical_midi_outputs (std::vector<std::string>& port_names); - + /** Sets new state to all Audio inputs. * * @param[in] state - new state @@ -224,7 +224,7 @@ class EngineStateController * @param[in] state - new state */ void set_state_to_all_outputs(bool state); - + /** Get vector of states for all physical Audio input ports. * * @param[out] channel_states - vector of input port states @@ -235,7 +235,7 @@ class EngineStateController * @param[out] channel_states - vector of output port states */ void get_physical_audio_output_states(std::vector<PortState>& channel_states); - + /** Set state of the specified Audio input port. * * @param[in] port_name - input name @@ -248,7 +248,7 @@ class EngineStateController * @param[in] state - new state */ void set_physical_audio_output_state(const std::string& port_name, bool state); - + /** Get state of the specified Audio input port. * * @param[in] port_name - input name @@ -261,7 +261,7 @@ class EngineStateController * @return output state */ bool get_physical_audio_output_state(const std::string& port_name); - + /** Get vector of all enabled MIDI input port names. * @@ -290,7 +290,7 @@ class EngineStateController * return name of ltc source port */ std::string get_ltc_source_port (); - + /** Set ltc output port * * @param[in] port - name of ltc output port @@ -301,7 +301,7 @@ class EngineStateController * return name of ltc output port */ std::string get_ltc_output_port (); - + /** Set state of the specified MIDI input port. * * @param[in] port_name - input name @@ -328,7 +328,7 @@ class EngineStateController * @return output state */ bool get_physical_midi_output_state(const std::string& port_name, bool& scene_connected); - + /** Set state of Scene In connection for the specified MIDI input port. * * @param[in] port_name - input name @@ -341,30 +341,30 @@ class EngineStateController * @param[in] state - new state */ void set_physical_midi_scenen_out_connection_state(const std::string&, bool); - + /** Disocnnect all MIDI input ports from Scene In. */ void set_all_midi_scene_inputs_disconnected(); /** Disocnnect all MIDI output ports from Scene Out. */ void set_all_midi_scene_outputs_disconnected(); - + /** Set MIDI TimeCode input port * @note There is a sense to choose MIDI TimeCode input only because * our MIDI TimeCode is propagated to all midi output ports. */ void set_mtc_source_port (const std::string&); - + /** Check if AudioEngine setup is required * @return true if setup is required, otherwise - false */ bool is_setup_required() const {return ARDOUR::AudioEngine::instance()->setup_required (); } - + //////////////////////////////////////////////////////////////////////////////////////////////////// // Methods set parameters inside the controller // the state of engine won't change untill we make a "push" of this state to the backend // NOTE: Use push_state_to_backend() method to update backend with the most recent controller state - + /** Set new sample rate for current device in EngineStateController database * @note Use push_state_to_backend() method to update backend/device state with the most recent controller state * @param sample_rate - new sample rate @@ -375,7 +375,7 @@ class EngineStateController * @param buffer_size - new buffer size */ bool set_new_buffer_size_in_controller(pframes_t buffer_size); - + /** @brief push current controller state to backend. * Propagate and set all current EngineStateController parameters to the backend * @note Engine will be restarted if it's running when this method is called. @@ -397,7 +397,7 @@ class EngineStateController */ bool set_new_device_as_current(const std::string& device_name); - + //////////////////////////////////////////////////////////////////////////////////////////////////// // Methods to save/serialize setting states @@ -408,7 +408,7 @@ class EngineStateController /** Save Audio/Midi settings (entire EngineStateController database) to config persistently */ void save_audio_midi_settings(); - + //////////////////////////////////////////////////////////////////////////////////////////////////// //UPDATE SIGNALS /** This signal is emitted if the sample rate changes */ @@ -428,7 +428,7 @@ class EngineStateController PBD::Signal0<void> EngineStopped; /** This signal is emitted if Engine processing is terminated */ PBD::Signal0<void> EngineHalted; - + /** This signal is emitted if the AUDIO input channel configuration changes */ PBD::Signal0<void> InputConfigChanged; /** This signal is emitted if the AUDIO output channel configuration changes */ @@ -437,7 +437,7 @@ class EngineStateController * @note By output connection mode "Stereo Out" or "Multi Out" is meant */ PBD::Signal0<void> OutputConnectionModeChanged; - + /** This signals is emitted if the MIDI input channel configuration changes */ PBD::Signal0<void> MIDIInputConfigChanged; /** This signals is emitted if the MIDI output channel configuration changes */ @@ -446,23 +446,23 @@ class EngineStateController PBD::Signal2<void, const std::vector<std::string>&, bool> MIDISceneInputConnectionChanged; /** This signals is emitted if the MIDI Scene Out connection changes */ PBD::Signal2<void, const std::vector<std::string>&, bool> MIDISceneOutputConnectionChanged; - + /** This signal is emitted if the MTC Input channel is changed */ PBD::Signal1<void, const std::string&> MTCInputChanged; - + /** This signal is emitted if new Audio/MIDI ports are registered or unregistered */ PBD::Signal0<void> PortRegistrationChanged; - + private: EngineStateController(); /// singleton ~EngineStateController(); /// singleton EngineStateController(const EngineStateController& ); /// prohibited EngineStateController& operator=(const EngineStateController&); /// prohibited - + //////////////////////////////////////////////////////////////////////////////////////////// // private data structures - + /** @struct Engine state * @brief State structure. * Contains information about single device/backend state @@ -477,7 +477,7 @@ class EngineStateController 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 bool active; ///< was this state the most recent active one - + State() : sample_rate(0) , buffer_size(0) @@ -487,19 +487,19 @@ class EngineStateController , active (false) { } - + bool operator==(const State& rhs) { return (backend_name == rhs.backend_name) && (device_name == rhs.device_name); } - + /** Forms string name for the state * @return name string */ std::string form_state_name() { return std::string("State:" + backend_name + ":" + device_name); } - + /** @struct StatepPredicate * This predicate is used to identify a state during search in the list of states */ @@ -509,26 +509,26 @@ class EngineStateController : _backend_name (backend_name) , _device_name (device_name) {} - + bool operator()(boost::shared_ptr<ARDOUR::EngineStateController::State> rhs) { return (_backend_name == rhs->backend_name) && (_device_name == rhs->device_name); } - + private: std::string _backend_name; std::string _device_name; }; }; - + /// @typedef Type for the state pointer typedef boost::shared_ptr<State> StatePtr; /// @typedef Type for the list of states typedef std::list<StatePtr> StateList; - + //////////////////////////////////////////////////////////////////////////////////////////////////// // methods to manage setting states - + /** Deserializes and loads Engine and Audio port states from the config to EngineStateController */ void _deserialize_and_load_engine_states(); @@ -543,13 +543,13 @@ class EngineStateController * @param[in,out] audio_midi_settings_node - node to serialize the satets to */ void _serialize_midi_port_states(XMLNode* audio_midi_settings_node); - + /** Provides initial state configuration. * It loades the last active state if there is one and it is aplicable. * Otherwise default state (None device with default sample rate and buffer size) is loaded. */ void _do_initial_engine_setup(); - + /** Loades provided state. * @note It's possible that provided state can't be loaded * (device disconnected or reqested parameters are not supported anymore). @@ -557,15 +557,15 @@ class EngineStateController * @return true on success, otherwise - false */ bool _apply_state(const StatePtr& state); - + /** Gets available device channels from engine and updates internal controller state */ void _update_device_channels_state(); - + /** Check "Stereo Out" mode channels state configuration and make it correspond Stereo Out mode requirements */ void _refresh_stereo_out_channel_states(); - + //////////////////////////////////////////////////////////////////////////////////////////////////////////// // internal helper functions /** make sure that current device parameters are supported and fit session requirements @@ -579,7 +579,7 @@ class EngineStateController /** change ltc source port in case of the output ports list change */ void _update_ltc_output_port (); - + /** check that port is still existed in the list of input ports @param[in] port - port name @return true if current port is existed, otherwise - false @@ -626,18 +626,18 @@ class EngineStateController */ void _on_session_loaded(); //////////////////////////////////////// - + //////////////////////////////////////// // attributes StatePtr _current_state; ///< current state pointer // list of system states StateList _states; ///< list of all available states - + MidiPortStateList _midi_inputs; ///< midi input states MidiPortStateList _midi_outputs; ///< midi output states - + std::string _last_used_real_device; ///< last active non-default (real) device - + Session* _session; ///< current session // Engine connections stuff @@ -649,5 +649,5 @@ class EngineStateController }; } // namespace ARDOUR - + #endif /* defined(__gtk2_ardour__engine_state_controller__) */ diff --git a/libs/ardour/ardour/export_graph_builder.h b/libs/ardour/ardour/export_graph_builder.h index 5dc6cd7ac2..3e9fb58a15 100644 --- a/libs/ardour/ardour/export_graph_builder.h +++ b/libs/ardour/ardour/export_graph_builder.h @@ -75,7 +75,7 @@ class LIBARDOUR_API ExportGraphBuilder private: void add_split_config (FileSpec const & config); - + class Encoder { public: template <typename T> boost::shared_ptr<AudioGrapher::Sink<T> > init (FileSpec const & new_config); @@ -99,7 +99,7 @@ class LIBARDOUR_API ExportGraphBuilder PBD::ScopedConnection copy_files_connection; std::string writer_filename; - + // Only one of these should be available at a time FloatWriterPtr float_writer; IntWriterPtr int_writer; @@ -175,7 +175,7 @@ class LIBARDOUR_API ExportGraphBuilder FloatSinkPtr sink (); void add_child (FileSpec const & new_config); void remove_children (bool remove_out_files); - + bool operator== (FileSpec const & other_config) const; private: diff --git a/libs/ardour/ardour/export_multiplication.h b/libs/ardour/ardour/export_multiplication.h index 32622d7fea..cb6af793f1 100644 --- a/libs/ardour/ardour/export_multiplication.h +++ b/libs/ardour/ardour/export_multiplication.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/filename_extensions.h b/libs/ardour/ardour/filename_extensions.h index c0725932fa..2eb933d936 100644 --- a/libs/ardour/ardour/filename_extensions.h +++ b/libs/ardour/ardour/filename_extensions.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h index cc1a21c45e..83f50fd169 100644 --- a/libs/ardour/ardour/filesystem_paths.h +++ b/libs/ardour/ardour/filesystem_paths.h @@ -27,14 +27,14 @@ namespace ARDOUR { /** - * @return the path to the directory used to store user specific + * @return the path to the directory used to store user specific * configuration files for the given @param version of the program. * If @param version is negative, the build-time string PROGRAM_VERSION * will be used to determine the version number. * * @post user_config_directory() exists IF version was negative. * - * + * */ LIBARDOUR_API std::string user_config_directory (int version = -1); @@ -48,8 +48,8 @@ namespace ARDOUR { /** * @return the path used to store a persistent indication * that the given version of the program has been used before. - * - * @param version is the version to check for. If unspecified, + * + * @param version is the version to check for. If unspecified, * it defaults to the current (build-time) version of the program. */ LIBARDOUR_API std::string been_here_before_path (int version = -1); diff --git a/libs/ardour/ardour/libardour_visibility.h b/libs/ardour/ardour/libardour_visibility.h index 917307732c..dde3f1d11b 100644 --- a/libs/ardour/ardour/libardour_visibility.h +++ b/libs/ardour/ardour/libardour_visibility.h @@ -38,7 +38,7 @@ #define LIBARDOUR_API LIBARDOUR_DLL_EXPORT #else #define LIBARDOUR_API LIBARDOUR_DLL_IMPORT - #endif + #endif #define LIBARDOUR_LOCAL LIBARDOUR_DLL_LOCAL #endif diff --git a/libs/ardour/ardour/linux_vst_support.h b/libs/ardour/ardour/linux_vst_support.h index 8575e2a72a..954a465c05 100644 --- a/libs/ardour/ardour/linux_vst_support.h +++ b/libs/ardour/ardour/linux_vst_support.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 @@ -31,7 +31,7 @@ /******************************************************************************************/ /*VSTFX - an engine to manage native linux VST plugins - derived from FST for Windows VSTs*/ /******************************************************************************************/ - + LIBARDOUR_API extern void (*vstfx_error_callback)(const char *msg); LIBARDOUR_API void vstfx_set_error_function (void (*func)(const char *)); diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 6b1f89dab3..f564757e1a 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -61,7 +61,7 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest Location (const Location& other); Location (Session &, const XMLNode&); Location* operator= (const Location& other); - + bool operator==(const Location& other); bool locked() const { return _locked; } @@ -120,18 +120,18 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest static PBD::Signal1<void,Location*> changed; /* these are member signals for objects that care only about - changes to this object + changes to this object */ PBD::Signal0<void> Changed; - + PBD::Signal0<void> NameChanged; PBD::Signal0<void> EndChanged; PBD::Signal0<void> StartChanged; PBD::Signal0<void> FlagsChanged; PBD::Signal0<void> LockChanged; PBD::Signal0<void> PositionLockStyleChanged; - + /* CD Track / CD-Text info */ std::map<std::string, std::string> cd_info; @@ -146,7 +146,7 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest static PBD::Signal0<void> scene_changed; /* for use by backend scene change management, class level */ PBD::Signal0<void> SceneChangeChanged; /* for use by objects interested in this object */ - + private: std::string _name; framepos_t _start; @@ -157,7 +157,7 @@ class LIBARDOUR_API Location : public SessionHandleRef, public PBD::StatefulDest bool _locked; PositionLockStyle _position_lock_style; boost::shared_ptr<SceneChange> _scene_change; - + void set_mark (bool yn); bool set_flag_internal (bool yn, Flags flag); void recompute_bbt_from_frames (); @@ -201,7 +201,7 @@ class LIBARDOUR_API Locations : public SessionHandleRef, public PBD::StatefulDes void marks_either_side (framepos_t const, framepos_t &, framepos_t &) const; void find_all_between (framepos_t start, framepos_t, LocationList&, Location::Flags); - + PBD::Signal1<void,Location*> current_changed; /* Objects that care about individual addition and removal of Locations should connect to added/removed. diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index dac262e269..b55a976023 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -170,7 +170,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream bool prep_record_enable (); bool prep_record_disable (); - + MidiRingBuffer<framepos_t>* _playback_buf; MidiRingBuffer<framepos_t>* _capture_buf; boost::weak_ptr<MidiPort> _source_port; diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h index 9b9ed1153a..2df5ea020d 100644 --- a/libs/ardour/ardour/midi_ui.h +++ b/libs/ardour/ardour/midi_ui.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/midiport_manager.h b/libs/ardour/ardour/midiport_manager.h index 4d6453b5cb..fade9c8beb 100644 --- a/libs/ardour/ardour/midiport_manager.h +++ b/libs/ardour/ardour/midiport_manager.h @@ -1,6 +1,6 @@ /* Copyright (C) 1998 Paul Barton-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 @@ -45,12 +45,12 @@ class LIBARDOUR_API MidiPortManager { /* Ports used for control. These are read/written to outside of the * process callback (asynchronously with respect to when data - * actually arrives). + * actually arrives). * * More detail: we do actually read/write data for these ports * inside the process callback, but incoming data is only parsed * and outgoing data is only generated *outside* the process - * callback. + * callback. */ MIDI::Port* midi_input_port () const { return _midi_input_port; } @@ -59,7 +59,7 @@ class LIBARDOUR_API MidiPortManager { MIDI::Port* mmc_output_port () const { return _mmc_output_port; } MIDI::Port* scene_input_port () const { return _scene_input_port; } MIDI::Port* scene_output_port () const { return _scene_output_port; } - + boost::shared_ptr<MidiPort> mmc_in() const { return boost::dynamic_pointer_cast<MidiPort>(_mmc_in); } boost::shared_ptr<MidiPort> mmc_out() const { return boost::dynamic_pointer_cast<MidiPort>(_mmc_out); } @@ -74,7 +74,7 @@ class LIBARDOUR_API MidiPortManager { boost::shared_ptr<MidiPort> mtc_output_port() const { return _mtc_output_port; } boost::shared_ptr<MidiPort> midi_clock_input_port() const { return _midi_clock_input_port; } boost::shared_ptr<MidiPort> midi_clock_output_port() const { return _midi_clock_output_port; } - + void set_midi_port_states (const XMLNodeList&); std::list<XMLNode*> get_midi_port_states () const; diff --git a/libs/ardour/ardour/movable.h b/libs/ardour/ardour/movable.h index df63987f4f..0114b99ea5 100644 --- a/libs/ardour/ardour/movable.h +++ b/libs/ardour/ardour/movable.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index 211ad0ca8e..56c65a4dc2 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -44,7 +44,7 @@ #define ARDOURPANNER_API LIBARDOUR_DLL_EXPORT #else #define ARDOURPANNER_API LIBARDOUR_DLL_IMPORT - #endif + #endif #define ARDOURPANNER_LOCAL LIBARDOUR_DLL_LOCAL namespace ARDOUR { diff --git a/libs/ardour/ardour/panner_manager.h b/libs/ardour/ardour/panner_manager.h index 73d667424f..2103fc2bea 100644 --- a/libs/ardour/ardour/panner_manager.h +++ b/libs/ardour/ardour/panner_manager.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index eadd237143..1b3f1d530f 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -250,7 +250,7 @@ public: class RegionWriteLock : public Glib::Threads::RWLock::WriterLock { public: - RegionWriteLock (Playlist *pl, bool do_block_notify = true) + RegionWriteLock (Playlist *pl, bool do_block_notify = true) : Glib::Threads::RWLock::WriterLock (pl->region_lock) , playlist (pl) , block_notify (do_block_notify) { diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index ed028e3572..c927c1c061 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -67,7 +67,7 @@ class LIBARDOUR_API PluginInfo { std::string unique_id; virtual PluginPtr load (Session& session) = 0; - virtual bool is_instrument() const; + virtual bool is_instrument() const; /* NOTE: this block of virtual methods looks like the interface to a Processor, but Plugin does not inherit from Processor. @@ -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/port_engine.h b/libs/ardour/ardour/port_engine.h index 26e52b9dfd..5d187062eb 100644 --- a/libs/ardour/ardour/port_engine.h +++ b/libs/ardour/ardour/port_engine.h @@ -34,14 +34,14 @@ namespace ARDOUR { class PortManager; /** PortEngine is an abstract base class that defines the functionality - * required by Ardour. - * + * required by Ardour. + * * A Port is basically an endpoint for a datastream (which can either be * continuous, like audio, or event-based, like MIDI). Ports have buffers * associated with them into which data can be written (if they are output * ports) and from which data can be read (if they input ports). Ports can be * connected together so that data written to an output port can be read from - * an input port. These connections can be 1:1, 1:N OR N:1. + * an input port. These connections can be 1:1, 1:N OR N:1. * * Ports may be associated with software only, or with hardware. Hardware * related ports are often referred to as physical, and correspond to some @@ -66,7 +66,7 @@ class PortManager; * come from the "outside world" if the terminal port is also * physical, or will have been synthesized by the entity that * owns the terminal port. - * + * * <b>playback latency</b>: how long until the data written to the buffer of * port will reach a terminal port. * @@ -79,34 +79,34 @@ class LIBARDOUR_API PortEngine { public: PortEngine (PortManager& pm) : manager (pm) {} virtual ~PortEngine() {} - + /** Return a private, type-free pointer to any data * that might be useful to a concrete implementation */ virtual void* private_handle() const = 0; /* We use void* here so that the API can be defined for any implementation. - * + * * We could theoretically use a template (PortEngine<T>) and define * PortHandle as T, but this complicates the desired inheritance * pattern in which FooPortEngine handles things for the Foo API, * rather than being a derivative of PortEngine<Foo>. */ - + typedef void* PortHandle; /** Return the name of this process as used by the port manager * when naming ports. */ virtual const std::string& my_name() const = 0; - + /** Return true if the underlying mechanism/API is still available * for us to utilize. return false if some or all of the AudioBackend * API can no longer be effectively used. */ virtual bool available() const = 0; - /** Return the maximum size of a port name + /** Return the maximum size of a port name */ virtual uint32_t port_name_size() const = 0; @@ -149,9 +149,9 @@ class LIBARDOUR_API PortEngine { * * To avoid selecting by name, pass an empty string for @param * port_name_pattern. - * + * * To avoid selecting by type, pass DataType::NIL as @param type. - * + * * To avoid selecting by flags, pass PortFlags (0) as @param flags. */ virtual int get_ports (const std::string& port_name_pattern, DataType type, PortFlags flags, std::vector<std::string>& ports) const = 0; @@ -173,7 +173,7 @@ class LIBARDOUR_API PortEngine { * is connected to. */ virtual void unregister_port (PortHandle) = 0; - + /* Connection management */ /** Ensure that data written to the port named by @param src will be @@ -182,20 +182,20 @@ class LIBARDOUR_API PortEngine { */ virtual int connect (const std::string& src, const std::string& dst) = 0; - /** Remove any existing connection between the ports named by @param src and + /** Remove any existing connection between the ports named by @param src and * @param dst. Return zero on success, non-zero otherwise. */ virtual int disconnect (const std::string& src, const std::string& dst) = 0; - - + + /** Ensure that data written to the port referenced by @param portwill be * readable from the port named by @param dst. Return zero on success, * non-zero otherwise. */ virtual int connect (PortHandle src, const std::string& dst) = 0; - /** Remove any existing connection between the port referenced by @param src and + /** Remove any existing connection between the port referenced by @param src and * the port named @param dst. Return zero on success, non-zero otherwise. - */ + */ virtual int disconnect (PortHandle src, const std::string& dst) = 0; /** Remove all connections between the port referred to by @param port and @@ -227,10 +227,10 @@ class LIBARDOUR_API PortEngine { /** Retrieve a MIDI event from the data at @param port_buffer. The event number to be retrieved is given by @param event_index (a value of zero indicates that the first event in the port_buffer should be retrieved). - * + * * The data associated with the event will be copied into the buffer at * @param buf and the number of bytes written will be stored in @param - * size. The timestamp of the event (which is always relative to the start + * size. The timestamp of the event (which is always relative to the start * of the current process cycle, in samples) will be stored in @param * timestamp */ @@ -241,7 +241,7 @@ class LIBARDOUR_API PortEngine { * port_buffer. The MIDI event will be marked with a time given by @param * timestamp. Return zero on success, non-zero otherwise. * - * Events must be added monotonically to a port buffer. An attempt to + * Events must be added monotonically to a port buffer. An attempt to * add a non-monotonic event (e.g. out-of-order) will cause this method * to return a failure status. */ @@ -270,13 +270,13 @@ class LIBARDOUR_API PortEngine { * APIs can offer it. */ virtual bool can_monitor_input() const = 0; - /** Increment or decrement the number of requests to monitor the input + /** Increment or decrement the number of requests to monitor the input * of the hardware channel represented by the port referred to by @param * port. * * If the number of requests rises above zero, input monitoring will * be enabled (if can_monitor_input() returns true for the implementation). - * + * * If the number of requests falls to zero, input monitoring will be * disabled (if can_monitor_input() returns true for the implementation) */ @@ -296,7 +296,7 @@ class LIBARDOUR_API PortEngine { /* Latency management */ - + /** Set the latency range for the port referred to by @param port to @param * r. The playback range will be set if @param for_playback is true, * otherwise the capture range will be set. @@ -349,11 +349,11 @@ class LIBARDOUR_API PortEngine { * schedule MIDI events within their buffers. It is a bit odd that we * expose this here, because it is also exposed by AudioBackend, but they * only have access to a PortEngine object, not an AudioBackend. - * - * Return the time according to the sample clock in use when the current - * buffer process cycle began. * - * XXX to be removed after some more design cleanup. + * Return the time according to the sample clock in use when the current + * buffer process cycle began. + * + * XXX to be removed after some more design cleanup. */ virtual framepos_t sample_time_at_cycle_start () = 0; diff --git a/libs/ardour/ardour/port_manager.h b/libs/ardour/ardour/port_manager.h index e40c80c1b2..d76016c6a3 100644 --- a/libs/ardour/ardour/port_manager.h +++ b/libs/ardour/ardour/port_manager.h @@ -40,12 +40,12 @@ namespace ARDOUR { class PortEngine; class AudioBackend; -class LIBARDOUR_API PortManager +class LIBARDOUR_API PortManager { public: typedef std::map<std::string,boost::shared_ptr<Port> > Ports; typedef std::list<boost::shared_ptr<Port> > PortList; - + PortManager (); virtual ~PortManager() {} @@ -55,13 +55,13 @@ class LIBARDOUR_API PortManager std::string my_name() const; /* Port registration */ - + boost::shared_ptr<Port> register_input_port (DataType, const std::string& portname, bool async = false); boost::shared_ptr<Port> register_output_port (DataType, const std::string& portname, bool async = false); int unregister_port (boost::shared_ptr<Port>); - + /* Port connectivity */ - + int connect (const std::string& source, const std::string& destination); int disconnect (const std::string& source, const std::string& destination); int disconnect (boost::shared_ptr<Port>); @@ -82,9 +82,9 @@ class LIBARDOUR_API PortManager std::string get_pretty_name_by_name (const std::string& portname) const; bool port_is_mine (const std::string& fullname) const; bool port_name_prefix_is_unique (const std::string& first_part_of_port_name) const; - + /* other Port management */ - + bool port_is_physical (const std::string&) const; void get_physical_outputs (DataType type, std::vector<std::string>&); void get_physical_inputs (DataType type, std::vector<std::string>&); @@ -95,13 +95,13 @@ class LIBARDOUR_API PortManager int get_ports (DataType, PortList&); void remove_all_ports (); - + /* per-Port monitoring */ - + bool can_request_input_monitoring () const; void request_input_monitoring (const std::string&, bool) const; void ensure_input_monitoring (const std::string&, bool) const; - + class PortRegistrationFailure : public std::exception { public: PortRegistrationFailure (std::string const & why = "") @@ -116,7 +116,7 @@ class LIBARDOUR_API PortManager }; /* the port engine will invoke these callbacks when the time is right */ - + void registration_callback (); int graph_order_callback (); void connect_callback (const std::string&, const std::string&, bool connection); @@ -128,7 +128,7 @@ class LIBARDOUR_API PortManager /** Emitted if a Port is registered or unregistered */ PBD::Signal0<void> PortRegisteredOrUnregistered; - + /** Emitted if a Port is connected or disconnected. * The Port parameters are the ports being connected / disconnected, or 0 if they are not known to Ardour. * The std::string parameters are the (long) port names. diff --git a/libs/ardour/ardour/process_thread.h b/libs/ardour/ardour/process_thread.h index 67bd07dbfe..ee2e522378 100644 --- a/libs/ardour/ardour/process_thread.h +++ b/libs/ardour/ardour/process_thread.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index afa74325c0..eedd619375 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -35,8 +35,8 @@ /* IO connection */ CONFIG_VARIABLE (bool, auto_connect_standard_busses, "auto-connect-standard-busses", true) -/* this variable is used to indicate output mode in Waves Tracks: - "Multi Out" == AutoConnectPhysical and "Stereo Out" == AutoConnectMaster +/* this variable is used to indicate output mode in Waves Tracks: + "Multi Out" == AutoConnectPhysical and "Stereo Out" == AutoConnectMaster */ CONFIG_VARIABLE (AutoConnectOption, output_auto_connect, "output-auto-connect", AutoConnectMaster) CONFIG_VARIABLE (AutoConnectOption, input_auto_connect, "input-auto-connect", AutoConnectPhysical) diff --git a/libs/ardour/ardour/readable.h b/libs/ardour/ardour/readable.h index 18190436df..4098e26e40 100644 --- a/libs/ardour/ardour/readable.h +++ b/libs/ardour/ardour/readable.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index a9b73dc462..d5228fadb7 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 69c7519e01..7d746f2e2f 100644 --- a/libs/ardour/ardour/revision.h +++ b/libs/ardour/ardour/revision.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 82450a67d7..c4decd48c8 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -442,7 +442,7 @@ class LIBARDOUR_API Route : public SessionObject, public Automatable, public Rou void protect_automation (); - enum { + enum { /* These numbers are taken from MIDI Machine Control, which can only control up to 317 tracks without doing sysex segmentation. diff --git a/libs/ardour/ardour/scene_change.h b/libs/ardour/ardour/scene_change.h index 661d2238b7..1513622ed0 100644 --- a/libs/ardour/ardour/scene_change.h +++ b/libs/ardour/ardour/scene_change.h @@ -43,7 +43,7 @@ class SceneChange : public PBD::Stateful bool active () const { return _active; } void set_active (bool); - + PBD::Signal0<void> ColorChanged; PBD::Signal0<void> ActiveChanged; diff --git a/libs/ardour/ardour/scene_changer.h b/libs/ardour/ardour/scene_changer.h index d606dd13db..6019ed9c6c 100644 --- a/libs/ardour/ardour/scene_changer.h +++ b/libs/ardour/ardour/scene_changer.h @@ -34,7 +34,7 @@ class Parser; class Port; } -namespace ARDOUR +namespace ARDOUR { class Session; diff --git a/libs/ardour/ardour/search_paths.h b/libs/ardour/ardour/search_paths.h index 1815bc077c..3eea49164c 100644 --- a/libs/ardour/ardour/search_paths.h +++ b/libs/ardour/ardour/search_paths.h @@ -1,6 +1,6 @@ /* - Copyright (C) 2011 Tim Mayberry - Copyright (C) 2013 Paul Davis + Copyright (C) 2011 Tim Mayberry + Copyright (C) 2013 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 diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 2ee625f89c..2bc992bb10 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -481,10 +481,10 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop * * Argument is the snapshot name to use when saving. */ - PBD::Signal1<void,std::string> SaveSessionRequested; + PBD::Signal1<void,std::string> SaveSessionRequested; /* emitted during a session save to allow other entities to add state, via - * extra XML, to the session state + * extra XML, to the session state */ PBD::Signal0<void> SessionSaveUnderway; @@ -568,7 +568,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop std::list<boost::shared_ptr<MidiTrack> > new_midi_track ( const ChanCount& input, const ChanCount& output, boost::shared_ptr<PluginInfo> instrument = boost::shared_ptr<PluginInfo>(), - TrackMode mode = Normal, + TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1, std::string name_template = "" ); @@ -1030,7 +1030,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop boost::shared_ptr<MidiPort> midi_clock_input_port () const; boost::shared_ptr<MidiPort> mtc_output_port () const; boost::shared_ptr<MidiPort> mtc_input_port () const; - + MIDI::MachineControl& mmc() { return *_mmc; } void reconnect_midi_scene_ports (bool); @@ -1301,7 +1301,7 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop void consolidate_skips (Location*); void sync_locations_to_skips (); void _sync_locations_to_skips (); - + PBD::ScopedConnectionList skip_update_connections; bool _ignore_skips_updates; diff --git a/libs/ardour/ardour/session_configuration_vars.h b/libs/ardour/ardour/session_configuration_vars.h index 750e0aafd8..25625e2948 100644 --- a/libs/ardour/ardour/session_configuration_vars.h +++ b/libs/ardour/ardour/session_configuration_vars.h @@ -81,7 +81,7 @@ CONFIG_VARIABLE (uint32_t, meterbridge_label_height, "meterbridge-label-height" /* This variable was not discussed with Ardour developers and is considered weakly conceived. It is also poorly named, since we have "groups" already present in libardour but this variable has nothing to do with it. There - should have been more discussion about what was required and the best + should have been more discussion about what was required and the best way to accomplish it. */ CONFIG_VARIABLE (bool, enable_group_edit, "enable-group-edit", false) diff --git a/libs/ardour/ardour/session_event.h b/libs/ardour/ardour/session_event.h index a8c17a1ddb..02759bba7e 100644 --- a/libs/ardour/ardour/session_event.h +++ b/libs/ardour/ardour/session_event.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/session_metadata.h b/libs/ardour/ardour/session_metadata.h index c2ab947dfe..a8fb977e51 100644 --- a/libs/ardour/ardour/session_metadata.h +++ b/libs/ardour/ardour/session_metadata.h @@ -136,7 +136,7 @@ class LIBARDOUR_API SessionMetadata : public PBD::StatefulDestructible private: - static SessionMetadata *_metadata; //singleton instance + static SessionMetadata *_metadata; //singleton instance typedef std::pair<std::string, std::string> Property; typedef std::map<std::string, std::string> PropertyMap; diff --git a/libs/ardour/ardour/session_utils.h b/libs/ardour/ardour/session_utils.h index bd9cc92267..870f3daaa7 100644 --- a/libs/ardour/ardour/session_utils.h +++ b/libs/ardour/ardour/session_utils.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h index 45e049e35f..4579a32b6d 100644 --- a/libs/ardour/ardour/sndfilesource.h +++ b/libs/ardour/ardour/sndfilesource.h @@ -45,7 +45,7 @@ class LIBARDOUR_API SndFileSource : public AudioFileSource { SndFileSource (Session&, const std::string& path, int chn); /** Constructor to be called for existing in-session files during - * session loading + * session loading */ SndFileSource (Session&, const XMLNode&); diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h index a41cd36258..b1ee6438f5 100644 --- a/libs/ardour/ardour/source_factory.h +++ b/libs/ardour/ardour/source_factory.h @@ -48,12 +48,12 @@ class LIBARDOUR_API SourceFactory { static boost::shared_ptr<Source> createExternal (DataType type, Session&, - const std::string& path, + const std::string& path, int chn, Source::Flag flags, bool announce = true, bool async = false); static boost::shared_ptr<Source> createWritable (DataType type, Session&, - const std::string& path, + const std::string& path, bool destructive, framecnt_t rate, bool announce = true, bool async = false); diff --git a/libs/ardour/ardour/template_utils.h b/libs/ardour/ardour/template_utils.h index dc56c53c44..b2f155ee45 100644 --- a/libs/ardour/ardour/template_utils.h +++ b/libs/ardour/ardour/template_utils.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index d5ae2959c6..09b3d8b5eb 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. */ @@ -224,7 +224,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible const TempoSection* tempo; uint32_t bar; uint32_t beat; - + 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) {} @@ -242,22 +242,22 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible (obj.*method)(metrics); } - void get_grid (BBTPointList::const_iterator&, BBTPointList::const_iterator&, + void get_grid (BBTPointList::const_iterator&, BBTPointList::const_iterator&, framepos_t start, framepos_t end); - /* TEMPO- AND METER-SENSITIVE FUNCTIONS + /* 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 + + They SHOULD NOT be used to determine the position of events whose location is canonically defined in beats. */ void bbt_time (framepos_t when, Timecode::BBT_Time&); - /* realtime safe variant of ::bbt_time(), will throw + /* realtime safe variant of ::bbt_time(), will throw std::logic_error if the map is not large enough to provide an answer. */ @@ -266,12 +266,12 @@ 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. - They SHOULD be used to determine the position of events + They SHOULD be used to determine the position of events whose location is canonically defined in beats. */ @@ -348,7 +348,7 @@ class LIBARDOUR_API TempoMap : public PBD::StatefulDestructible void extend_map (framepos_t end); void require_map_to (framepos_t pos); void require_map_to (const Timecode::BBT_Time&); - void _extend_map (TempoSection* tempo, MeterSection* meter, + void _extend_map (TempoSection* tempo, MeterSection* meter, Metrics::iterator next_metric, Timecode::BBT_Time current, framepos_t current_frame, framepos_t end); diff --git a/libs/ardour/ardour/thread_buffers.h b/libs/ardour/ardour/thread_buffers.h index 5ea352f2ef..f018ee4c22 100644 --- a/libs/ardour/ardour/thread_buffers.h +++ b/libs/ardour/ardour/thread_buffers.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h index 0e5c3c80f4..fbca0161d4 100644 --- a/libs/ardour/ardour/ticker.h +++ b/libs/ardour/ardour/ticker.h @@ -73,7 +73,7 @@ public: class Position; boost::scoped_ptr<Position> _pos; - + double one_ppqn_in_frames (framepos_t transport_position); void send_midi_clock_event (pframes_t offset, pframes_t nframes); @@ -83,6 +83,6 @@ public: void send_position_event (uint32_t midi_clocks, pframes_t offset, pframes_t nframes); }; } - // namespace + // namespace #endif /* __libardour_ticker_h__ */ diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index f699b5d5d3..2d67a0aa75 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -94,7 +94,7 @@ class LIBARDOUR_API Track : public Route, public PublicDiskstream */ virtual bool bounceable (boost::shared_ptr<Processor> endpoint, bool include_endpoint) const = 0; virtual boost::shared_ptr<Region> bounce (InterThreadInfo&) = 0; - virtual boost::shared_ptr<Region> bounce_range (framepos_t start, framepos_t end, InterThreadInfo&, + virtual boost::shared_ptr<Region> bounce_range (framepos_t start, framepos_t end, InterThreadInfo&, boost::shared_ptr<Processor> endpoint, bool include_endpoint) = 0; virtual int export_stuff (BufferSet& bufs, framepos_t start_frame, framecnt_t nframes, boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, bool for_freeze) = 0; diff --git a/libs/ardour/ardour/trimmable.h b/libs/ardour/ardour/trimmable.h index 07e2c809a3..d3fbf6b8f8 100644 --- a/libs/ardour/ardour/trimmable.h +++ b/libs/ardour/ardour/trimmable.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 5bd7b87929..d4c65f3871 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -457,7 +457,7 @@ namespace ARDOUR { AutoConnectPhysical = 0x1, AutoConnectMaster = 0x2 }; - + enum TracksAutoNamingRule { UseDefaultNames = 0x1, NameAfterDriver = 0x2 @@ -610,8 +610,8 @@ namespace ARDOUR { this equality cannot be assumed. */ TransportStopped = 0, - TransportRolling = 1, - TransportLooping = 2, + TransportRolling = 1, + TransportLooping = 2, TransportStarting = 3, }; @@ -619,7 +619,7 @@ namespace ARDOUR { /* these values happen to match the constants used by JACK but this equality cannot be assumed. */ - IsInput = 0x1, + IsInput = 0x1, IsOutput = 0x2, IsPhysical = 0x4, CanMonitor = 0x8, @@ -730,7 +730,7 @@ session_frame_to_track_frame (ARDOUR::framepos_t session_frame, double speed) static inline ARDOUR::framepos_t track_frame_to_session_frame (ARDOUR::framepos_t track_frame, double speed) { - /* NB - do we need a check for speed == 0 ??? */ + /* NB - do we need a check for speed == 0 ??? */ long double result = (long double) track_frame / (long double) speed; if (result >= (long double) ARDOUR::max_framepos) { diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index 7be346256e..d073588b9e 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -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/vestige/aeffectx.h b/libs/ardour/ardour/vestige/aeffectx.h index 5b7d69c411..f09c009993 100644 --- a/libs/ardour/ardour/vestige/aeffectx.h +++ b/libs/ardour/ardour/vestige/aeffectx.h @@ -2,7 +2,7 @@ * aeffectx.h - simple header to allow VeSTige compilation and eventually work * * Copyright (c) 2006 Javier Serrano Polo <jasp00/at/users.sourceforge.net> - * + * * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net * * This program is free software; you can redistribute it and/or diff --git a/libs/ardour/ardour/vst_types.h b/libs/ardour/ardour/vst_types.h index 35b52435ab..9d4fc3450f 100644 --- a/libs/ardour/ardour/vst_types.h +++ b/libs/ardour/ardour/vst_types.h @@ -34,13 +34,13 @@ struct LIBARDOUR_API _VSTKey typedef struct _VSTKey VSTKey; -struct LIBARDOUR_API _VSTInfo +struct LIBARDOUR_API _VSTInfo { char *name; char *creator; int UniqueID; char *Category; - + int numInputs; int numOutputs; int numParams; diff --git a/libs/ardour/async_midi_port.cc b/libs/ardour/async_midi_port.cc index d6d9a953aa..86f111b520 100644 --- a/libs/ardour/async_midi_port.cc +++ b/libs/ardour/async_midi_port.cc @@ -1,6 +1,6 @@ /* Copyright (C) 1998 Paul Barton-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 @@ -107,7 +107,7 @@ AsyncMIDIPort::cycle_start (MIDI::pframes_t nframes) if (ARDOUR::Port::sends_output()) { flush_output_fifo (nframes); - } + } /* copy incoming data from the port buffer into the input FIFO and if necessary wakeup the reader @@ -252,7 +252,7 @@ AsyncMIDIPort::write (const MIDI::byte * msg, size_t msglen, MIDI::timestamp_t t if (timestamp == 0) { timestamp = _last_write_timestamp; - } + } if (mb.push_back (timestamp, msglen, msg)) { ret = msglen; diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc index 12828c26b6..31baf47039 100644 --- a/libs/ardour/audio_diskstream.cc +++ b/libs/ardour/audio_diskstream.cc @@ -1470,7 +1470,7 @@ AudioDiskstream::do_flush (RunContext /*context*/, bool force_flush) error << string_compose(_("AudioDiskstream %1: cannot write to disk"), id()) << endmsg; return -1; } - + (*chan)->capture_buf->increment_read_ptr (to_write); (*chan)->curr_capture_cnt += to_write; @@ -1817,7 +1817,7 @@ AudioDiskstream::set_record_safe (bool yn) return; } - /* can't rec-safe in destructive mode if transport is before start ???? + /* can't rec-safe in destructive mode if transport is before start ???? REQUIRES REVIEW */ if (destructive() && yn && _session.transport_frame() < _session.current_start_frame()) { @@ -1834,7 +1834,7 @@ AudioDiskstream::set_record_safe (bool yn) } else { disengage_record_safe (); } - + RecordSafeChanged (); /* EMIT SIGNAL */ } } @@ -2575,7 +2575,7 @@ AudioDiskstream::ChannelInfo::~ChannelInfo () continue to exist. If we do not do this, then the Session retains a reference to it, it is not deleted, and later attempts to create a new source - file will use wierd naming because it already + file will use wierd naming because it already exists. XXX longer term TO-DO: do not add to session source diff --git a/libs/ardour/audio_playlist.cc b/libs/ardour/audio_playlist.cc index 6ef4ec6454..06d5f476a1 100644 --- a/libs/ardour/audio_playlist.cc +++ b/libs/ardour/audio_playlist.cc @@ -502,7 +502,7 @@ AudioPlaylist::load_legacy_crossfades (const XMLNode& node, int version) if (!in) { warning << string_compose (_("Legacy crossfade involved an incoming region not present in playlist \"%1\" - crossfade discarded"), - name()) + name()) << endmsg; continue; } @@ -518,7 +518,7 @@ AudioPlaylist::load_legacy_crossfades (const XMLNode& node, int version) if (!out) { warning << string_compose (_("Legacy crossfade involved an outgoing region not present in playlist \"%1\" - crossfade discarded"), - name()) + name()) << endmsg; continue; } @@ -533,7 +533,7 @@ AudioPlaylist::load_legacy_crossfades (const XMLNode& node, int version) if (in->layer() <= out->layer()) { /* incoming region is below the outgoing one, - * so apply a fade out to the outgoing one + * so apply a fade out to the outgoing one */ const XMLNodeList c = (*i)->children (); diff --git a/libs/ardour/audio_port.cc b/libs/ardour/audio_port.cc index 2fecbf9392..e2bb20dbe9 100644 --- a/libs/ardour/audio_port.cc +++ b/libs/ardour/audio_port.cc @@ -79,7 +79,7 @@ AudioPort::get_audio_buffer (pframes_t nframes) return *_buffer; } -Sample* +Sample* AudioPort::engine_get_whole_audio_buffer () { /* caller must hold process lock */ diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 40cbded61f..4f414ac2fd 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -491,7 +491,7 @@ AudioTrack::bounceable (boost::shared_ptr<Processor> endpoint, bool include_endp return false; } - /* we're including the endpoint - if we just hit it, + /* we're including the endpoint - if we just hit it, then stop. */ @@ -499,7 +499,7 @@ AudioTrack::bounceable (boost::shared_ptr<Processor> endpoint, bool include_endp return true; } - /* save outputs of this processor to test against inputs + /* save outputs of this processor to test against inputs of the next one. */ diff --git a/libs/ardour/audio_unit.cc b/libs/ardour/audio_unit.cc index 0a15e92285..9f91d3f9bd 100644 --- a/libs/ardour/audio_unit.cc +++ b/libs/ardour/audio_unit.cc @@ -567,7 +567,7 @@ AUPlugin::init () unit->GetElementCount (kAudioUnitScope_Output, output_elements); if (input_elements > 0) { - /* setup render callback: the plugin calls this to get input data + /* setup render callback: the plugin calls this to get input data */ AURenderCallbackStruct renderCallbackInfo; @@ -1129,7 +1129,7 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) vector<pair<int,int> >& io_configs = pinfo->cache.io_configs; - DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 has %2 IO configurations, looking for %3 in, %4 out\n", + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("%1 has %2 IO configurations, looking for %3 in, %4 out\n", name(), io_configs.size(), in, out)); //Ardour expects the plugin to tell it the output @@ -1175,7 +1175,7 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) int32_t possible_out = i->second; if ((possible_in == audio_in) && (possible_out == audio_out)) { - DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tCHOSEN: %1 in %2 out to match in %3 out %4\n", + DEBUG_TRACE (DEBUG::AudioUnits, string_compose ("\tCHOSEN: %1 in %2 out to match in %3 out %4\n", possible_in, possible_out, in, out)); @@ -1213,8 +1213,8 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) audio_out = 2; found = true; } else if (possible_out == -2) { - /* plugins shouldn't really use (0,-2) but might. - any configuration possible, provide stereo output + /* plugins shouldn't really use (0,-2) but might. + any configuration possible, provide stereo output */ audio_out = 2; found = true; @@ -1263,7 +1263,7 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) audio_out = audio_in; found = true; } else if (possible_out == -2) { - /* plugins shouldn't really use (-2,-2) but might. + /* plugins shouldn't really use (-2,-2) but might. interpret as (-1,-1). */ audio_out = audio_in; @@ -1293,8 +1293,8 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) audio_out = 2; found = true; } else if (possible_out == -2) { - /* plugins shouldn't really use (<-2,-2) but might. - interpret as (<-2,-1): any configuration possible, provide stereo output + /* plugins shouldn't really use (<-2,-2) but might. + interpret as (<-2,-1): any configuration possible, provide stereo output */ audio_out = 2; found = true; @@ -1322,8 +1322,8 @@ AUPlugin::can_support_io_configuration (const ChanCount& in, ChanCount& out) audio_out = 2; found = true; } else if (possible_out == -2) { - /* plugins shouldn't really use (>0,-2) but might. - interpret as (>0,-1): + /* plugins shouldn't really use (>0,-2) but might. + interpret as (>0,-1): any output configuration possible, provide stereo output */ audio_out = 2; @@ -1482,8 +1482,8 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ buffers->mBuffers[i].mDataByteSize = nframes * sizeof (Sample); /* setting this to 0 indicates to the AU that it can provide buffers here if necessary. if it can process in-place, it will use the buffers provided - as input by ::render_callback() above. - + as input by ::render_callback() above. + a non-null values tells the plugin to render into the buffer pointed at by the value. */ @@ -1514,7 +1514,7 @@ AUPlugin::connect_and_run (BufferSet& bufs, ChanMapping in_map, ChanMapping out_ } } - /* does this really mean anything ? + /* does this really mean anything ? */ ts.mSampleTime = frames_processed; @@ -1623,7 +1623,7 @@ AUPlugin::get_musical_time_location_callback (UInt32* outDeltaSampleOffsetToNe /* on the beat */ *outDeltaSampleOffsetToNextBeat = 0; } else { - *outDeltaSampleOffsetToNextBeat = (UInt32) + *outDeltaSampleOffsetToNextBeat = (UInt32) floor (((Timecode::BBT_Time::ticks_per_beat - bbt.ticks)/Timecode::BBT_Time::ticks_per_beat) * // fraction of a beat to next beat metric.tempo().frames_per_beat (_session.frame_rate())); // frames per beat } @@ -1957,7 +1957,7 @@ AUPlugin::load_preset (PresetRecord r) } void -AUPlugin::do_remove_preset (std::string) +AUPlugin::do_remove_preset (std::string) { } @@ -2309,7 +2309,7 @@ AUPluginInfo::discover (bool scan_only) /* AU require a CAComponentDescription pointer provided by the OS. * Ardour only caches port and i/o config. It can't just 'scan' without * 'discovering' (like we do for VST). - * + * * "Scan Only" means * "Iterate over all plugins. skip the ones where there's no io-cache". */ @@ -2927,7 +2927,7 @@ int AUPlugin::create_parameter_listener (AUEventListenerProc cb, void* arg, float interval_secs) { #ifdef WITH_CARBON - CFRunLoopRef run_loop = (CFRunLoopRef) GetCFRunLoopFromEventLoop(GetCurrentEventLoop()); + CFRunLoopRef run_loop = (CFRunLoopRef) GetCFRunLoopFromEventLoop(GetCurrentEventLoop()); #else CFRunLoopRef run_loop = CFRunLoopGetCurrent(); #endif @@ -2959,7 +2959,7 @@ AUPlugin::listen_to_parameter (uint32_t param_id) if (AUEventListenerAddEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } event.mEventType = kAudioUnitEvent_BeginParameterChangeGesture; event.mArgument.mParameter.mAudioUnit = unit->AU(); @@ -2969,7 +2969,7 @@ AUPlugin::listen_to_parameter (uint32_t param_id) if (AUEventListenerAddEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } event.mEventType = kAudioUnitEvent_EndParameterChangeGesture; event.mArgument.mParameter.mAudioUnit = unit->AU(); @@ -2979,7 +2979,7 @@ AUPlugin::listen_to_parameter (uint32_t param_id) if (AUEventListenerAddEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } return 0; } @@ -3001,7 +3001,7 @@ AUPlugin::end_listen_to_parameter (uint32_t param_id) if (AUEventListenerRemoveEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } event.mEventType = kAudioUnitEvent_BeginParameterChangeGesture; event.mArgument.mParameter.mAudioUnit = unit->AU(); @@ -3011,7 +3011,7 @@ AUPlugin::end_listen_to_parameter (uint32_t param_id) if (AUEventListenerRemoveEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } event.mEventType = kAudioUnitEvent_EndParameterChangeGesture; event.mArgument.mParameter.mAudioUnit = unit->AU(); @@ -3021,7 +3021,7 @@ AUPlugin::end_listen_to_parameter (uint32_t param_id) if (AUEventListenerRemoveEventType (_parameter_listener, _parameter_listener_arg, &event) != noErr) { return -1; - } + } return 0; } @@ -3040,7 +3040,7 @@ AUPlugin::parameter_change_listener (void* /*arg*/, void* /*src*/, const AudioUn if ((i = parameter_map.find (event->mArgument.mParameter.mParameterID)) == parameter_map.end()) { return; } - + switch (event->mEventType) { case kAudioUnitEvent_BeginParameterChangeGesture: StartTouch (i->second); diff --git a/libs/ardour/audioanalyser.cc b/libs/ardour/audioanalyser.cc index e9411701cc..ac00a55ead 100644 --- a/libs/ardour/audioanalyser.cc +++ b/libs/ardour/audioanalyser.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/audioengine.cc b/libs/ardour/audioengine.cc index ed1a6084e1..50284128de 100644 --- a/libs/ardour/audioengine.cc +++ b/libs/ardour/audioengine.cc @@ -162,7 +162,7 @@ AudioEngine::sample_rate_change (pframes_t nframes) return 0; } -int +int AudioEngine::buffer_size_change (pframes_t bufsiz) { if (_session) { @@ -207,7 +207,7 @@ AudioEngine::process_callback (pframes_t nframes) } /* really only JACK requires this * (other backends clear the output buffers - * before the process_callback. it may even be + * before the process_callback. it may even be * jack/alsa only). but better safe than sorry. */ PortManager::silence_outputs (nframes); @@ -219,7 +219,7 @@ AudioEngine::process_callback (pframes_t nframes) if (_measuring_latency == MeasureAudio && _mtdm) { /* run a normal cycle from the perspective of the PortManager so that we get silence on all registered ports. - + we overwrite the silence on the two ports used for latency measurement. */ @@ -294,12 +294,12 @@ AudioEngine::process_callback (pframes_t nframes) } else if (session_removal_countdown > 0) { /* we'll be fading audio out. - - if this is the last time we do this as part + + if this is the last time we do this as part of session removal, do a MIDI panic now to get MIDI stopped. This relies on the fact that "immediate data" (aka "out of band data") from - MIDI tracks is *appended* after any other data, + MIDI tracks is *appended* after any other data, so that it emerges after any outbound note ons, etc. */ @@ -456,21 +456,21 @@ void AudioEngine::do_reset_backend() { SessionEvent::create_per_thread_pool (X_("Backend reset processing thread"), 1024); - + Glib::Threads::Mutex::Lock guard (_reset_request_lock); - + while (!_stop_hw_reset_processing) { - + if (g_atomic_int_get (&_hw_reset_request_count) != 0 && _backend) { - + _reset_request_lock.unlock(); - + Glib::Threads::RecMutex::Lock pl (_state_lock); g_atomic_int_dec_and_test (&_hw_reset_request_count); - + std::cout << "AudioEngine::RESET::Reset request processing. Requests left: " << _hw_reset_request_count << std::endl; DeviceResetStarted(); // notify about device reset to be started - + // backup the device name std::string name = _backend->device_name (); @@ -484,9 +484,9 @@ AudioEngine::do_reset_backend() // inform about possible changes BufferSizeChanged (_backend->buffer_size() ); DeviceResetFinished(); // notify about device reset finish - + } else { - + DeviceResetFinished(); // notify about device reset finish // we've got an error DeviceError(); @@ -495,11 +495,11 @@ AudioEngine::do_reset_backend() std::cout << "AudioEngine::RESET::Done." << std::endl; _reset_request_lock.lock(); - + } else { - + _hw_reset_condition.wait (_reset_request_lock); - + } } } @@ -516,22 +516,22 @@ void AudioEngine::do_devicelist_update() { SessionEvent::create_per_thread_pool (X_("Device list update processing thread"), 512); - + Glib::Threads::Mutex::Lock guard (_devicelist_update_lock); - + while (!_stop_hw_devicelist_processing) { - + if (_hw_devicelist_update_count) { _devicelist_update_lock.unlock(); - + Glib::Threads::RecMutex::Lock pl (_state_lock); - + g_atomic_int_dec_and_test (&_hw_devicelist_update_count); DeviceListChanged (); /* EMIT SIGNAL */ - + _devicelist_update_lock.lock(); - + } else { _hw_devicelist_update_condition.wait (_devicelist_update_lock); } @@ -541,13 +541,13 @@ AudioEngine::do_devicelist_update() void AudioEngine::start_hw_event_processing() -{ +{ if (_hw_reset_event_thread == 0) { g_atomic_int_set(&_hw_reset_request_count, 0); g_atomic_int_set(&_stop_hw_reset_processing, 0); _hw_reset_event_thread = Glib::Threads::Thread::create (boost::bind (&AudioEngine::do_reset_backend, this)); } - + if (_hw_devicelist_update_thread == 0) { g_atomic_int_set(&_hw_devicelist_update_count, 0); g_atomic_int_set(&_stop_hw_devicelist_processing, 0); @@ -566,7 +566,7 @@ AudioEngine::stop_hw_event_processing() _hw_reset_event_thread->join (); _hw_reset_event_thread = 0; } - + if (_hw_devicelist_update_thread) { g_atomic_int_set(&_stop_hw_devicelist_processing, 1); g_atomic_int_set(&_hw_devicelist_update_count, 0); @@ -768,7 +768,7 @@ AudioEngine::current_backend_name() const { if (_backend) { return _backend->name(); - } + } return string(); } @@ -921,7 +921,7 @@ AudioEngine::freewheel (bool start_stop) } float -AudioEngine::get_dsp_load() const +AudioEngine::get_dsp_load() const { if (!_backend) { return 0.0; @@ -930,7 +930,7 @@ AudioEngine::get_dsp_load() const } bool -AudioEngine::is_realtime() const +AudioEngine::is_realtime() const { if (!_backend) { return false; @@ -940,7 +940,7 @@ AudioEngine::is_realtime() const } bool -AudioEngine::connected() const +AudioEngine::connected() const { if (!_backend) { return false; diff --git a/libs/ardour/audioregion.cc b/libs/ardour/audioregion.cc index 66d46cd837..361b463450 100644 --- a/libs/ardour/audioregion.cc +++ b/libs/ardour/audioregion.cc @@ -121,8 +121,8 @@ generate_db_fade (boost::shared_ptr<Evoral::ControlList> dst, double len, int nu } static void -merge_curves (boost::shared_ptr<Evoral::ControlList> dst, - boost::shared_ptr<const Evoral::ControlList> curve1, +merge_curves (boost::shared_ptr<Evoral::ControlList> dst, + boost::shared_ptr<const Evoral::ControlList> curve1, boost::shared_ptr<const Evoral::ControlList> curve2) { Evoral::ControlList::EventList::size_type size = curve1->size(); @@ -422,7 +422,7 @@ AudioRegion::set_envelope_active (bool yn) * @param chan_n Channel. * @param frames_per_pixel Number of samples to use to generate one peak value. */ - + ARDOUR::framecnt_t AudioRegion::read_peaks (PeakData *buf, framecnt_t npeaks, framecnt_t offset, framecnt_t cnt, uint32_t chan_n, double frames_per_pixel) const { @@ -432,7 +432,7 @@ AudioRegion::read_peaks (PeakData *buf, framecnt_t npeaks, framecnt_t offset, fr if (audio_source(chan_n)->read_peaks (buf, npeaks, offset, cnt, frames_per_pixel)) { return 0; - } + } if (_scale_amplitude != 1.0f) { for (framecnt_t n = 0; n < npeaks; ++n) { @@ -603,7 +603,7 @@ AudioRegion::read_at (Sample *buf, Sample *mixdown_buffer, float *gain_buffer, /* APPLY FADES TO THE DATA IN mixdown_buffer AND MIX THE RESULTS INTO * buf. The key things to realize here: (1) the fade being applied is - * (as of April 26th 2012) just the inverse of the fade in curve (2) + * (as of April 26th 2012) just the inverse of the fade in curve (2) * "buf" contains data from lower regions already. So this operation * fades out the existing material. */ @@ -1120,12 +1120,12 @@ AudioRegion::set_fade_out (FadeShape shape, framecnt_t len) reverse_curve (_inverse_fade_out.val(), _fade_out.val()); break; - case FadeFast: + case FadeFast: generate_db_fade (_fade_out.val(), len, num_steps, -60); generate_inverse_power_curve (_inverse_fade_out.val(), _fade_out.val()); break; - case FadeSlow: + case FadeSlow: generate_db_fade (c1, len, num_steps, -1); //start off with a slow fade generate_db_fade (c2, len, num_steps, -80); //end with a fast fade merge_curves (_fade_out.val(), c1, c2); @@ -1573,10 +1573,10 @@ AudioRegion::get_related_audio_file_channel_count () const { uint32_t chan_count = 0; for (SourceList::const_iterator i = _sources.begin(); i != _sources.end(); ++i) { - + boost::shared_ptr<SndFileSource> sndf = boost::dynamic_pointer_cast<SndFileSource>(*i); if (sndf ) { - + if (sndf->channel_count() > chan_count) { chan_count = sndf->channel_count(); } @@ -1592,7 +1592,7 @@ AudioRegion::get_related_audio_file_channel_count () const } #endif // HAVE_COREAUDIO } - + return chan_count; } diff --git a/libs/ardour/audiosource.cc b/libs/ardour/audiosource.cc index e9ca419e3c..89e1e0593b 100644 --- a/libs/ardour/audiosource.cc +++ b/libs/ardour/audiosource.cc @@ -380,7 +380,7 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t * * XXX this may not work for destructive recording, but we * might decided to get rid of that anyway. - * + * */ const off_t expected_file_size = (_length / (double) samples_per_file_peak) * sizeof (PeakData); @@ -404,7 +404,7 @@ AudioSource::read_peaks_with_fpp (PeakData *peaks, framecnt_t npeaks, framepos_t error << string_compose (_("Cannot open peakfile @ %1 for reading (%2)"), _peakpath, strerror (errno)) << endmsg; return -1; } - + scale = npeaks/expected_peaks; diff --git a/libs/ardour/auto_bundle.cc b/libs/ardour/auto_bundle.cc index 75db301ae1..a8d471ad51 100644 --- a/libs/ardour/auto_bundle.cc +++ b/libs/ardour/auto_bundle.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index 706a3330a7..3cf3d6af8b 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -226,7 +226,7 @@ AutomationList::stop_touch (bool mark, double) if (mark) { /* XXX need to mark the last added point with the - * current time + * current time */ } } diff --git a/libs/ardour/automation_watch.cc b/libs/ardour/automation_watch.cc index 3714f17502..e9fecb5973 100644 --- a/libs/ardour/automation_watch.cc +++ b/libs/ardour/automation_watch.cc @@ -75,7 +75,7 @@ AutomationWatch::add_automation_watch (boost::shared_ptr<AutomationControl> ac) */ if (_session && _session->transport_rolling() && ac->alist()->automation_write()) { - DEBUG_TRACE (DEBUG::Automation, string_compose ("\ttransport is rolling @ %1, audible = %2so enter write pass\n", + DEBUG_TRACE (DEBUG::Automation, string_compose ("\ttransport is rolling @ %1, audible = %2so enter write pass\n", _session->transport_speed(), _session->audible_frame())); /* add a guard point since we are already moving */ ac->list()->set_in_write_pass (true, true, _session->audible_frame()); @@ -130,7 +130,7 @@ AutomationWatch::timer () } } else if (time != _last_time) { //transport stopped or reversed. stop the automation pass and start a new one (for bonus points, someday store the previous pass in an undo record) for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) { - DEBUG_TRACE (DEBUG::Automation, string_compose ("%1: transport in rewind, speed %2, in write pass ? %3 writing ? %4\n", + DEBUG_TRACE (DEBUG::Automation, string_compose ("%1: transport in rewind, speed %2, in write pass ? %3 writing ? %4\n", (*aw)->name(), _session->transport_speed(), _session->transport_rolling(), (*aw)->alist()->automation_write())); (*aw)->list()->set_in_write_pass (false); @@ -191,7 +191,7 @@ AutomationWatch::transport_state_change () Glib::Threads::Mutex::Lock lm (automation_watch_lock); for (AutomationWatches::iterator aw = automation_watches.begin(); aw != automation_watches.end(); ++aw) { - DEBUG_TRACE (DEBUG::Automation, string_compose ("%1: transport state changed, speed %2, in write pass ? %3 writing ? %4\n", + DEBUG_TRACE (DEBUG::Automation, string_compose ("%1: transport state changed, speed %2, in write pass ? %3 writing ? %4\n", (*aw)->name(), _session->transport_speed(), rolling, (*aw)->alist()->automation_write())); if (rolling && (*aw)->alist()->automation_write()) { diff --git a/libs/ardour/broadcast_info.cc b/libs/ardour/broadcast_info.cc index 7e092db21b..98175a6da6 100644 --- a/libs/ardour/broadcast_info.cc +++ b/libs/ardour/broadcast_info.cc @@ -94,10 +94,10 @@ BroadcastInfo::set_originator_ref_from_session (Session const & /*session*/) /* https://tech.ebu.ch/docs/r/r099.pdf * CC Country code: (2 characters) based on the ISO 3166-1 standard - * OOO Organisation code: (3 characters) based on the EBU facility codes, Tech 3279 + * OOO Organisation code: (3 characters) based on the EBU facility codes, Tech 3279 * NNNNNNNNNNNN Serial number: (12 characters extracted from the recorder model and serial number) This should identify the machine’s type and serial number. * HHMMSS OriginationTime (6 characters,) from the <OriginationTime> field of the BWF. - * RRRRRRRRR Random Number (9 characters 0-9) Generated locally by the recorder using some reasonably random algorithm. + * RRRRRRRRR Random Number (9 characters 0-9) Generated locally by the recorder using some reasonably random algorithm. */ snprintf_bounded_null_filled (info->originator_reference, sizeof (info->originator_reference), "%2s%3s%12s%02d%02d%02d%9d", SessionMetadata::Metadata()->country().substr (0, 2).c_str(), diff --git a/libs/ardour/buffer_set.cc b/libs/ardour/buffer_set.cc index d656f838fa..82e96be750 100644 --- a/libs/ardour/buffer_set.cc +++ b/libs/ardour/buffer_set.cc @@ -79,7 +79,7 @@ BufferSet::clear() _count.reset(); _available.reset(); -#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT +#if defined WINDOWS_VST_SUPPORT || defined LXVST_SUPPORT for (VSTBuffers::iterator i = _vst_buffers.begin(); i != _vst_buffers.end(); ++i) { delete *i; } diff --git a/libs/ardour/butler.cc b/libs/ardour/butler.cc index f97a99fed2..272612f7b5 100644 --- a/libs/ardour/butler.cc +++ b/libs/ardour/butler.cc @@ -111,7 +111,7 @@ Butler::start_thread() const float rate = (float)_session.frame_rate(); audio_dstream_capture_buffer_size = (uint32_t) floor (Config->get_audio_capture_buffer_seconds() * rate); audio_dstream_playback_buffer_size = (uint32_t) floor (Config->get_audio_playback_buffer_seconds() * rate); - + /* size is in bytes * XXX: AudioEngine needs to tell us the MIDI buffer size * (i.e. how many MIDI bytes we might see in a cycle) @@ -129,7 +129,7 @@ Butler::start_thread() //pthread_detach (thread); have_thread = true; - + // we are ready to request buffer adjustments _session.adjust_capture_buffering (); _session.adjust_playback_buffering (); diff --git a/libs/ardour/caimportable.cc b/libs/ardour/caimportable.cc index 8bacbd1d15..751e74cbcf 100644 --- a/libs/ardour/caimportable.cc +++ b/libs/ardour/caimportable.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 376152c139..8b137843dd 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -286,7 +286,7 @@ ControlProtocolManager::discover_control_protocols () find_files_matching_pattern (cp_modules, control_protocol_search_path (), dylib_extension_pattern); - DEBUG_TRACE (DEBUG::ControlProtocols, + DEBUG_TRACE (DEBUG::ControlProtocols, string_compose (_("looking for control protocols in %1\n"), control_protocol_search_path().to_string())); for (vector<std::string>::iterator i = cp_modules.begin(); i != cp_modules.end(); ++i) { @@ -328,7 +328,7 @@ ControlProtocolManager::control_protocol_discover (string path) control_protocol_info.push_back (cpi); - DEBUG_TRACE (DEBUG::ControlProtocols, + DEBUG_TRACE (DEBUG::ControlProtocols, string_compose(_("Control surface protocol discovered: \"%1\"\n"), cpi->name)); } diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 1b8a8c5948..7bccf3121d 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -101,7 +101,7 @@ Delivery::~Delivery() /* this object should vanish from any signal callback lists that it is on before we get any further. The full qualification - of the method name is not necessary, but is here to make it + of the method name is not necessary, but is here to make it clear that this call is about signals, not data flow connections. */ @@ -394,7 +394,7 @@ Delivery::pan_outs () const { if (_output) { return _output->n_ports().n_audio(); - } + } return _configured_output.n_audio(); } diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc index d8c35c52eb..54b491e412 100644 --- a/libs/ardour/directory_names.cc +++ b/libs/ardour/directory_names.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/engine_state_controller.cc b/libs/ardour/engine_state_controller.cc index eb4cb14959..991af4cf4e 100644 --- a/libs/ardour/engine_state_controller.cc +++ b/libs/ardour/engine_state_controller.cc @@ -1,20 +1,20 @@ /* Copyright (C) 2014 Waves Audio Ltd. - + 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 "ardour/engine_state_controller.h" @@ -33,18 +33,18 @@ using namespace ARDOUR; using namespace PBD; namespace { - + struct DevicePredicate { DevicePredicate (const std::string& device_name) : _device_name (device_name) {} - + bool operator ()(const AudioBackend::DeviceStatus& rhs) { return _device_name == rhs.name; } - + private: std::string _device_name; }; @@ -66,21 +66,21 @@ EngineStateController::EngineStateController () AudioEngine::instance ()->Running.connect_same_thread (running_connection, boost::bind (&EngineStateController::_on_engine_running, this)); AudioEngine::instance ()->Stopped.connect_same_thread (stopped_connection, boost::bind (&EngineStateController::_on_engine_stopped, this)); AudioEngine::instance ()->Halted.connect_same_thread (stopped_connection, boost::bind (&EngineStateController::_on_engine_stopped, this)); - + /* Subscribe for udpates from AudioEngine */ AudioEngine::instance ()->PortRegisteredOrUnregistered.connect_same_thread (update_connections, boost::bind (&EngineStateController::_on_ports_registration_update, this)); AudioEngine::instance ()->SampleRateChanged.connect_same_thread (update_connections, boost::bind (&EngineStateController::_on_sample_rate_change, this, _1)); AudioEngine::instance ()->BufferSizeChanged.connect_same_thread (update_connections, boost::bind (&EngineStateController::_on_buffer_size_change, this, _1)); AudioEngine::instance ()->DeviceListChanged.connect_same_thread (update_connections, boost::bind (&EngineStateController::_on_device_list_change, this)); AudioEngine::instance ()->DeviceError.connect_same_thread (update_connections, boost::bind (&EngineStateController::_on_device_error, this)); - + /* Global configuration parameters update */ Config->ParameterChanged.connect_same_thread (update_connections, boost::bind (&EngineStateController::_on_parameter_changed, this, _1)); - + _deserialize_and_load_engine_states (); _deserialize_and_load_midi_port_states (); _do_initial_engine_setup (); - + // now push the sate to the backend push_current_state_to_backend (false); } @@ -110,12 +110,12 @@ EngineStateController::remove_session () XMLNode& EngineStateController::serialize_audio_midi_settings () { - + XMLNode* root = new XMLNode ("AudioMidiSettings"); - + _serialize_engine_states (root); _serialize_midi_port_states (root); - + return *root; } @@ -132,142 +132,142 @@ void EngineStateController::_deserialize_and_load_engine_states () { XMLNode* audio_midi_settings_root = ARDOUR::Config->extra_xml ("AudioMidiSettings"); - + if (!audio_midi_settings_root) { return; } - + XMLNode* engine_states = audio_midi_settings_root->child ("EngineStates"); - + if (!engine_states) { return; } - + XMLNodeList state_nodes_list = engine_states->children (); XMLNodeConstIterator state_node_iter = state_nodes_list.begin (); - + for (; state_node_iter != state_nodes_list.end (); ++state_node_iter) { - + XMLNode* state_node = *state_node_iter; StatePtr engine_state (new State); XMLProperty* prop = NULL; - + if ((prop = state_node->property ("backend-name")) == 0) { continue; } engine_state->backend_name = prop->value (); - + if ((prop = state_node->property ("device-name")) == 0) { continue; } engine_state->device_name = prop->value (); - + if ((prop = state_node->property ("sample-rate")) == 0) { continue; } engine_state->sample_rate = atoi (prop->value ()); - + if ((prop = state_node->property ("buffer-size")) == 0) { continue; } engine_state->buffer_size = atoi (prop->value ()); - + if ((prop = state_node->property ("active")) == 0) { continue; } engine_state->active = string_is_affirmative (prop->value ()); - + XMLNodeList state_children_list = state_node->children (); XMLNodeConstIterator state_child_iter = state_children_list.begin (); - + for (; state_child_iter != state_children_list.end (); ++state_child_iter) { XMLNode* state_child = *state_child_iter; - + if (state_child->name () == "InputConfiguration") { - + XMLNodeList input_states_nodes = state_child->children (); XMLNodeConstIterator input_state_node_iter = input_states_nodes.begin (); PortStateList& input_states = engine_state->input_channel_states; - + for (; input_state_node_iter != input_states_nodes.end (); ++input_state_node_iter) { - + XMLNode* input_state_node = *input_state_node_iter; - + if (input_state_node->name () != "input") { continue; } PortState input_state (input_state_node->name ()); - + if ((prop = input_state_node->property ("name")) == 0) { continue; } input_state.name = prop->value (); - + if ((prop = input_state_node->property ("active")) == 0) { continue; } input_state.active = string_is_affirmative (prop->value ()); - + input_states.push_back (input_state); } - + } else if (state_child->name () == "MultiOutConfiguration") { - + XMLNodeList multi_out_state_nodes = state_child->children (); XMLNodeConstIterator multi_out_state_node_iter = multi_out_state_nodes.begin (); PortStateList& multi_out_states = engine_state->multi_out_channel_states; - + for (; multi_out_state_node_iter != multi_out_state_nodes.end (); ++multi_out_state_node_iter) { - + XMLNode* multi_out_state_node = *multi_out_state_node_iter; - + if (multi_out_state_node->name () != "output") { continue; } PortState multi_out_state (multi_out_state_node->name ()); - + if ((prop = multi_out_state_node->property ("name")) == 0) { continue; } multi_out_state.name = prop->value (); - + if ((prop = multi_out_state_node->property ("active")) == 0) { continue; } multi_out_state.active = string_is_affirmative (prop->value ()); - + multi_out_states.push_back (multi_out_state); } } else if (state_child->name () == "StereoOutConfiguration") { - + XMLNodeList stereo_out_state_nodes = state_child->children (); XMLNodeConstIterator stereo_out_state_node_iter = stereo_out_state_nodes.begin (); PortStateList& stereo_out_states = engine_state->stereo_out_channel_states; - + for (; stereo_out_state_node_iter != stereo_out_state_nodes.end (); ++stereo_out_state_node_iter) { - + XMLNode* stereo_out_state_node = *stereo_out_state_node_iter; - + if (stereo_out_state_node->name () != "output") { continue; } PortState stereo_out_state (stereo_out_state_node->name ()); - + if ((prop = stereo_out_state_node->property ("name")) == 0) { continue; } stereo_out_state.name = prop->value (); - + if ((prop = stereo_out_state_node->property ("active")) == 0) { continue; - } + } stereo_out_state.active = string_is_affirmative (prop->value ()); - + stereo_out_states.push_back (stereo_out_state); } } } - + _states.push_back (engine_state); } } @@ -275,99 +275,99 @@ EngineStateController::_deserialize_and_load_engine_states () void EngineStateController::_deserialize_and_load_midi_port_states () -{ +{ XMLNode* audio_midi_settings_root = ARDOUR::Config->extra_xml ("AudioMidiSettings"); - + if (!audio_midi_settings_root) { return; } - + XMLNode* midi_states = audio_midi_settings_root->child ("MidiStates"); - + if (!midi_states) { return; } - + XMLNodeList state_nodes_list = midi_states->children (); XMLNodeConstIterator state_node_iter = state_nodes_list.begin (); for (; state_node_iter != state_nodes_list.end (); ++state_node_iter) { - + XMLNode* state_node = *state_node_iter; if (state_node->name () == "MidiInputs") { - + XMLNodeList input_state_nodes = state_node->children (); XMLNodeConstIterator input_state_node_iter = input_state_nodes.begin (); _midi_inputs.clear (); - + for (; input_state_node_iter != input_state_nodes.end (); ++input_state_node_iter) { - + XMLNode* input_state_node = *input_state_node_iter; XMLProperty* prop = NULL; - + if (input_state_node->name () != "input") { continue; } MidiPortState input_state (input_state_node->name ()); - + if ((prop = input_state_node->property ("name")) == 0) { continue; } input_state.name = prop->value (); - + if ((prop = input_state_node->property ("active")) == 0) { continue; } input_state.active = string_is_affirmative (prop->value ()); - + if ((prop = input_state_node->property ("scene-connected")) == 0) { continue; } input_state.scene_connected = string_is_affirmative (prop->value ()); - + if ((prop = input_state_node->property ("mtc-in")) == 0) { continue; } input_state.mtc_in = string_is_affirmative (prop->value ()); - + _midi_inputs.push_back (input_state); } - + } else if (state_node->name () == "MidiOutputs") { - + XMLNodeList output_state_nodes = state_node->children (); XMLNodeConstIterator output_state_node_iter = output_state_nodes.begin (); _midi_outputs.clear (); - + for (; output_state_node_iter != output_state_nodes.end (); ++output_state_node_iter) { - + XMLNode* output_state_node = *output_state_node_iter; XMLProperty* prop = NULL; - + if (output_state_node->name () != "output") { continue; } MidiPortState output_state (output_state_node->name ()); - + if ((prop = output_state_node->property ("name")) == 0) { continue; } output_state.name = prop->value (); - + if ((prop = output_state_node->property ("active")) == 0) { continue; } output_state.active = string_is_affirmative (prop->value ()); - + if ((prop = output_state_node->property ("scene-connected")) == 0) { continue; } output_state.scene_connected = string_is_affirmative (prop->value ()); - + if ((prop = output_state_node->property ("mtc-in")) == 0) { continue; } output_state.mtc_in = string_is_affirmative (prop->value ()); - + _midi_outputs.push_back (output_state); } } @@ -381,26 +381,26 @@ EngineStateController::_serialize_engine_states (XMLNode* audio_midi_settings_no if (!audio_midi_settings_node) { return; } - + // clean up state data first audio_midi_settings_node->remove_nodes_and_delete ("EngineStates" ); - + XMLNode* engine_states = new XMLNode ("EngineStates" ); - + StateList::const_iterator state_iter = _states.begin (); for (; state_iter != _states.end (); ++state_iter) { - + StatePtr state_ptr = *state_iter; - + // create new node for the state XMLNode* state_node = new XMLNode ("State"); - + state_node->add_property ("backend-name", state_ptr->backend_name); state_node->add_property ("device-name", state_ptr->device_name); state_node->add_property ("sample-rate", state_ptr->sample_rate); state_node->add_property ("buffer-size", state_ptr->buffer_size); state_node->add_property ("active", state_ptr->active ? "yes" : "no"); - + // store channel states: // inputs XMLNode* input_config_node = new XMLNode ("InputConfiguration"); @@ -413,7 +413,7 @@ EngineStateController::_serialize_engine_states (XMLNode* audio_midi_settings_no input_config_node->add_child_nocopy (*input_state_node); } state_node->add_child_nocopy (*input_config_node); - + // multi out outputs XMLNode* multi_out_config_node = new XMLNode ("MultiOutConfiguration"); PortStateList& multi_out_channels = state_ptr->multi_out_channel_states; @@ -425,7 +425,7 @@ EngineStateController::_serialize_engine_states (XMLNode* audio_midi_settings_no multi_out_config_node->add_child_nocopy (*multi_out_state_node); } state_node->add_child_nocopy (*multi_out_config_node); - + // stereo out outputs XMLNode* stereo_out_config_node = new XMLNode ("StereoOutConfiguration"); PortStateList& stereo_out_channels = state_ptr->stereo_out_channel_states; @@ -437,7 +437,7 @@ EngineStateController::_serialize_engine_states (XMLNode* audio_midi_settings_no stereo_out_config_node->add_child_nocopy (*stereo_out_state_node); } state_node->add_child_nocopy (*stereo_out_config_node); - + engine_states->add_child_nocopy (*state_node); } @@ -451,12 +451,12 @@ EngineStateController::_serialize_midi_port_states (XMLNode* audio_midi_settings if (!audio_midi_settings_node) { return; } - + // clean up state data first audio_midi_settings_node->remove_nodes_and_delete ("MidiStates" ); - + XMLNode* midi_states_node = new XMLNode ("MidiStates" ); - + XMLNode* midi_input_states_node = new XMLNode ("MidiInputs" ); MidiPortStateList::const_iterator midi_input_state_iter = _midi_inputs.begin (); for (; midi_input_state_iter != _midi_inputs.end (); ++midi_input_state_iter) { @@ -468,7 +468,7 @@ EngineStateController::_serialize_midi_port_states (XMLNode* audio_midi_settings midi_input_states_node->add_child_nocopy (*midi_input_node); } midi_states_node->add_child_nocopy (*midi_input_states_node); - + XMLNode* midi_output_states_node = new XMLNode ("MidiOutputs" ); MidiPortStateList::const_iterator midi_output_state_iter = _midi_outputs.begin (); for (; midi_output_state_iter != _midi_outputs.end (); ++midi_output_state_iter) { @@ -489,11 +489,11 @@ bool EngineStateController::_apply_state (const StatePtr& state) { bool applied = false; - + if (set_new_backend_as_current (state->backend_name)) { applied = set_new_device_as_current (state->device_name); } - + return applied; } @@ -502,10 +502,10 @@ void EngineStateController::_do_initial_engine_setup () { bool state_applied = false; - + // if we have no saved state load default values if (!_states.empty ()) { - + // look for last active state first StateList::const_iterator state_iter = _states.begin (); for (; state_iter != _states.end (); ++state_iter) { @@ -514,7 +514,7 @@ EngineStateController::_do_initial_engine_setup () break; } } - + // last active state was not applied // try others if (!state_applied) { @@ -528,14 +528,14 @@ EngineStateController::_do_initial_engine_setup () if (!state_applied ){ std::vector<const AudioBackendInfo*> backends = AudioEngine::instance ()->available_backends (); - + if (!backends.empty ()) { - + if (!set_new_backend_as_current (backends.front ()->name )) { std::cerr << "\tfailed to set backend [" << backends.front ()->name << "]\n"; } } - + } } @@ -545,18 +545,18 @@ EngineStateController::_validate_current_device_state () { boost::shared_ptr<AudioBackend> backend = AudioEngine::instance ()->current_backend (); assert (backend); - + // check if device parameters from the state record are still valid // validate sample rate std::vector<float> sample_rates = backend->available_sample_rates (_current_state->device_name); - + if (sample_rates.empty ()) { return false; } // check if session desired sample rate (if it's set) could be used with this device if (_session != 0) { - + if ( !set_new_sample_rate_in_controller (_session->nominal_frame_rate ())) { if ( !set_new_sample_rate_in_controller (backend->default_sample_rate ()) ) { if (!set_new_sample_rate_in_controller (sample_rates.front ()) ) { @@ -564,7 +564,7 @@ EngineStateController::_validate_current_device_state () } } } - + } else { // check if current sample rate is supported because we have no session desired sample rate value if ( !set_new_sample_rate_in_controller (_current_state->sample_rate)) { @@ -575,7 +575,7 @@ EngineStateController::_validate_current_device_state () } } } - + // validate buffer size std::vector<pframes_t> buffer_sizes = backend->available_buffer_sizes (_current_state->device_name); // check if buffer size is supported @@ -602,7 +602,7 @@ void EngineStateController::_update_ltc_source_port () { // this method is called if the list of ports is changed - + // check that ltc-in port from Config still exists if (_audio_input_port_exists (get_ltc_source_port ())) { // audio port, that was saved in Config, exists @@ -614,7 +614,7 @@ EngineStateController::_update_ltc_source_port () set_ltc_source_port (_current_state->input_channel_states.front ().name); return ; } - + // no available audio-in ports set_ltc_source_port (""); } @@ -623,7 +623,7 @@ void EngineStateController::_update_ltc_output_port () { // this method is called if the list of ports is changed - + // check that ltc-out port from Config still exists if (_audio_output_port_exists (get_ltc_output_port ())) { // audio port, that was saved in Config, exists @@ -636,17 +636,17 @@ EngineStateController::_update_ltc_output_port () } else { output_states = &_current_state->multi_out_channel_states; } - + //otherwise set first available audio port if (!output_states->empty ()) { set_ltc_output_port (output_states->front ().name); return ; } - + // no available audio-out ports set_ltc_output_port (""); } - + bool EngineStateController::_audio_input_port_exists (const std::string& port_name) @@ -668,7 +668,7 @@ EngineStateController::_audio_output_port_exists (const std::string& port_name) } else { output_states = &_current_state->multi_out_channel_states; } - + PortStateList::const_iterator iter = output_states->begin (); for (; iter != output_states->end (); ++iter ) { if (iter->name == port_name) @@ -764,17 +764,17 @@ EngineStateController::set_new_backend_as_current (const std::string& backend_na if (backend_name == AudioEngine::instance ()->current_backend_name ()) { return true; } - + boost::shared_ptr<AudioBackend> backend = AudioEngine::instance ()->set_backend (backend_name, PROGRAM_NAME, ""); if (backend) { if (_current_state != NULL) { _current_state->active = false; } - + StateList::iterator found_state_iter = find_if (_states.begin (), _states.end (), State::StatePredicate (backend_name, "None")); - + if (found_state_iter != _states.end ()) { // we found a record for new engine with None device - switch to it _current_state = *found_state_iter; @@ -787,12 +787,12 @@ EngineStateController::set_new_backend_as_current (const std::string& backend_na _validate_current_device_state (); _states.push_front (_current_state); } - + push_current_state_to_backend (false); - + return true; } - + return false; } @@ -803,67 +803,67 @@ EngineStateController::set_new_device_as_current (const std::string& device_name if (_current_state->device_name == device_name) { return true; } - + boost::shared_ptr<AudioBackend> backend = AudioEngine::instance ()->current_backend (); assert (backend); - + std::vector<AudioBackend::DeviceStatus> device_vector = backend->enumerate_devices (); - + // validate the device std::vector<AudioBackend::DeviceStatus>::iterator device_iter; device_iter = std::find_if (device_vector.begin (), device_vector.end (), DevicePredicate (device_name)); - + // device is available if (device_iter != device_vector.end ()) { - + boost::shared_ptr<State> previous_state (_current_state); - + // look through state list and find the record for this device and current engine StateList::iterator found_state_iter = find_if (_states.begin (), _states.end (), State::StatePredicate (backend->name (), device_name)); - + if (found_state_iter != _states.end ()) { // we found a record for current engine and provided device name - switch to it - + _current_state = *found_state_iter; - + if (!_validate_current_device_state ()) { _current_state = previous_state; return false; } - + } else { - + // the record is not found, create new one _current_state = boost::shared_ptr<State>(new State ()); - + _current_state->backend_name = backend->name (); _current_state->device_name = device_name; - + if (!_validate_current_device_state ()) { _current_state = previous_state; return false; } - + _states.push_front (_current_state); } - + if (previous_state != NULL) { previous_state->active = false; } - + push_current_state_to_backend (false); _last_used_real_device.clear (); - + if (device_name != "None") { _last_used_real_device = device_name; } - + return true; } - + // device is not supported by current backend return false; } @@ -874,25 +874,25 @@ EngineStateController::set_new_sample_rate_in_controller (framecnt_t sample_rate { boost::shared_ptr<AudioBackend> backend = AudioEngine::instance ()->current_backend (); assert (backend); - + std::vector<float> sample_rates = backend->available_sample_rates (_current_state->device_name); std::vector<float>::iterator iter = std::find (sample_rates.begin (), sample_rates.end (), (float)sample_rate); - + if (iter != sample_rates.end ()) { _current_state->sample_rate = sample_rate; return true; } - + return false; } bool EngineStateController::set_new_buffer_size_in_controller (pframes_t buffer_size) -{ +{ boost::shared_ptr<AudioBackend> backend = AudioEngine::instance ()->current_backend (); assert (backend); - + std::vector<uint32_t> buffer_sizes = backend->available_buffer_sizes (_current_state->device_name); std::vector<uint32_t>::iterator iter = std::find (buffer_sizes.begin (), buffer_sizes.end (), buffer_size); @@ -900,7 +900,7 @@ EngineStateController::set_new_buffer_size_in_controller (pframes_t buffer_size) _current_state->buffer_size = buffer_size; return true; } - + return false; } @@ -909,15 +909,15 @@ uint32_t EngineStateController::get_available_inputs_count () const { uint32_t available_channel_count = 0; - + PortStateList::const_iterator iter = _current_state->input_channel_states.begin (); - + for (; iter != _current_state->input_channel_states.end (); ++iter) { if (iter->active) { ++available_channel_count; } } - + return available_channel_count; } @@ -926,22 +926,22 @@ uint32_t EngineStateController::get_available_outputs_count () const { uint32_t available_channel_count = 0; - + PortStateList* output_states; if (Config->get_output_auto_connect () & AutoConnectMaster) { output_states = &_current_state->stereo_out_channel_states; } else { output_states = &_current_state->multi_out_channel_states; } - + PortStateList::const_iterator iter = output_states->begin (); - + for (; iter != output_states->end (); ++iter) { if (iter->active) { ++available_channel_count; } } - + return available_channel_count; } @@ -950,9 +950,9 @@ void EngineStateController::get_physical_audio_inputs (std::vector<std::string>& port_names) { port_names.clear (); - + PortStateList &input_states = _current_state->input_channel_states; - + PortStateList::iterator iter = input_states.begin (); for (; iter != input_states.end (); ++iter) { if (iter->active) { @@ -966,14 +966,14 @@ void EngineStateController::get_physical_audio_outputs (std::vector<std::string>& port_names) { port_names.clear (); - + PortStateList* output_states; if (Config->get_output_auto_connect () & AutoConnectMaster) { output_states = &_current_state->stereo_out_channel_states; } else { output_states = &_current_state->multi_out_channel_states; } - + PortStateList::iterator iter = output_states->begin (); for (; iter != output_states->end (); ++iter) { if (iter->active) { @@ -987,7 +987,7 @@ void EngineStateController::get_physical_midi_inputs (std::vector<std::string>& port_names) { port_names.clear (); - + MidiPortStateList::iterator iter = _midi_inputs.begin (); for (; iter != _midi_inputs.end (); ++iter) { if (iter->available && iter->active) { @@ -1001,7 +1001,7 @@ void EngineStateController::get_physical_midi_outputs (std::vector<std::string>& port_names) { port_names.clear (); - + MidiPortStateList::iterator iter = _midi_outputs.begin (); for (; iter != _midi_outputs.end (); ++iter) { if (iter->available && iter->active) { @@ -1017,11 +1017,11 @@ EngineStateController::set_physical_audio_input_state (const std::string& port_n PortStateList &input_states = _current_state->input_channel_states; PortStateList::iterator found_state_iter; found_state_iter = std::find (input_states.begin (), input_states.end (), PortState (port_name)); - + if (found_state_iter != input_states.end () && found_state_iter->active != state ) { found_state_iter->active = state; AudioEngine::instance ()->reconnect_session_routes (true, false); - + InputConfigChanged (); } } @@ -1036,33 +1036,33 @@ EngineStateController::set_physical_audio_output_state (const std::string& port_ } else { output_states = &_current_state->multi_out_channel_states; } - + PortStateList::iterator target_state_iter; target_state_iter = std::find (output_states->begin (), output_states->end (), PortState (port_name)); - + if (target_state_iter != output_states->end () && target_state_iter->active != state ) { target_state_iter->active = state; - + // if StereoOut mode is used if (Config->get_output_auto_connect () & AutoConnectMaster) { - + // get next element PortStateList::iterator next_state_iter (target_state_iter); - + // loopback if (++next_state_iter == output_states->end ()) { next_state_iter = output_states->begin (); } - - + + // only two outputs should be enabled if (output_states->size () <= 2) { - + target_state_iter->active = true; next_state_iter->active = true; - + } else { - + // if current was set to active - activate next and disable the rest if (target_state_iter->active ) { next_state_iter->active = true; @@ -1080,10 +1080,10 @@ EngineStateController::set_physical_audio_output_state (const std::string& port_ target_state_iter->active = true; } } - + // now deactivate the rest while (++next_state_iter != target_state_iter) { - + if (next_state_iter == output_states->end ()) { next_state_iter = output_states->begin (); // we jumped, so additional check is required @@ -1091,13 +1091,13 @@ EngineStateController::set_physical_audio_output_state (const std::string& port_ break; } } - + next_state_iter->active = false; } - + } } - + AudioEngine::instance ()->reconnect_session_routes (false, true); OutputConfigChanged (); } @@ -1108,15 +1108,15 @@ bool EngineStateController::get_physical_audio_input_state (const std::string& port_name) { bool state = false; - + PortStateList &input_states = _current_state->input_channel_states; PortStateList::iterator found_state_iter; found_state_iter = std::find (input_states.begin (), input_states.end (), PortState (port_name)); - + if (found_state_iter != input_states.end ()) { state = found_state_iter->active; } - + return state; } @@ -1125,17 +1125,17 @@ bool EngineStateController::get_physical_audio_output_state (const std::string& port_name) { bool state = false; - + PortStateList* output_states; if (Config->get_output_auto_connect () & AutoConnectMaster) { output_states = &_current_state->stereo_out_channel_states; } else { output_states = &_current_state->multi_out_channel_states; } - + PortStateList::iterator found_state_iter; found_state_iter = std::find (output_states->begin (), output_states->end (), PortState (port_name)); - + if (found_state_iter != output_states->end ()) { state = found_state_iter->active; } @@ -1146,13 +1146,13 @@ EngineStateController::get_physical_audio_output_state (const std::string& port_ void EngineStateController::set_physical_midi_input_state (const std::string& port_name, bool state) { - + MidiPortStateList::iterator found_state_iter; found_state_iter = std::find (_midi_inputs.begin (), _midi_inputs.end (), MidiPortState (port_name)); - + if (found_state_iter != _midi_inputs.end () && found_state_iter->available && found_state_iter->active != state ) { found_state_iter->active = state; - + if (_session) { // reconnect MTC inputs as well if (found_state_iter->mtc_in) { @@ -1160,7 +1160,7 @@ EngineStateController::set_physical_midi_input_state (const std::string& port_na } _session->reconnect_mmc_ports (true); } - + MIDIInputConfigChanged (); } } @@ -1168,17 +1168,17 @@ EngineStateController::set_physical_midi_input_state (const std::string& port_na void EngineStateController::set_physical_midi_output_state (const std::string& port_name, bool state) { - + MidiPortStateList::iterator found_state_iter; found_state_iter = std::find (_midi_outputs.begin (), _midi_outputs.end (), MidiPortState (port_name)); - + if (found_state_iter != _midi_outputs.end () && found_state_iter->available && found_state_iter->active != state ) { found_state_iter->active = state; - + if (_session) { _session->reconnect_mmc_ports (false); } - + MIDIOutputConfigChanged (); } } @@ -1186,47 +1186,47 @@ EngineStateController::set_physical_midi_output_state (const std::string& port_n bool EngineStateController::get_physical_midi_input_state (const std::string& port_name, bool& scene_connected) { - + bool state = false; - + MidiPortStateList::iterator found_state_iter; found_state_iter = std::find (_midi_inputs.begin (), _midi_inputs.end (), MidiPortState (port_name)); - + if (found_state_iter != _midi_inputs.end () && found_state_iter->available) { state = found_state_iter->active; scene_connected = found_state_iter->scene_connected; } - + return state; } bool EngineStateController::get_physical_midi_output_state (const std::string& port_name, bool& scene_connected) { - + bool state = false; - + MidiPortStateList::iterator found_state_iter; found_state_iter = std::find (_midi_outputs.begin (), _midi_outputs.end (), MidiPortState (port_name)); - + if (found_state_iter != _midi_outputs.end () && found_state_iter->available) { state = found_state_iter->active; scene_connected = found_state_iter->scene_connected; } - + return state; } void EngineStateController::set_physical_midi_scene_in_connection_state (const std::string& port_name, bool state) { - + MidiPortStateList::iterator found_state_iter; found_state_iter = std::find (_midi_inputs.begin (), _midi_inputs.end (), MidiPortState (port_name)); - + if (found_state_iter != _midi_inputs.end () && found_state_iter->available && found_state_iter->active ) { found_state_iter->scene_connected = state; - + std::vector<std::string> ports; ports.push_back (port_name); MIDISceneInputConnectionChanged (ports, state); @@ -1237,13 +1237,13 @@ EngineStateController::set_physical_midi_scene_in_connection_state (const std::s void EngineStateController::set_physical_midi_scenen_out_connection_state (const std::string& port_name, bool state) { - + MidiPortStateList::iterator found_state_iter; found_state_iter = std::find (_midi_outputs.begin (), _midi_outputs.end (), MidiPortState (port_name)); - + if (found_state_iter != _midi_outputs.end () && found_state_iter->available && found_state_iter->active ) { found_state_iter->scene_connected = state; - + std::vector<std::string> ports; ports.push_back (port_name); MIDISceneOutputConnectionChanged (ports, state); @@ -1272,7 +1272,7 @@ EngineStateController::set_all_midi_scene_outputs_disconnected () for (; iter != _midi_outputs.end (); ++iter) { iter->scene_connected = false; } - + std::vector<std::string> ports; MIDISceneOutputConnectionChanged (ports, false); } @@ -1284,20 +1284,20 @@ EngineStateController::set_mtc_source_port (const std::string& port_name) MidiPortStateList::iterator iter = _midi_inputs.begin (); for (; iter != _midi_inputs.end (); ++iter) { iter->mtc_in = false; - + if (iter->name == port_name) { iter->mtc_in = true; - + if (_session) { _session->reconnect_mtc_ports (); } } } - + if (_session && port_name.empty ()) { _session->reconnect_mtc_ports (); } - + MTCInputChanged (port_name); } @@ -1306,7 +1306,7 @@ void EngineStateController::set_state_to_all_inputs (bool state) { bool something_changed = false; - + PortStateList::iterator iter = _current_state->input_channel_states.begin (); for (; iter != _current_state->input_channel_states.end (); ++iter) { if (iter->active != state) { @@ -1314,7 +1314,7 @@ EngineStateController::set_state_to_all_inputs (bool state) something_changed = true; } } - + if (something_changed) { AudioEngine::instance ()->reconnect_session_routes (true, false); InputConfigChanged (); @@ -1329,9 +1329,9 @@ EngineStateController::set_state_to_all_outputs (bool state) if (Config->get_output_auto_connect () & AutoConnectMaster) { return; } - + bool something_changed = false; - + PortStateList::iterator iter = _current_state->multi_out_channel_states.begin (); for (; iter != _current_state->multi_out_channel_states.end (); ++iter) { if (iter->active != state) { @@ -1339,7 +1339,7 @@ EngineStateController::set_state_to_all_outputs (bool state) something_changed = true; } } - + if (something_changed) { AudioEngine::instance ()->reconnect_session_routes (false, true); OutputConfigChanged (); @@ -1364,7 +1364,7 @@ EngineStateController::get_physical_audio_output_states (std::vector<PortState>& } else { output_states = &_current_state->multi_out_channel_states; } - + channel_states.assign (output_states->begin (), output_states->end ()); } @@ -1373,9 +1373,9 @@ void EngineStateController::get_physical_midi_input_states (std::vector<MidiPortState>& channel_states) { channel_states.clear (); - + MidiPortStateList::iterator iter = _midi_inputs.begin (); - + for (; iter != _midi_inputs.end (); ++iter ) { if (iter->available) { MidiPortState state (iter->name); @@ -1385,16 +1385,16 @@ EngineStateController::get_physical_midi_input_states (std::vector<MidiPortState state.mtc_in = iter->mtc_in; channel_states.push_back (state); } - } + } } void EngineStateController::get_physical_midi_output_states (std::vector<MidiPortState>& channel_states) { channel_states.clear (); - + MidiPortStateList::iterator iter = _midi_outputs.begin (); - + for (; iter != _midi_outputs.end (); ++iter ) { if (iter->available) { MidiPortState state (iter->name); @@ -1414,12 +1414,12 @@ EngineStateController::_on_session_loaded () if (!_session) { return; } - + AudioEngine::instance ()->reconnect_session_routes (true, true); _session->reconnect_mtc_ports (); _session->reconnect_mmc_ports (true); _session->reconnect_mmc_ports (false); - + // This is done during session construction // _session->reconnect_ltc_input (); // _session->reconnect_ltc_output (); @@ -1437,14 +1437,14 @@ void EngineStateController::_on_sample_rate_change (framecnt_t new_sample_rate) { if (_current_state->sample_rate != new_sample_rate) { - + // if sample rate has been changed framecnt_t sample_rate_to_set = new_sample_rate; if (AudioEngine::instance ()->session ()) { // and we have current session we should restore it back to the one tracks uses sample_rate_to_set = AudioEngine::instance ()->session ()->frame_rate (); } - + if ( !set_new_sample_rate_in_controller (sample_rate_to_set)) { // if sample rate can't be set // switch to NONE device @@ -1453,7 +1453,7 @@ EngineStateController::_on_sample_rate_change (framecnt_t new_sample_rate) DeviceError (); } } - + SampleRateChanged (); // emit a signal } @@ -1464,7 +1464,7 @@ EngineStateController::_on_buffer_size_change (pframes_t new_buffer_size) if (_current_state->buffer_size != new_buffer_size) { _current_state->buffer_size = new_buffer_size; } - + BufferSizeChanged (); // emit a signal } @@ -1473,24 +1473,24 @@ void EngineStateController::_on_device_list_change () { bool current_device_disconnected = false; - + boost::shared_ptr<AudioBackend> backend = AudioEngine::instance ()->current_backend (); assert (backend); - + std::vector<AudioBackend::DeviceStatus> device_vector = backend->enumerate_devices (); - + // find out out if current device is still available if it's not None if (_current_state->device_name != "None") { std::vector<AudioBackend::DeviceStatus>::iterator device_iter; device_iter = std::find_if (device_vector.begin (), device_vector.end (), DevicePredicate (_current_state->device_name)); - + // if current device is not available any more - switch to None device if (device_iter == device_vector.end ()) { - + StateList::iterator found_state_iter = find_if (_states.begin (), _states.end (), State::StatePredicate (_current_state->backend_name, "None")); - + if (found_state_iter != _states.end ()) { // found the record - switch to it _current_state = *found_state_iter; @@ -1503,26 +1503,26 @@ EngineStateController::_on_device_list_change () _validate_current_device_state (); _states.push_front (_current_state); } - + push_current_state_to_backend (true); current_device_disconnected = true; } } else { // if the device which was active before is available now - switch to it - + std::vector<AudioBackend::DeviceStatus>::iterator device_iter; device_iter = std::find_if (device_vector.begin (), device_vector.end (), DevicePredicate (_last_used_real_device)); - + if (device_iter != device_vector.end ()) { StateList::iterator found_state_iter = find_if (_states.begin (), _states.end (), State::StatePredicate (_current_state->backend_name, _last_used_real_device)); - + if (found_state_iter != _states.end ()) { - + boost::shared_ptr<State> previous_state (_current_state); _current_state = *found_state_iter; - + if (_validate_current_device_state ()) { push_current_state_to_backend (false); } else { @@ -1533,8 +1533,8 @@ EngineStateController::_on_device_list_change () } } } - - DeviceListChanged (current_device_disconnected); // emit a signal + + DeviceListChanged (current_device_disconnected); // emit a signal } @@ -1543,21 +1543,21 @@ EngineStateController::_update_device_channels_state () { boost::shared_ptr<AudioBackend> backend = AudioEngine::instance ()->current_backend (); assert (backend); - + // update audio input states std::vector<std::string> phys_audio_inputs; backend->get_physical_inputs (DataType::AUDIO, phys_audio_inputs); - + PortStateList new_input_states; PortStateList &input_states = _current_state->input_channel_states; - + std::vector<std::string>::const_iterator input_iter = phys_audio_inputs.begin (); for (; input_iter != phys_audio_inputs.end (); ++input_iter) { - + PortState state (*input_iter); state.active = true; PortStateList::const_iterator found_state_iter = std::find (input_states.begin (), input_states.end (), state); - + if (found_state_iter != input_states.end ()) { new_input_states.push_back (*found_state_iter); } else { @@ -1565,41 +1565,41 @@ EngineStateController::_update_device_channels_state () } } _current_state->input_channel_states = new_input_states; - + // update audio output states (multi out mode) std::vector<std::string> phys_audio_outputs; backend->get_physical_outputs (DataType::AUDIO, phys_audio_outputs); - + PortStateList new_output_states; PortStateList &output_multi_states = _current_state->multi_out_channel_states; - + std::vector<std::string>::const_iterator output_iter = phys_audio_outputs.begin (); for (; output_iter != phys_audio_outputs.end (); ++output_iter) { - + PortState state (*output_iter); state.active = true; PortStateList::const_iterator found_state_iter = std::find (output_multi_states.begin (), output_multi_states.end (), state); - + if (found_state_iter != output_multi_states.end ()) { new_output_states.push_back (*found_state_iter); } else { new_output_states.push_back (state); } } - + _current_state->multi_out_channel_states = new_output_states; - + // update audio output states (stereo out mode) new_output_states.clear (); PortStateList &output_stereo_states = _current_state->stereo_out_channel_states; - + output_iter = phys_audio_outputs.begin (); for (; output_iter != phys_audio_outputs.end (); ++output_iter) { - + PortState state (*output_iter); state.active = true; PortStateList::const_iterator found_state_iter = std::find (output_stereo_states.begin (), output_stereo_states.end (), state); - + if (found_state_iter != output_stereo_states.end ()) { new_output_states.push_back (*found_state_iter); } else { @@ -1609,8 +1609,8 @@ EngineStateController::_update_device_channels_state () _current_state->stereo_out_channel_states = new_output_states; _refresh_stereo_out_channel_states (); - - + + // update midi ports: unlike audio ports which states are saved per device // each midi port state is saved individualy // so get all midi ports from the backend @@ -1622,42 +1622,42 @@ EngineStateController::_update_device_channels_state () for (; iter != _midi_inputs.end (); ++iter) { iter->available = false; } - + for (iter = _midi_outputs.begin (); iter != _midi_outputs.end (); ++iter) { iter->available = false; } - + // update midi input ports std::vector<std::string> phys_midi_inputs; backend->get_physical_inputs (DataType::MIDI, phys_midi_inputs); - + std::vector<std::string>::const_iterator midi_input_iter = phys_midi_inputs.begin (); for (; midi_input_iter != phys_midi_inputs.end (); ++midi_input_iter) { - + MidiPortState state (*midi_input_iter); state.active = false; state.available = true; MidiPortStateList::iterator found_state_iter = std::find (_midi_inputs.begin (), _midi_inputs.end (), state); - + if (found_state_iter != _midi_inputs.end ()) { found_state_iter->available = true; } else { _midi_inputs.push_back (state); } } - + // update midi output ports std::vector<std::string> phys_midi_outputs; backend->get_physical_outputs (DataType::MIDI, phys_midi_outputs); - + std::vector<std::string>::const_iterator midi_output_iter = phys_midi_outputs.begin (); for (; midi_output_iter != phys_midi_outputs.end (); ++midi_output_iter) { - + MidiPortState state (*midi_output_iter); state.active = false; state.available = true; MidiPortStateList::iterator found_state_iter = std::find (_midi_outputs.begin (), _midi_outputs.end (), state); - + if (found_state_iter != _midi_outputs.end ()) { found_state_iter->available = true; } else { @@ -1678,7 +1678,7 @@ EngineStateController::_refresh_stereo_out_channel_states () break; } } - + uint32_t pending_active_channels = 2; PortStateList::iterator iter = output_states.begin (); // if found active @@ -1687,7 +1687,7 @@ EngineStateController::_refresh_stereo_out_channel_states () if (++iter == output_states.end ()) { iter = output_states.begin (); } - + (iter++)->active = true; pending_active_channels = 0; } @@ -1709,7 +1709,7 @@ EngineStateController::_on_engine_running () { AudioEngine::instance ()->reconnect_session_routes (true, true); _current_state->active = true; - + EngineRunning (); // emit a signal } @@ -1742,7 +1742,7 @@ void EngineStateController::_on_parameter_changed (const std::string& parameter_name) { if (parameter_name == "output-auto-connect") { - + AudioEngine::instance ()->reconnect_session_routes (false, true); OutputConfigChanged (); // emit a signal OutputConnectionModeChanged (); // emit signal @@ -1754,24 +1754,24 @@ void EngineStateController::_on_ports_registration_update () { _update_device_channels_state (); - + // update MIDI connections if (_session) { _session->reconnect_midi_scene_ports (true); _session->reconnect_midi_scene_ports (false); - + _session->reconnect_mtc_ports (); - + _session->reconnect_mmc_ports (true); _session->reconnect_mmc_ports (false); - + _session->reconnect_ltc_input (); _session->reconnect_ltc_output (); } - + _update_ltc_source_port (); _update_ltc_output_port (); - + PortRegistrationChanged (); // emit a signal } @@ -1784,19 +1784,19 @@ EngineStateController::push_current_state_to_backend (bool start) if (!backend) { return false; } - + // check if anything changed bool state_changed = (_current_state->device_name != backend->device_name ()) || (_current_state->sample_rate != backend->sample_rate ()) || (_current_state->buffer_size != backend->buffer_size ()); - + bool was_running = AudioEngine::instance ()->running (); - + Glib::Threads::RecMutex::Lock sl (AudioEngine::instance ()->state_lock ()); if (state_changed) { if (was_running) { - + if (_current_state->device_name != backend->device_name ()) { // device has been changed // the list of ports has been changed too @@ -1804,7 +1804,7 @@ EngineStateController::push_current_state_to_backend (bool start) set_ltc_source_port (""); set_ltc_output_port (""); } - + if (AudioEngine::instance ()->stop ()) { return false; } @@ -1816,7 +1816,7 @@ EngineStateController::push_current_state_to_backend (bool start) if ((_current_state->device_name != backend->device_name ()) && (result = backend->set_device_name (_current_state->device_name))) { error << string_compose (_("Cannot set device name to %1"), get_current_device_name ()) << endmsg; } - + if (!result ) { std::cout << "EngineStateController::Setting device sample rate " << _current_state->sample_rate << std::endl; result = backend->set_sample_rate (_current_state->sample_rate); @@ -1825,7 +1825,7 @@ EngineStateController::push_current_state_to_backend (bool start) error << string_compose (_("Cannot set sample rate to %1"), get_current_sample_rate ()) << endmsg; } } - + if (!result ) { std::cout << "EngineStateController::Setting device buffer size " << _current_state->buffer_size << std::endl; result = backend->set_buffer_size (_current_state->buffer_size); @@ -1835,7 +1835,7 @@ EngineStateController::push_current_state_to_backend (bool start) } } } - + if (result) // error during device setup { //switch to None device and notify about the issue @@ -1850,7 +1850,7 @@ EngineStateController::push_current_state_to_backend (bool start) return true; } } - + if (start || (was_running && state_changed)) { if (AudioEngine::instance ()->start () && !AudioEngine::instance ()->is_reset_requested ()) { //switch to None device and notify about the issue @@ -1861,9 +1861,9 @@ EngineStateController::push_current_state_to_backend (bool start) return false; } } - + save_audio_midi_settings (); - + return true; } @@ -1877,7 +1877,7 @@ EngineStateController::get_mtc_source_port () return (state_iter->name); } } - + return ""; } diff --git a/libs/ardour/enums.cc b/libs/ardour/enums.cc index d436200222..f6044aeb08 100644 --- a/libs/ardour/enums.cc +++ b/libs/ardour/enums.cc @@ -298,7 +298,7 @@ setup_enum_writer () REGISTER (_RemoteModel); /* * EditorOrdered has been deprecated - * since the removal of independent + * since the removal of independent * editor / mixer ordering. */ enum_writer.add_to_hack_table ("EditorOrdered", "MixerOrdered"); @@ -326,7 +326,7 @@ setup_enum_writer () REGISTER_ENUM (UseDefaultNames); REGISTER_ENUM (NameAfterDriver); REGISTER_BITS (_TracksAutoNamingRule); - + REGISTER_ENUM (FormatFloat); REGISTER_ENUM (FormatInt24); REGISTER_ENUM (FormatInt16); diff --git a/libs/ardour/export_channel.cc b/libs/ardour/export_channel.cc index 9362171738..2ccaf1ae33 100644 --- a/libs/ardour/export_channel.cc +++ b/libs/ardour/export_channel.cc @@ -113,7 +113,7 @@ PortExportChannel::set_state (XMLNode * node, Session & session) } } -RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type) +RegionExportChannelFactory::RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type) : region (region) , track (track) , type (type) diff --git a/libs/ardour/export_graph_builder.cc b/libs/ardour/export_graph_builder.cc index be183c7270..8ef69f2472 100644 --- a/libs/ardour/export_graph_builder.cc +++ b/libs/ardour/export_graph_builder.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2012 Paul Davis + Copyright (C) 2008-2012 Paul Davis Author: Sakari Bergen This program is free software; you can redistribute it and/or modify @@ -116,13 +116,13 @@ void ExportGraphBuilder::cleanup (bool remove_out_files/*=false*/) { ChannelConfigList::iterator iter = channel_configs.begin(); - + while (iter != channel_configs.end() ) { iter->remove_children(remove_out_files); iter = channel_configs.erase(iter); } } - + void ExportGraphBuilder::set_current_timespan (boost::shared_ptr<ExportTimespan> span) { @@ -186,7 +186,7 @@ ExportGraphBuilder::add_split_config (FileSpec const & config) // No duplicate channel config found, create new one channel_configs.push_back (new ChannelConfig (*this, config, channels)); } - + /* Encoder */ template <> @@ -221,20 +221,20 @@ ExportGraphBuilder::Encoder::add_child (FileSpec const & new_config) { filenames.push_back (new_config.filename); } - + void ExportGraphBuilder::Encoder::destroy_writer (bool delete_out_file) { if (delete_out_file ) { - + if (float_writer) { float_writer->close (); } - + if (int_writer) { int_writer->close (); } - + if (short_writer) { short_writer->close (); } @@ -243,7 +243,7 @@ ExportGraphBuilder::Encoder::destroy_writer (bool delete_out_file) std::cout << "Encoder::destroy_writer () : Error removing file: " << strerror(errno) << std::endl; } } - + float_writer.reset (); int_writer.reset (); short_writer.reset (); @@ -348,16 +348,16 @@ void ExportGraphBuilder::SFC::remove_children (bool remove_out_files) { boost::ptr_list<Encoder>::iterator iter = children.begin (); - + while (iter != children.end() ) { - + if (remove_out_files) { iter->destroy_writer(remove_out_files); } iter = children.erase (iter); } } - + bool ExportGraphBuilder::SFC::operator== (FileSpec const & other_config) const { @@ -421,13 +421,13 @@ void ExportGraphBuilder::Normalizer::remove_children (bool remove_out_files) { boost::ptr_list<SFC>::iterator iter = children.begin (); - + while (iter != children.end() ) { iter->remove_children (remove_out_files); iter = children.erase (iter); } } - + bool ExportGraphBuilder::Normalizer::operator== (FileSpec const & other_config) const { @@ -487,20 +487,20 @@ ExportGraphBuilder::SRC::add_child (FileSpec const & new_config) add_child_to_list (new_config, children); } } - + void ExportGraphBuilder::SRC::remove_children (bool remove_out_files) { boost::ptr_list<SFC>::iterator sfc_iter = children.begin(); - + while (sfc_iter != children.end() ) { converter->remove_output (sfc_iter->sink() ); sfc_iter->remove_children (remove_out_files); sfc_iter = children.erase (sfc_iter); } - + boost::ptr_list<Normalizer>::iterator norm_iter = normalized_children.begin(); - + while (norm_iter != normalized_children.end() ) { converter->remove_output (norm_iter->sink() ); norm_iter->remove_children (remove_out_files); @@ -570,12 +570,12 @@ ExportGraphBuilder::SilenceHandler::add_child (FileSpec const & new_config) children.push_back (new SRC (parent, new_config, max_frames_in)); silence_trimmer->add_output (children.back().sink()); } - + void ExportGraphBuilder::SilenceHandler::remove_children (bool remove_out_files) { boost::ptr_list<SRC>::iterator iter = children.begin(); - + while (iter != children.end() ) { silence_trimmer->remove_output (iter->sink() ); iter->remove_children (remove_out_files); @@ -647,14 +647,14 @@ ExportGraphBuilder::ChannelConfig::add_child (FileSpec const & new_config) children.push_back (new SilenceHandler (parent, new_config, max_frames_out)); chunker->add_output (children.back().sink ()); } - + void ExportGraphBuilder::ChannelConfig::remove_children (bool remove_out_files) { boost::ptr_list<SilenceHandler>::iterator iter = children.begin(); - + while(iter != children.end() ) { - + chunker->remove_output (iter->sink ()); iter->remove_children (remove_out_files); iter = children.erase(iter); diff --git a/libs/ardour/export_handler.cc b/libs/ardour/export_handler.cc index 0def821ef6..16aee32a3c 100644 --- a/libs/ardour/export_handler.cc +++ b/libs/ardour/export_handler.cc @@ -565,7 +565,7 @@ ExportHandler::write_cue_header (CDMarkerStatus & status) MOTOROLA = "header-less" audio (44.1 kHz, 16 Bit, big endian), and MP3 - We try to use these file types whenever appropriate and + We try to use these file types whenever appropriate and default to our own names otherwise. */ status.out << "FILE \"" << Glib::path_get_basename(status.filename) << "\" "; @@ -860,7 +860,7 @@ ExportHandler::cue_escape_cdtext (const std::string& txt) } // does not do much mor than UTF-8 to Latin1 translation yet, but - // that may have to change if cue parsers in burning programs change + // that may have to change if cue parsers in burning programs change out = '"' + latin1_txt + '"'; return out; diff --git a/libs/ardour/export_multiplication.cc b/libs/ardour/export_multiplication.cc index 46ebcec400..13b7a4a005 100644 --- a/libs/ardour/export_multiplication.cc +++ b/libs/ardour/export_multiplication.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2008-2012 Paul Davis + Copyright (C) 2008-2012 Paul Davis Author: Sakari Bergen This program is free software; you can redistribute it and/or modify diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index 43763cf2f9..f5c241eaf8 100644 --- a/libs/ardour/file_source.cc +++ b/libs/ardour/file_source.cc @@ -319,7 +319,7 @@ FileSource::find (Session& s, DataType type, const string& path, bool must_exist keeppath = de_duped_hits[0]; } - + } else { keeppath = path; } @@ -590,7 +590,7 @@ FileSource::rename (const string& newpath) return -1; } - if (Glib::file_test (oldpath.c_str(), Glib::FILE_TEST_EXISTS)) { + if (Glib::file_test (oldpath.c_str(), Glib::FILE_TEST_EXISTS)) { /* rename only needed if file exists on disk */ if (::rename (oldpath.c_str(), newpath.c_str()) != 0) { error << string_compose (_("cannot rename file %1 to %2 (%3)"), oldpath, newpath, strerror(errno)) << endmsg; diff --git a/libs/ardour/filename_extensions.cc b/libs/ardour/filename_extensions.cc index 352e830000..fa6ca07fde 100644 --- a/libs/ardour/filename_extensions.cc +++ b/libs/ardour/filename_extensions.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/filesystem_paths.cc b/libs/ardour/filesystem_paths.cc index daa762fa8a..c5cd864590 100644 --- a/libs/ardour/filesystem_paths.cc +++ b/libs/ardour/filesystem_paths.cc @@ -50,7 +50,7 @@ user_config_directory_name (int version = -1) } /* ARDOUR::Profile may not be available when this is - called, so rely on build-time detection of the + called, so rely on build-time detection of the product name etc. */ diff --git a/libs/ardour/find_session.cc b/libs/ardour/find_session.cc index e6ab2b1e24..81ffd9deb1 100644 --- a/libs/ardour/find_session.cc +++ b/libs/ardour/find_session.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 09043430a3..5ef66c10c2 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -62,7 +62,7 @@ #ifdef check #undef check /* stupid Apple and their un-namespaced, generic Carbon macros */ -#endif +#endif #include <glibmm/fileutils.h> #include <glibmm/miscutils.h> @@ -502,7 +502,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir how many more per-thread buffer sets we need above the h/w concurrency, but its definitely > 1 more. */ - BufferManager::init (hardware_concurrency() + 4); + BufferManager::init (hardware_concurrency() + 4); PannerManager::instance().discover_panners(); @@ -511,7 +511,7 @@ ARDOUR::init (bool use_windows_vst, bool try_optimization, const char* localedir /* it is unfortunate that we need to include reserved names here that refer to control surfaces. But there's no way to ensure a complete lack of collisions without doing this, since the control surface - support may not even be active. Without adding an API to control + support may not even be active. Without adding an API to control surface support that would list their port names, we do have to list them here. */ @@ -550,7 +550,7 @@ ARDOUR::init_post_engine () } void -ARDOUR::cleanup () +ARDOUR::cleanup () { if (!libardour_initialized) { return; @@ -752,7 +752,7 @@ ARDOUR::get_available_sync_options () #include <mach/mach_time.h> #define CLOCK_REALTIME 0 #define CLOCK_MONOTONIC 0 -int +int clock_gettime (int /*clk_id*/, struct timespec *t) { static bool initialized = false; @@ -770,7 +770,7 @@ clock_gettime (int /*clk_id*/, struct timespec *t) return 0; } #endif - + microseconds_t ARDOUR::get_microseconds () { diff --git a/libs/ardour/instrument_info.cc b/libs/ardour/instrument_info.cc index d64554f458..c2055e207e 100644 --- a/libs/ardour/instrument_info.cc +++ b/libs/ardour/instrument_info.cc @@ -90,7 +90,7 @@ InstrumentInfo::get_patch_name (uint16_t bank, uint8_t program, uint8_t channel) MIDI::Name::PatchPrimaryKey patch_key (program, bank); boost::shared_ptr<MIDI::Name::Patch> patch = - MIDI::Name::MidiPatchManager::instance().find_patch (external_instrument_model, + MIDI::Name::MidiPatchManager::instance().find_patch (external_instrument_model, external_instrument_mode, channel, patch_key); if (patch) { @@ -209,7 +209,7 @@ InstrumentInfo::general_midi_patches() { if (_gm_patches.empty()) { for (int n = 0; n < 128; n++) { - _gm_patches.push_back (boost::shared_ptr<Patch> (new Patch (general_midi_program_names[n], n))); + _gm_patches.push_back (boost::shared_ptr<Patch> (new Patch (general_midi_program_names[n], n))); } } diff --git a/libs/ardour/interpolation.cc b/libs/ardour/interpolation.cc index 3b21fe1718..286030c26d 100644 --- a/libs/ardour/interpolation.cc +++ b/libs/ardour/interpolation.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/linux_vst_support.cc b/libs/ardour/linux_vst_support.cc index f873917ca9..7918f34449 100644 --- a/libs/ardour/linux_vst_support.cc +++ b/libs/ardour/linux_vst_support.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 @@ -118,7 +118,7 @@ void* vstfx_load_vst_library(const char* path) size_t len1; size_t len2; - /*Try and load the shared library pointed to by the path - + /*Try and load the shared library pointed to by the path - NOTE: You have to give RTLD_LAZY or RTLD_NOW to dlopen or you get some occasional failures to load - dlerror reports invalid arguments*/ @@ -311,7 +311,7 @@ vstfx_instantiate (VSTHandle* fhandle, audioMasterCallback amc, void* userptr) return 0; } - if ((vstfx->plugin = fhandle->main_entry (amc)) == 0) + if ((vstfx->plugin = fhandle->main_entry (amc)) == 0) { vstfx_error ("** ERROR ** VSTFX : %s could not be instantiated :(\n", fhandle->name); free (vstfx); @@ -362,7 +362,7 @@ void vstfx_close (VSTState* vstfx) if (vstfx->handle->plugincnt) vstfx->handle->plugincnt--; - /*vstfx_unload will unload the dll if the instance count allows - + /*vstfx_unload will unload the dll if the instance count allows - we need to do this because some plugins keep their own instance count and (JUCE) manages the plugin UI in its own thread. When the plugins internal instance count reaches zero, JUCE stops the UI thread and won't @@ -388,7 +388,7 @@ void vstfx_close (VSTState* vstfx) } -bool +bool vstfx_save_state (VSTState* vstfx, char * filename) { FILE* f = g_fopen (filename, "wb"); @@ -476,7 +476,7 @@ vstfx_save_state (VSTState* vstfx, char * filename) //g_free( encoded ); } } - } + } fprintf( f, "</plugin_state>\n" ); fclose( f ); @@ -491,7 +491,7 @@ vstfx_save_state (VSTState* vstfx, char * filename) /*Set up a call to the plugins 'dispatcher' function*/ -int vstfx_call_dispatcher (VSTState* vstfx, int opcode, int index, int val, void *ptr, float opt) +int vstfx_call_dispatcher (VSTState* vstfx, int opcode, int index, int val, void *ptr, float opt) { pthread_mutex_lock (&vstfx->lock); diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index 4482876973..685cd6dd94 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -168,8 +168,8 @@ Location::operator= (const Location& other) void Location::set_name (const std::string& str) -{ - _name = str; +{ + _name = str; name_changed (this); /* EMIT SIGNAL */ NameChanged (); /* EMIT SIGNAL */ @@ -358,7 +358,7 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) if (e - s < Config->get_range_location_minimum()) { return -1; } - + if (s != _start) { framepos_t const old = _start; @@ -369,23 +369,23 @@ Location::set (framepos_t s, framepos_t e, bool allow_bbt_recompute) } start_change = true; - + if (is_session_range ()) { Session::StartTimeChanged (old); /* EMIT SIGNAL */ AudioFileSource::set_header_position_offset (s); } } - - + + if (e != _end) { - + framepos_t const old = _end; _end = e; if (allow_bbt_recompute) { recompute_bbt_from_frames (); } - + end_change = true; if (is_session_range()) { @@ -763,7 +763,7 @@ Location::set_scene_change (boost::shared_ptr<SceneChange> sc) if (_scene_change != sc) { _scene_change = sc; _session.set_dirty (); - + scene_changed (); /* EMIT SIGNAL */ SceneChangeChanged (); /* EMIT SIGNAL */ } @@ -819,7 +819,7 @@ Locations::next_available_name(string& result,string base) l = base.length(); if (!base.empty()) { - + /* find all existing names that match "base", and store the numeric part of them (if any) in the map "taken" */ @@ -827,7 +827,7 @@ Locations::next_available_name(string& result,string base) for (i = locations.begin(); i != locations.end(); ++i) { const string& temp ((*i)->name()); - + if (!temp.find (base,0)) { /* grab what comes after the "base" as if it was a number, and assuming that works OK, @@ -846,12 +846,12 @@ Locations::next_available_name(string& result,string base) was deleted. This must start at 1, both for human-numbering reasons - and also because the call to atoi() above would return + and also because the call to atoi() above would return zero if there is no recognizable numeric suffix, causing "base 0" not to be inserted into the "taken" map. */ - n = 1; + n = 1; while (n < UINT32_MAX) { if (taken.find (n) == taken.end()) { @@ -861,7 +861,7 @@ Locations::next_available_name(string& result,string base) } ++n; } - + return 0; } @@ -922,7 +922,7 @@ Locations::clear_markers () i = tmp; } } - + changed (); /* EMIT SIGNAL */ } @@ -1022,7 +1022,7 @@ Locations::remove (Location *loc) if (was_removed) { removed (loc); /* EMIT SIGNAL */ - + if (was_current) { current_changed (0); /* EMIT SIGNAL */ } @@ -1085,7 +1085,7 @@ Locations::set_state (const XMLNode& node, int version) if (i != locations.end()) { /* we can re-use an old Location object */ loc = *i; - + // changed locations will be updated by Locations::changed signal loc->set_state (**niter, version); } else { @@ -1234,7 +1234,7 @@ Locations::mark_at (framepos_t pos, framecnt_t slop) const for (LocationList::const_iterator i = locations.begin(); i != locations.end(); ++i) { if ((*i)->is_mark()) { - if (pos > (*i)->start()) { + if (pos > (*i)->start()) { delta = pos - (*i)->start(); } else { delta = (*i)->start() - pos; diff --git a/libs/ardour/lxvst_plugin.cc b/libs/ardour/lxvst_plugin.cc index c3074d65ad..4bf6fca914 100644 --- a/libs/ardour/lxvst_plugin.cc +++ b/libs/ardour/lxvst_plugin.cc @@ -62,7 +62,7 @@ LXVSTPlugin::~LXVSTPlugin () vstfx_close (_state); } -PluginPtr +PluginPtr LXVSTPluginInfo::load (Session& session) { try { diff --git a/libs/ardour/midi_buffer.cc b/libs/ardour/midi_buffer.cc index 50ff7b728f..b735fe74fb 100644 --- a/libs/ardour/midi_buffer.cc +++ b/libs/ardour/midi_buffer.cc @@ -178,7 +178,7 @@ MidiBuffer::push_back(TimeType time, size_t size, const uint8_t* data) #endif if (_size + stamp_size + size >= _capacity) { - cerr << "MidiBuffer::push_back2 failed (buffer is full; _size = " << _size << " capacity " + cerr << "MidiBuffer::push_back2 failed (buffer is full; _size = " << _size << " capacity " << _capacity << " stamp " << stamp_size << " size = " << size << ")" << endl; PBD::stacktrace (cerr, 20); return false; @@ -304,9 +304,9 @@ MidiBuffer::second_simultaneous_midi_byte_is_first (uint8_t a, uint8_t b) /* two events at identical times. we need to determine the order in which they should occur. - + the rule is: - + Controller messages Program Change Note Off @@ -474,7 +474,7 @@ MidiBuffer::merge_in_place (const MidiBuffer &other) * if "sz" is non-zero, there is data to be merged from "other" * into this buffer before we do anything else, corresponding * to the events from "other" that we skipped while advancing - * "them". + * "them". */ if (bytes_to_merge) { @@ -488,7 +488,7 @@ MidiBuffer::merge_in_place (const MidiBuffer &other) memcpy (_data + us.offset, other._data + merge_offset, bytes_to_merge); /* update iterator to our own events. this is a miserable hack */ us.offset += bytes_to_merge; - } + } /* if we're at the end of the other buffer, we're done */ @@ -502,7 +502,7 @@ MidiBuffer::merge_in_place (const MidiBuffer &other) if ((*us).time() == (*them).time()) { - DEBUG_TRACE (DEBUG::MidiIO, + DEBUG_TRACE (DEBUG::MidiIO, string_compose ("simultaneous MIDI events discovered during merge, times %1/%2 status %3/%4\n", (*us).time(), (*them).time(), (int) *(_data + us.offset + sizeof (TimeType)), @@ -539,7 +539,7 @@ MidiBuffer::merge_in_place (const MidiBuffer &other) if (them_first) { /* need to skip the event pointed to by 'us' since its at the same time as 'them' - (still), and we'll enter + (still), and we'll enter */ if (us != end()) { @@ -576,7 +576,7 @@ MidiBuffer::merge_in_place (const MidiBuffer &other) _size += other._size - them.offset; assert(_size <= _capacity); break; - } + } } return true; diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 229c0ad768..c2da230701 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -857,8 +857,8 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush) const framecnt_t total = g_atomic_int_get(const_cast<gint*> (&_frames_pending_write)); - if (total == 0 || - _capture_buf->read_space() == 0 || + if (total == 0 || + _capture_buf->read_space() == 0 || (!force_flush && (total < disk_write_chunk_frames) && was_recording)) { goto out; } @@ -890,7 +890,7 @@ MidiDiskstream::do_flush (RunContext /*context*/, bool force_flush) if (_write_source->midi_write (lm, *_capture_buf, get_capture_start_frame (0), to_write) != to_write) { error << string_compose(_("MidiDiskstream %1: cannot write to disk"), id()) << endmsg; return -1; - } + } g_atomic_int_add(const_cast<gint*> (&_frames_pending_write), -to_write); } @@ -1385,7 +1385,7 @@ float MidiDiskstream::playback_buffer_load () const { /* For MIDI it's not trivial to differentiate the following two cases: - + 1. The playback buffer is empty because the system has run out of time to fill it. 2. The playback buffer is empty because there is no more data on the playlist. @@ -1430,7 +1430,7 @@ MidiDiskstream::get_playback (MidiBuffer& dst, framecnt_t nframes) DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ( "%1 MDS pre-read read %8 @ %4..%5 from %2 write to %3, LOOPED ? %6-%7\n", _name, - _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr(), playback_sample, playback_sample + nframes, + _playback_buf->get_read_ptr(), _playback_buf->get_write_ptr(), playback_sample, playback_sample + nframes, (loc ? loc->start() : -1), (loc ? loc->end() : -1), nframes)); // cerr << "================\n"; @@ -1477,14 +1477,14 @@ MidiDiskstream::get_playback (MidiBuffer& dst, framecnt_t nframes) DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("loop read #1, from %1 for %2\n", effective_start, first)); events_read = _playback_buf->read (dst, effective_start, first); - } + } if (second) { DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("loop read #2, from %1 for %2\n", loc->start(), second)); events_read += _playback_buf->read (dst, loc->start(), second); } - + } else { DEBUG_TRACE (DEBUG::MidiDiskstreamIO, string_compose ("loop read #3, adjusted start as %1 for %2\n", effective_start, nframes)); diff --git a/libs/ardour/midi_model.cc b/libs/ardour/midi_model.cc index 3d53abaae5..27fb61b11d 100644 --- a/libs/ardour/midi_model.cc +++ b/libs/ardour/midi_model.cc @@ -1289,7 +1289,7 @@ MidiModel::PatchChangeDiffCommand::unmarshal_change (XMLNode* n) assert (prop); Evoral::event_id_t const id = atoi (prop->value().c_str()); - /* we need to load via an int intermediate for all properties that are + /* we need to load via an int intermediate for all properties that are actually uint8_t (char/byte). */ diff --git a/libs/ardour/midi_patch_manager.cc b/libs/ardour/midi_patch_manager.cc index e0638f035e..93f0b7e235 100644 --- a/libs/ardour/midi_patch_manager.cc +++ b/libs/ardour/midi_patch_manager.cc @@ -135,7 +135,7 @@ MidiPatchManager::refresh() << endmsg; continue; } - + _documents[device->first] = document; _master_devices_by_model[device->first] = device->second; diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc index f7a0d0fadb..85d5c95a5f 100644 --- a/libs/ardour/midi_port.cc +++ b/libs/ardour/midi_port.cc @@ -133,7 +133,7 @@ MidiPort::get_midi_buffer (pframes_t nframes) << _global_port_buffer_offset << " limit=" << (_global_port_buffer_offset + _port_buffer_offset + nframes) << "\n"; } - } + } } else { _buffer->silence (nframes); @@ -198,7 +198,7 @@ MidiPort::flush_buffers (pframes_t nframes) /* resolve all notes at the start of the buffer */ resolve_notes (port_buffer, 0); _resolve_required = false; - } + } if (_buffer->empty()) { return; @@ -263,7 +263,7 @@ MidiPort::flush_buffers (pframes_t nframes) } } - /* done.. the data has moved to the port buffer, mark it so + /* done.. the data has moved to the port buffer, mark it so */ _buffer->clear (); diff --git a/libs/ardour/midi_ring_buffer.cc b/libs/ardour/midi_ring_buffer.cc index 3923e5306a..7c72718b69 100644 --- a/libs/ardour/midi_ring_buffer.cc +++ b/libs/ardour/midi_ring_buffer.cc @@ -83,7 +83,7 @@ MidiRingBuffer<T>::read(MidiBuffer& dst, framepos_t start, framepos_t end, frame this->increment_read_ptr (prefix_size); uint8_t status; - bool r = this->peek (&status, sizeof(uint8_t)); + bool r = this->peek (&status, sizeof(uint8_t)); assert (r); // If this failed, buffer is corrupt, all hope is lost /* lets see if we are going to be able to write this event into dst. diff --git a/libs/ardour/midi_scene_change.cc b/libs/ardour/midi_scene_change.cc index c10ca74904..91f2dd4d7c 100644 --- a/libs/ardour/midi_scene_change.cc +++ b/libs/ardour/midi_scene_change.cc @@ -174,5 +174,5 @@ MIDISceneChange::set_bank (int bank) { _bank = bank; } - + diff --git a/libs/ardour/midi_scene_changer.cc b/libs/ardour/midi_scene_changer.cc index 75d5581ce5..da6fe88331 100644 --- a/libs/ardour/midi_scene_changer.cc +++ b/libs/ardour/midi_scene_changer.cc @@ -41,7 +41,7 @@ MIDISceneChanger::MIDISceneChanger (Session& s) , last_program_message_time (-1) , last_delivered_program (-1) , last_delivered_bank (-1) - + { /* catch any add/remove/clear etc. for all Locations */ _session.locations()->changed.connect_same_thread (*this, boost::bind (&MIDISceneChanger::locations_changed, this)); @@ -63,7 +63,7 @@ MIDISceneChanger::locations_changed () } /** Use the session's list of locations to collect all patch changes. - * + * * This is called whenever the locations change in anyway. */ void @@ -137,7 +137,7 @@ MIDISceneChanger::non_rt_deliver (boost::shared_ptr<MIDISceneChange> msc) non-RT/process context. Using zero means "deliver them as early as possible" (practically speaking, in the next process callback). */ - + MIDIOutputActivity (); /* EMIT SIGNAL */ if ((cnt = msc->get_bank_msb_message (buf, sizeof (buf))) > 0) { @@ -259,7 +259,7 @@ MIDISceneChanger::set_recording (bool yn) } bool -MIDISceneChanger::recording() const +MIDISceneChanger::recording() const { return _session.transport_rolling() && _session.get_record_enabled(); } @@ -283,12 +283,12 @@ MIDISceneChanger::program_change_input (MIDI::Parser& parser, MIDI::byte program if (!recording()) { MIDIInputActivity (); /* EMIT SIGNAL */ - + int bank = -1; if (have_seen_bank_changes) { bank = input_port->channel (channel)->bank(); } - + jump_to (bank, program); return; } diff --git a/libs/ardour/midi_state_tracker.cc b/libs/ardour/midi_state_tracker.cc index 9e96c4954f..3a801901cb 100644 --- a/libs/ardour/midi_state_tracker.cc +++ b/libs/ardour/midi_state_tracker.cc @@ -79,7 +79,7 @@ MidiStateTracker::remove (uint8_t note, uint8_t chn) } DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1 OFF %2/%3 current voices = %5 total on %4\n", - this, (int) note, (int) chn, _on, + this, (int) note, (int) chn, _on, (int) _active_notes[note+128 * chn])); } @@ -129,7 +129,7 @@ MidiStateTracker::resolve_notes (MidiBuffer &dst, framepos_t time) */ dst.push_back (noteoff); _active_notes[note + 128 * channel]--; - DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: MB-resolved note %2/%3 at %4\n", + DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: MB-resolved note %2/%3 at %4\n", this, (int) note, (int) channel, time)); } } @@ -159,7 +159,7 @@ MidiStateTracker::resolve_notes (Evoral::EventSink<framepos_t> &dst, framepos_t */ dst.write (time, midi_parameter_type (buf[0]), 3, buf); _active_notes[note + 128 * channel]--; - DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: EVS-resolved note %2/%3 at %4\n", + DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: EVS-resolved note %2/%3 at %4\n", this, (int) note, (int) channel, time)); } } @@ -187,7 +187,7 @@ MidiStateTracker::resolve_notes (MidiSource& src, const MidiSource::Lock& lock, ev.set_note (note); ev.set_velocity (0); src.append_event_beats (lock, ev); - DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: MS-resolved note %2/%3 at %4\n", + DEBUG_TRACE (PBD::DEBUG::MidiTrackers, string_compose ("%1: MS-resolved note %2/%3 at %4\n", this, (int) note, (int) channel, time)); _active_notes[note + 128 * channel]--; /* don't stack events up at the same time */ diff --git a/libs/ardour/midi_track.cc b/libs/ardour/midi_track.cc index fc1ab21b53..e0b2f4e225 100644 --- a/libs/ardour/midi_track.cc +++ b/libs/ardour/midi_track.cc @@ -430,7 +430,7 @@ MidiTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_frame diskstream->flush_playback (start_frame, end_frame); - } + } /* append immediate messages to the first MIDI buffer (thus sending it to the first output port) */ @@ -965,7 +965,7 @@ MidiTrack::monitoring_state () const MonitorState ms = Track::monitoring_state(); if (ms == MonitoringSilence) { return MonitoringInput; - } + } return ms; } diff --git a/libs/ardour/midiport_manager.cc b/libs/ardour/midiport_manager.cc index b1699ca5ab..fe6a534f24 100644 --- a/libs/ardour/midiport_manager.cc +++ b/libs/ardour/midiport_manager.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 1998-99 Paul Barton-Davis + Copyright (C) 1998-99 Paul Barton-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 @@ -73,7 +73,7 @@ MidiPortManager::create_ports () if (_midi_in) { return; } - + _midi_in = AudioEngine::instance()->register_input_port (DataType::MIDI, X_("MIDI control in"), true); _midi_out = AudioEngine::instance()->register_output_port (DataType::MIDI, X_("MIDI control out"), true); @@ -86,9 +86,9 @@ MidiPortManager::create_ports () /* XXX nasty type conversion needed because of the mixed inheritance * required to integrate MIDI::IPMidiPort and ARDOUR::AsyncMIDIPort. * - * At some point, we'll move IPMidiPort into Ardour and make it + * At some point, we'll move IPMidiPort into Ardour and make it * inherit from ARDOUR::MidiPort not MIDI::Port, and then this - * mess can go away + * mess can go away */ _midi_input_port = boost::dynamic_pointer_cast<AsyncMIDIPort>(_midi_in).get(); diff --git a/libs/ardour/monitor_processor.cc b/libs/ardour/monitor_processor.cc index 38ecc14e37..427e895f13 100644 --- a/libs/ardour/monitor_processor.cc +++ b/libs/ardour/monitor_processor.cc @@ -53,13 +53,13 @@ MonitorProcessor::MonitorProcessor (Session& s) , _dim_all_ptr (new MPControl<bool> (false, _("monitor dim"), Controllable::Toggle)) , _cut_all_ptr (new MPControl<bool> (false, _("monitor cut"), Controllable::Toggle)) , _mono_ptr (new MPControl<bool> (false, _("monitor mono"), Controllable::Toggle)) - , _dim_level_ptr (new MPControl<volatile gain_t> + , _dim_level_ptr (new MPControl<volatile gain_t> /* default is -12dB, range is -20dB to 0dB */ - (dB_to_coefficient(-12.0), _("monitor dim level"), Controllable::Flag (0), + (dB_to_coefficient(-12.0), _("monitor dim level"), Controllable::Flag (0), dB_to_coefficient(-20.0), dB_to_coefficient (0.0))) - , _solo_boost_level_ptr (new MPControl<volatile gain_t> + , _solo_boost_level_ptr (new MPControl<volatile gain_t> /* default is 0dB, range is 0dB to +20dB */ - (dB_to_coefficient(0.0), _("monitor solo boost level"), Controllable::Flag (0), + (dB_to_coefficient(0.0), _("monitor solo boost level"), Controllable::Flag (0), dB_to_coefficient(0.0), dB_to_coefficient(10.0))) , _dim_all_control (_dim_all_ptr) , _cut_all_control (_cut_all_ptr) diff --git a/libs/ardour/msvc/msvc_libardour.cc b/libs/ardour/msvc/msvc_libardour.cc index bd186728ea..2efcb4b937 100644 --- a/libs/ardour/msvc/msvc_libardour.cc +++ b/libs/ardour/msvc/msvc_libardour.cc @@ -83,7 +83,7 @@ namespace ARDOUR { LIBARDOUR_API int LIBARDOUR_APICALLTYPE symlink(const char *dest, const char *shortcut, const char *working_directory /*= NULL */) { -IShellLinkA *pISL = NULL; +IShellLinkA *pISL = NULL; IPersistFile *ppf = NULL; int ret = (-1); @@ -202,7 +202,7 @@ int ret = (-1); LIBARDOUR_API int LIBARDOUR_APICALLTYPE readlink(const char *__restrict shortcut, char *__restrict buf, size_t bufsize) { -IShellLinkA *pISL = NULL; +IShellLinkA *pISL = NULL; IPersistFile *ppf = NULL; int ret = (-1); @@ -237,7 +237,7 @@ int ret = (-1); // Read the target information from the shortcut object if (S_OK == (pISL->GetPath (target_path, _MAX_PATH, NULL, SLGP_UNCPRIORITY))) { - strncpy(buf, target_path, bufsize); + strncpy(buf, target_path, bufsize); ret = ((ret = strlen(buf)) > bufsize) ? bufsize : ret; // _set_errno(0); } diff --git a/libs/ardour/mtc_slave.cc b/libs/ardour/mtc_slave.cc index 83d61163c9..25aa93db9d 100644 --- a/libs/ardour/mtc_slave.cc +++ b/libs/ardour/mtc_slave.cc @@ -596,7 +596,7 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos) read_current (&last); DEBUG_TRACE (DEBUG::MTC, string_compose ("speed&pos: timestamp %1 speed %2 initstate %3 dir %4 tpos %5 now %6 last-in %7\n", - last.timestamp, + last.timestamp, last.speed, engine_dll_initstate, transport_direction, @@ -605,8 +605,8 @@ MTC_Slave::speed_and_position (double& speed, framepos_t& pos) last_inbound_frame)); /* re-init engine DLL here when state changed (direction, first_mtc_timestamp) */ - if (last.timestamp == 0) { - engine_dll_initstate = 0; + if (last.timestamp == 0) { + engine_dll_initstate = 0; } else if (engine_dll_initstate != transport_direction && last.speed != 0) { engine_dll_initstate = transport_direction; init_engine_dll(last.position, session.engine().samples_per_cycle()); diff --git a/libs/ardour/mtdm.cc b/libs/ardour/mtdm.cc index 940f0b8c25..fca9b63416 100644 --- a/libs/ardour/mtdm.cc +++ b/libs/ardour/mtdm.cc @@ -20,7 +20,7 @@ #include "ardour/mtdm.h" -MTDM::MTDM (int fsamp) +MTDM::MTDM (int fsamp) : _cnt (0) , _inv (0) { @@ -32,7 +32,7 @@ MTDM::MTDM (int fsamp) _freq [2].f = 3072; _freq [3].f = 2560; _freq [4].f = 2304; - _freq [5].f = 2176; + _freq [5].f = 2176; _freq [6].f = 1088; _freq [7].f = 1312; _freq [8].f = 1552; @@ -63,14 +63,14 @@ int MTDM::process (size_t len, float *ip, float *op) vip = *ip++; for (i = 0, F = _freq; i < 13; i++, F++) { - a = 2 * (float) M_PI * (F->p & 65535) / 65536.0; + a = 2 * (float) M_PI * (F->p & 65535) / 65536.0; F->p += F->f; - c = cosf (a); - s = -sinf (a); + c = cosf (a); + s = -sinf (a); vop += (i ? 0.01f : 0.20f) * s; F->xa += s * vip; F->ya += c * vip; - } + } *op++ = vop; if (++_cnt == 16) { @@ -113,10 +113,10 @@ int MTDM::resolve (void) k = (int)(floor (p + 0.5)); e = fabs (p - k); if (e > _err) _err = e; - if (e > 0.4) return 1; + if (e > 0.4) return 1; d += m * (k & 1); m *= 2; - } + } _del = 16 * d; return 0; diff --git a/libs/ardour/onset_detector.cc b/libs/ardour/onset_detector.cc index 7325f4a520..326c373df2 100644 --- a/libs/ardour/onset_detector.cc +++ b/libs/ardour/onset_detector.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/playlist.cc b/libs/ardour/playlist.cc index 868be8da19..3138df3b9d 100644 --- a/libs/ardour/playlist.cc +++ b/libs/ardour/playlist.cc @@ -1225,11 +1225,11 @@ Playlist::flush_notifications (bool from_undo) while (itimes--) { for (RegionList::iterator i = other->regions.begin(); i != other->regions.end(); ++i) { boost::shared_ptr<Region> copy_of_region = RegionFactory::create (*i, true); - + /* put these new regions on top of all existing ones, but preserve the ordering they had in the original playlist. */ - + add_region_internal (copy_of_region, (*i)->position() + pos); set_layer (copy_of_region, copy_of_region->layer() + top); } @@ -1423,7 +1423,7 @@ Playlist::flush_notifications (bool from_undo) if (_edit_mode == Splice) { splice_locked (at, distance, exclude); - } + } } void @@ -1522,7 +1522,7 @@ Playlist::core_ripple (framepos_t at, framecnt_t distance, RegionList *exclude) new_pos = 0; } else if (new_pos >= limit ) { new_pos = limit; - } + } (*i)->set_position (new_pos); } @@ -1650,7 +1650,7 @@ Playlist::region_bounds_changed (const PropertyChange& what_changed, boost::shar } mark_session_dirty (); - + return save; } diff --git a/libs/ardour/plugin_insert.cc b/libs/ardour/plugin_insert.cc index 855c3a610c..c568437234 100644 --- a/libs/ardour/plugin_insert.cc +++ b/libs/ardour/plugin_insert.cc @@ -272,11 +272,11 @@ PluginInsert::parameter_changed (uint32_t which, float val) if (ac) { ac->set_value (val); - + Plugins::iterator i = _plugins.begin(); - + /* don't set the first plugin, just all the slaves */ - + if (i != _plugins.end()) { ++i; for (; i != _plugins.end(); ++i) { @@ -1427,7 +1427,7 @@ PluginInsert::add_plugin (boost::shared_ptr<Plugin> plugin) plugin->set_insert_id (this->id()); if (_plugins.empty()) { - /* first (and probably only) plugin instance - connect to relevant signals + /* first (and probably only) plugin instance - connect to relevant signals */ plugin->ParameterChanged.connect_same_thread (*this, boost::bind (&PluginInsert::parameter_changed, this, _1, _2)); diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc index 677a9fba1e..3218550f99 100644 --- a/libs/ardour/port.cc +++ b/libs/ardour/port.cc @@ -119,7 +119,7 @@ Port::connected () const { if (_port_handle) { return (port_engine.connected (_port_handle) != 0); - } + } return false; } @@ -131,7 +131,7 @@ Port::disconnect_all () port_engine.disconnect_all (_port_handle); _connections.clear (); - /* a cheaper, less hacky way to do boost::shared_from_this() ... + /* a cheaper, less hacky way to do boost::shared_from_this() ... */ boost::shared_ptr<Port> pself = port_manager->get_port_by_name (name()); PostDisconnect (pself, boost::shared_ptr<Port>()); // emit signal @@ -147,7 +147,7 @@ bool Port::connected_to (std::string const & o) const { if (!_port_handle) { - return false; + return false; } if (!port_engine.available()) { @@ -217,7 +217,7 @@ Port::disconnect (std::string const & other) _connections.erase (other); } - /* a cheaper, less hacky way to do boost::shared_from_this() ... + /* a cheaper, less hacky way to do boost::shared_from_this() ... */ boost::shared_ptr<Port> pself = AudioEngine::instance()->get_port_by_name (name()); boost::shared_ptr<Port> pother = AudioEngine::instance()->get_port_by_name (other); @@ -227,7 +227,7 @@ Port::disconnect (std::string const & other) a check on whether this may affect anything that we need to know about. */ - PostDisconnect (pself, pother); // emit signal + PostDisconnect (pself, pother); // emit signal } return r; diff --git a/libs/ardour/port_manager.cc b/libs/ardour/port_manager.cc index 02e7719cc4..b43158ff0f 100644 --- a/libs/ardour/port_manager.cc +++ b/libs/ardour/port_manager.cc @@ -168,7 +168,7 @@ PortManager::get_physical_outputs (DataType type, std::vector<std::string>& s) } _backend->get_physical_outputs (type, s); } - + void PortManager::get_physical_inputs (DataType type, std::vector<std::string>& s) { @@ -178,7 +178,7 @@ PortManager::get_physical_inputs (DataType type, std::vector<std::string>& s) _backend->get_physical_inputs (type, s); } - + ChanCount PortManager::n_physical_outputs () const { @@ -188,7 +188,7 @@ PortManager::n_physical_outputs () const return _backend->n_physical_outputs (); } - + ChanCount PortManager::n_physical_inputs () const { @@ -210,7 +210,7 @@ PortManager::port_name_prefix_is_unique (const string& first_part_of_port_name) for (Ports::const_iterator x = pr->begin(); x != pr->end(); ++x) { - string prefix = x->first.substr (0, len); + string prefix = x->first.substr (0, len); if (strings_equal_ignore_case (prefix, first_part_of_port_name)) { return false; @@ -568,7 +568,7 @@ PortManager::can_request_input_monitoring () const return _backend->can_monitor_input (); } - + void PortManager::request_input_monitoring (const string& name, bool yn) const { @@ -582,7 +582,7 @@ PortManager::request_input_monitoring (const string& name, bool yn) const _backend->request_input_monitoring (ph, yn); } } - + void PortManager::ensure_input_monitoring (const string& name, bool yn) const { diff --git a/libs/ardour/quantize.cc b/libs/ardour/quantize.cc index bcce41c96d..cc5b3c53c2 100644 --- a/libs/ardour/quantize.cc +++ b/libs/ardour/quantize.cc @@ -69,7 +69,7 @@ swing_position (double pos, double grid, double swing, double offset) * if the start grid is 1.0, the beat at 0 isn't swung, * but the beat at 1.0 is. the beat at 2.0 isn't swung, * but the beat at 3.0 is. and so on. - * + * * so the criterion for a position being swung is * whether or not ((possible_grid_position / grid) % 2) != 0 */ @@ -131,7 +131,7 @@ Quantize::operator () (boost::shared_ptr<MidiModel> model, /* compute new start + end points WITHOUT the offset * caused by the start of the model (see above). - * + * * these versions of new_start and new_end are * guaranteed to precisely align with the quantize grid(s). */ diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 494457e043..550901f8fb 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -258,7 +258,7 @@ Route::set_remote_control_id (uint32_t id, bool notify_class_listeners) void Route::set_remote_control_id_internal (uint32_t id, bool notify_class_listeners) { - /* force IDs for master/monitor busses and prevent + /* force IDs for master/monitor busses and prevent any other route from accidentally getting these IDs (i.e. legacy sessions) */ @@ -277,7 +277,7 @@ Route::set_remote_control_id_internal (uint32_t id, bool notify_class_listeners) /* don't allow it to collide */ - if (!is_master () && !is_monitor() && + if (!is_master () && !is_monitor() && (id == MasterBusRemoteControlID || id == MonitorBusRemoteControlID)) { id += MonitorBusRemoteControlID; } @@ -297,7 +297,7 @@ Route::remote_control_id() const { if (is_master()) { return MasterBusRemoteControlID; - } + } if (is_monitor()) { return MonitorBusRemoteControlID; @@ -501,7 +501,7 @@ Route::process_output_buffers (BufferSet& bufs, on a transition between monitoring states we get a de-clicking gain change in the _main_outs delivery, if config.get_use_monitor_fades() is true. - + We override this in the case where we have an internal generator. */ bool silence = _have_internal_generator ? false : (monitoring_state () == MonitoringSilence); @@ -833,7 +833,7 @@ Route::set_solo (bool yn, void *src) return; } - DEBUG_TRACE (DEBUG::Solo, string_compose ("%1: set solo => %2, src: %3 grp ? %4 currently self-soloed ? %5\n", + DEBUG_TRACE (DEBUG::Solo, string_compose ("%1: set solo => %2, src: %3 grp ? %4 currently self-soloed ? %5\n", name(), yn, src, (src == _route_group), self_soloed())); if (self_soloed() != yn) { @@ -867,7 +867,7 @@ Route::mod_solo_by_others_upstream (int32_t delta) return; } - DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 mod solo-by-upstream by %2, current up = %3 down = %4\n", + DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 mod solo-by-upstream by %2, current up = %3 down = %4\n", name(), delta, _soloed_by_others_upstream, _soloed_by_others_downstream)); uint32_t old_sbu = _soloed_by_others_upstream; @@ -927,7 +927,7 @@ Route::mod_solo_by_others_downstream (int32_t delta) return; } - DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 mod solo-by-downstream by %2, current up = %3 down = %4\n", + DEBUG_TRACE (DEBUG::Solo, string_compose ("%1 mod solo-by-downstream by %2, current up = %3 down = %4\n", name(), delta, _soloed_by_others_upstream, _soloed_by_others_downstream)); if (delta < 0) { @@ -1702,7 +1702,7 @@ Route::remove_processor (boost::shared_ptr<Processor> processor, ProcessorStream if (!removed) { /* what? */ return 1; - } + } if (configure_processors_unlocked (err)) { pstate.restore (); @@ -1972,7 +1972,7 @@ Route::configure_processors_unlocked (ProcessorStreams* err) } /* make sure we have sufficient scratch buffers to cope with the new processor - configuration + configuration */ _session.ensure_buffers (n_process_buffers ()); @@ -2259,7 +2259,7 @@ Route::state(bool full_state) for (i = _processors.begin(); i != _processors.end(); ++i) { if (!full_state) { - /* template save: do not include internal sends functioning as + /* template save: do not include internal sends functioning as aux sends because the chance of the target ID in the session where this template is used is not very likely. @@ -3257,8 +3257,8 @@ Route::input_change_handler (IOChange change, void * /*src*/) bool need_to_queue_solo_change = true; if ((change.type & IOChange::ConfigurationChanged)) { - /* This is called with the process lock held if change - contains ConfigurationChanged + /* This is called with the process lock held if change + contains ConfigurationChanged */ need_to_queue_solo_change = false; configure_processors (0); @@ -3284,8 +3284,8 @@ Route::output_change_handler (IOChange change, void * /*src*/) } if ((change.type & IOChange::ConfigurationChanged)) { - /* This is called with the process lock held if change - contains ConfigurationChanged + /* This is called with the process lock held if change + contains ConfigurationChanged */ need_to_queue_solo_change = false; configure_processors (0); @@ -4389,7 +4389,7 @@ Route::setup_invisible_processors () /* we'll build this new list here and then use it * - * TODO put the ProcessorList is on the stack for RT-safety. + * TODO put the ProcessorList is on the stack for RT-safety. */ ProcessorList new_processors; @@ -4648,7 +4648,7 @@ Route::has_external_redirects () const /* ignore inactive processors and obviously ignore the main * outs since everything has them and we don't care. */ - + if ((*i)->active() && (*i) != _main_outs && (*i)->does_routing()) { return true;; } @@ -4708,8 +4708,8 @@ Route::fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr<IO> io, pfram size_t n_buffers; size_t i; - /* MIDI - * + /* MIDI + * * We don't currently mix MIDI input together, so we don't need the * complex logic of the audio case. */ @@ -4764,7 +4764,7 @@ Route::fill_buffers_with_input (BufferSet& bufs, boost::shared_ptr<IO> io, pfram } else { /* on subsequent times around, merge data from - * the port with what is already there + * the port with what is already there */ if (scaling != 1.0f) { diff --git a/libs/ardour/route_group.cc b/libs/ardour/route_group.cc index e2a23b5a17..42909ee497 100644 --- a/libs/ardour/route_group.cc +++ b/libs/ardour/route_group.cc @@ -376,7 +376,7 @@ RouteGroup::set_color (bool yn) } void -RouteGroup::set_monitoring (bool yn) +RouteGroup::set_monitoring (bool yn) { if (is_monitoring() == yn) { return; diff --git a/libs/ardour/scene_change.cc b/libs/ardour/scene_change.cc index 322b37a195..aed899565f 100644 --- a/libs/ardour/scene_change.cc +++ b/libs/ardour/scene_change.cc @@ -46,7 +46,7 @@ SceneChange::SceneChange () } void -SceneChange::set_color (uint32_t c) +SceneChange::set_color (uint32_t c) { _color = c; ColorChanged (); /* EMIT SIGNAL */ diff --git a/libs/ardour/search_paths.cc b/libs/ardour/search_paths.cc index d9e3bf7bc9..1089a3cd82 100644 --- a/libs/ardour/search_paths.cc +++ b/libs/ardour/search_paths.cc @@ -1,6 +1,6 @@ /* - Copyright (C) 2011 Tim Mayberry - Copyright (C) 2013 Paul Davis + Copyright (C) 2011 Tim Mayberry + Copyright (C) 2013 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 @@ -168,9 +168,9 @@ route_template_search_path () const char* vst_search_path () { - DWORD dwType = REG_SZ; + DWORD dwType = REG_SZ; HKEY hKey; - DWORD dwSize = PATH_MAX; + DWORD dwSize = PATH_MAX; char* p = 0; char* user_home = 0; char tmp[PATH_MAX+1]; @@ -255,7 +255,7 @@ vst_search_path () return p; } -#else +#else /* Unix-like. Probably require some OS X specific breakdown if we ever add VST * support on that platform. diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index 9d5fd619c3..3036c0b41e 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -48,7 +48,7 @@ string Send::name_and_id_new_send (Session& s, Role r, uint32_t& bitslot, bool ignore_bitslot) { if (ignore_bitslot) { - /* this happens during initial construction of sends from XML, + /* this happens during initial construction of sends from XML, before they get ::set_state() called. lets not worry about it. */ diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 171b4dc593..791c8d2656 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -211,7 +211,7 @@ Session::Session (AudioEngine &eng, , loop_changing (false) , last_loopend (0) , _session_dir (new SessionDirectory (fullpath)) - , _current_snapshot_name (snapshot_name) + , _current_snapshot_name (snapshot_name) , state_tree (0) , state_was_pending (false) , _state_of_the_state (StateOfTheState(CannotSave|InitialConnecting|Loading)) @@ -334,7 +334,7 @@ Session::Session (AudioEngine &eng, * of a template. */ - if (!mix_template.empty()) { + if (!mix_template.empty()) { if (load_state (_current_snapshot_name)) { throw SessionException (_("Failed to load template/snapshot state")); } @@ -418,7 +418,7 @@ Session::Session (AudioEngine &eng, list<boost::shared_ptr<AudioTrack> > tracks; - // Track names after driver + // Track names after driver if (Config->get_tracks_auto_naming() == NameAfterDriver) { string track_name = ""; for (std::vector<string>::size_type i = 0; i < inputs.size(); ++i) { @@ -428,7 +428,7 @@ Session::Session (AudioEngine &eng, list<boost::shared_ptr<AudioTrack> > single_track = new_audio_track (1, 1, Normal, 0, 1, track_name); tracks.insert(tracks.begin(), single_track.front()); - } + } } else { // Default track names tracks = new_audio_track (1, 1, Normal, 0, how_many, string()); } @@ -494,7 +494,7 @@ Session::immediately_post_engine () * know that the engine is running, but before we either create a * session or set state for an existing one. */ - + if (how_many_dsp_threads () > 1) { /* For now, only create the graph if we are using >1 DSP threads, as it is a bit slower than the old code with 1 thread. @@ -1138,7 +1138,7 @@ Session::add_monitor_section () /* Hold process lock while doing this so that we don't hear bits and * pieces of audio as we work on each route. */ - + Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); /* Connect tracks to monitor section. Note that in an @@ -1592,7 +1592,7 @@ Session::set_auto_loop_location (Location* location) } } } - + /* take care of our stuff first */ auto_loop_changed (location); @@ -1623,7 +1623,7 @@ Session::update_skips (Location* loc, bool consolidate) } sync_locations_to_skips (); - + set_dirty (); } @@ -1645,7 +1645,7 @@ Session::consolidate_skips (Location* loc) ++l; continue; } - + switch (Evoral::coverage ((*l)->start(), (*l)->end(), loc->start(), loc->end())) { case Evoral::OverlapInternal: case Evoral::OverlapExternal: @@ -1705,7 +1705,7 @@ Session::location_added (Location *location) if (location->is_auto_loop()) { set_auto_loop_location (location); } - + if (location->is_session_range()) { /* no need for any signal handling or event setting with the session range, because we keep a direct reference to it and use its start/end directly. @@ -1732,7 +1732,7 @@ Session::location_added (Location *location) update_skips (location, true); } - + set_dirty (); } @@ -1743,7 +1743,7 @@ Session::location_removed (Location *location) set_auto_loop_location (0); set_track_loop (false); } - + if (location->is_auto_punch()) { set_auto_punch_location (0); } @@ -1754,7 +1754,7 @@ Session::location_removed (Location *location) } if (location->is_skip()) { - + update_skips (location, false); } @@ -1770,7 +1770,7 @@ Session::locations_changed () void Session::_locations_changed (const Locations::LocationList& locations) { - /* There was some mass-change in the Locations object. + /* There was some mass-change in the Locations object. We might be re-adding a location here but it doesn't actually matter for all the locations that the Session takes an interest in. @@ -2115,7 +2115,7 @@ Session::resort_routes_using (boost::shared_ptr<RouteList> r) * routes directly or indirectly feed them. This information * is used by the solo code. */ - + for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { /* Clear out the route's list of direct or indirect feeds */ @@ -2279,7 +2279,7 @@ Session::default_track_name_pattern (DataType t) * @param instrument plugin info for the instrument to insert pre-fader, if any */ list<boost::shared_ptr<MidiTrack> > -Session::new_midi_track (const ChanCount& input, const ChanCount& output, boost::shared_ptr<PluginInfo> instrument, +Session::new_midi_track (const ChanCount& input, const ChanCount& output, boost::shared_ptr<PluginInfo> instrument, TrackMode mode, RouteGroup* route_group, uint32_t how_many, string name_template) { string track_name; @@ -2529,7 +2529,7 @@ Session::auto_connect_route (boost::shared_ptr<Route> route, ChanCount& existing } } -#ifdef USE_TRACKS_CODE_FEATURES +#ifdef USE_TRACKS_CODE_FEATURES static bool compare_routes_by_remote_id (const boost::shared_ptr<Route>& route1, const boost::shared_ptr<Route>& route2) @@ -2544,42 +2544,42 @@ Session::reconnect_existing_routes (bool withLock, bool reconnect_master, bool r if (!IO::connecting_legal) { return; } - + // if we are deleting routes we will call this once at the end if (_route_deletion_in_progress) { return; } - + Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock (), Glib::Threads::NOT_LOCK); - + if (withLock) { lm.acquire (); } - + // We need to disconnect the route's inputs and outputs first // basing on autoconnect configuration bool reconnectIputs = !(Config->get_input_auto_connect() & ManualConnect) && reconnect_inputs; bool reconnectOutputs = !(Config->get_output_auto_connect() & ManualConnect) && reconnect_outputs; - + ChanCount existing_inputs; ChanCount existing_outputs; count_existing_track_channels (existing_inputs, existing_outputs); - + //ChanCount inputs = ChanCount::ZERO; //ChanCount outputs = ChanCount::ZERO; - + RouteList existing_routes = *routes.reader (); existing_routes.sort (compare_routes_by_remote_id); - + { PBD::Unwinder<bool> protect_ignore_changes (_reconnecting_routes_in_progress, true); vector<string> physinputs; vector<string> physoutputs; - + EngineStateController::instance()->get_physical_audio_outputs(physoutputs); EngineStateController::instance()->get_physical_audio_inputs(physinputs); - + uint32_t input_n = 0; uint32_t output_n = 0; RouteList::iterator rIter = existing_routes.begin(); @@ -2595,52 +2595,52 @@ Session::reconnect_existing_routes (bool withLock, bool reconnect_master, bool r } else if (current_output_auto_connection == AutoConnectMaster) { (*rIter)->amp()->activate(); } - + if (reconnectIputs) { (*rIter)->input()->disconnect (this); //GZ: check this; could be heavy - + for (uint32_t route_input_n = 0; route_input_n < (*rIter)->n_inputs().get(DataType::AUDIO); ++route_input_n) { - + if (current_input_auto_connection & AutoConnectPhysical) { - + if ( input_n == physinputs.size() ) { break; } - + string port = physinputs[input_n]; - + if (port.empty() ) { error << "Physical Input number "<< input_n << " is unavailable and cannot be connected" << endmsg; } - + //GZ: check this; could be heavy (*rIter)->input()->connect ((*rIter)->input()->ports().port(DataType::AUDIO, route_input_n), port, this); ++input_n; } } } - + if (reconnectOutputs) { - + //normalize route ouptuts: reduce the amount outputs to be equal to the amount of inputs if (current_output_auto_connection & AutoConnectPhysical) { - + //GZ: check this; could be heavy (*rIter)->output()->disconnect (this); size_t route_inputs_count = (*rIter)->n_inputs().get(DataType::AUDIO); - + //GZ: check this; could be heavy (*rIter)->output()->ensure_io(ChanCount(DataType::AUDIO, route_inputs_count), false, this ); - + } else if (current_output_auto_connection & AutoConnectMaster){ - + if (!reconnect_master) { continue; } - + //GZ: check this; could be heavy (*rIter)->output()->disconnect (this); - + if (_master_out) { uint32_t master_inputs_count = _master_out->n_inputs().get(DataType::AUDIO); (*rIter)->output()->ensure_io(ChanCount(DataType::AUDIO, master_inputs_count), false, this ); @@ -2649,54 +2649,54 @@ Session::reconnect_existing_routes (bool withLock, bool reconnect_master, bool r break; } } - + for (uint32_t route_output_n = 0; route_output_n < (*rIter)->n_outputs().get(DataType::AUDIO); ++route_output_n) { if (current_output_auto_connection & AutoConnectPhysical) { - + if ( output_n == physoutputs.size() ) { break; } - + string port = physoutputs[output_n]; - + if (port.empty() ) { error << "Physical Output number "<< output_n << " is unavailable and cannot be connected" << endmsg; } - + //GZ: check this; could be heavy (*rIter)->output()->connect ((*rIter)->output()->ports().port(DataType::AUDIO, route_output_n), port, this); ++output_n; - + } else if (current_output_auto_connection & AutoConnectMaster) { - + if ( route_output_n == _master_out->n_inputs().get(DataType::AUDIO) ) { break; } - + // connect to master bus string port = _master_out->input()->ports().port(DataType::AUDIO, route_output_n)->name(); - + if (port.empty() ) { error << "MasterBus Input number "<< route_output_n << " is unavailable and cannot be connected" << endmsg; } - - + + //GZ: check this; could be heavy (*rIter)->output()->connect ((*rIter)->output()->ports().port(DataType::AUDIO, route_output_n), port, this); - + } } } - + //auto_connect_route (*rIter, inputs, outputs, false, reconnectIputs); } - + _master_out->output()->disconnect (this); auto_connect_master_bus (); } - + graph_reordered (); - + session_routes_reconnected (); /* EMIT SIGNAL */ } @@ -2704,16 +2704,16 @@ void Session::reconnect_midi_scene_ports(bool inputs) { if (inputs ) { - + boost::shared_ptr<MidiPort> scene_in_ptr = scene_in(); if (scene_in_ptr) { scene_in_ptr->disconnect_all (); - + std::vector<EngineStateController::MidiPortState> midi_port_states; EngineStateController::instance()->get_physical_midi_input_states (midi_port_states); - + std::vector<EngineStateController::MidiPortState>::iterator state_iter = midi_port_states.begin(); - + for (; state_iter != midi_port_states.end(); ++state_iter) { if (state_iter->active && state_iter->available && state_iter->scene_connected) { scene_in_ptr->connect (state_iter->name); @@ -2722,17 +2722,17 @@ Session::reconnect_midi_scene_ports(bool inputs) } } else { - + boost::shared_ptr<MidiPort> scene_out_ptr = scene_out(); - + if (scene_out_ptr ) { scene_out_ptr->disconnect_all (); std::vector<EngineStateController::MidiPortState> midi_port_states; EngineStateController::instance()->get_physical_midi_output_states (midi_port_states); - + std::vector<EngineStateController::MidiPortState>::iterator state_iter = midi_port_states.begin(); - + for (; state_iter != midi_port_states.end(); ++state_iter) { if (state_iter->active && state_iter->available && state_iter->scene_connected) { scene_out_ptr->connect (state_iter->name); @@ -2780,30 +2780,30 @@ void Session::reconnect_mmc_ports(bool inputs) { if (inputs ) { // get all enabled midi input ports - + boost::shared_ptr<MidiPort> mmc_in_ptr = _midi_ports->mmc_in(); if (mmc_in_ptr) { mmc_in_ptr->disconnect_all (); std::vector<std::string> enabled_midi_inputs; EngineStateController::instance()->get_physical_midi_inputs (enabled_midi_inputs); - + std::vector<std::string>::iterator port_iter = enabled_midi_inputs.begin(); - + for (; port_iter != enabled_midi_inputs.end(); ++port_iter) { mmc_in_ptr->connect (*port_iter); } } } else { // get all enabled midi output ports - + boost::shared_ptr<MidiPort> mmc_out_ptr = _midi_ports->mmc_out(); if (mmc_out_ptr ) { mmc_out_ptr->disconnect_all (); std::vector<std::string> enabled_midi_outputs; EngineStateController::instance()->get_physical_midi_outputs (enabled_midi_outputs); - + std::vector<std::string>::iterator port_iter = enabled_midi_outputs.begin(); - + for (; port_iter != enabled_midi_outputs.end(); ++port_iter) { mmc_out_ptr->connect (*port_iter); } @@ -2817,7 +2817,7 @@ Session::reconnect_mmc_ports(bool inputs) * @param name_template string to use for the start of the name, or "" to use "Audio". */ list< boost::shared_ptr<AudioTrack> > -Session::new_audio_track (int input_channels, int output_channels, TrackMode mode, RouteGroup* route_group, +Session::new_audio_track (int input_channels, int output_channels, TrackMode mode, RouteGroup* route_group, uint32_t how_many, string name_template) { string track_name; @@ -3169,7 +3169,7 @@ Session::add_routes (RouteList& new_routes, bool input_auto_connect, bool output reassign_track_numbers(); update_route_record_state (); - + RouteAdded (new_routes); /* EMIT SIGNAL */ } @@ -3370,39 +3370,39 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove) { // RCU Writer scope RCUWriter<RouteList> writer (routes); boost::shared_ptr<RouteList> rs = writer.get_copy (); - - + + for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) { - + if (*iter == _master_out) { continue; } - + (*iter)->set_solo (false, this); - + rs->remove (*iter); - + /* deleting the master out seems like a dumb idea, but its more of a UI policy issue than our concern. */ - + if (*iter == _master_out) { _master_out = boost::shared_ptr<Route> (); } - + if (*iter == _monitor_out) { _monitor_out.reset (); } // We need to disconnect the route's inputs and outputs - + (*iter)->input()->disconnect (0); (*iter)->output()->disconnect (0); - + /* if the route had internal sends sending to it, remove them */ if ((*iter)->internal_return()) { - + boost::shared_ptr<RouteList> r = routes.reader (); for (RouteList::iterator i = r->begin(); i != r->end(); ++i) { boost::shared_ptr<Send> s = (*i)->internal_send_for (*iter); @@ -3411,14 +3411,14 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove) } } } - + /* if the monitoring section had a pointer to this route, remove it */ if (_monitor_out && !(*iter)->is_master() && !(*iter)->is_monitor()) { Glib::Threads::Mutex::Lock lm (AudioEngine::instance()->process_lock ()); PBD::Unwinder<bool> uw (ignore_route_processor_changes, true); (*iter)->remove_aux_or_listen (_monitor_out); } - + boost::shared_ptr<MidiTrack> mt = boost::dynamic_pointer_cast<MidiTrack> (*iter); if (mt && mt->step_editing()) { if (_step_editors > 0) { @@ -3426,16 +3426,16 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove) } } } - + /* writer goes out of scope, forces route list update */ } // end of RCU Writer scope - + update_route_solo_state (); RouteAddedOrRemoved (false); /* EMIT SIGNAL */ update_latency_compensation (); set_dirty(); - + /* Re-sort routes to remove the graph's current references to the one that is * going away, then flush old references out of the graph. * Wave Tracks: reconnect routes @@ -3447,16 +3447,16 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove) routes.flush (); // maybe unsafe, see below. resort_routes (); #endif - + if (_process_graph) { _process_graph->clear_other_chain (); } - + /* get rid of it from the dead wood collection in the route list manager */ /* XXX i think this is unsafe as it currently stands, but i am not sure. (pd, october 2nd, 2006) */ - + routes.flush (); - + /* try to cause everyone to drop their references * and unregister ports from the backend */ @@ -3464,11 +3464,11 @@ Session::remove_routes (boost::shared_ptr<RouteList> routes_to_remove) for (RouteList::iterator iter = routes_to_remove->begin(); iter != routes_to_remove->end(); ++iter) { (*iter)->drop_references (); } - + Route::RemoteControlIDChange(); /* EMIT SIGNAL */ - + /* save the new state of the world */ - + if (save_state (_current_snapshot_name)) { save_history (_current_snapshot_name); } @@ -4455,20 +4455,20 @@ Session::construct_peak_filepath (const string& filepath, const bool in_session, string Session::new_audio_source_path_for_embedded (const std::string& path) { - /* embedded source: + /* embedded source: * * we know that the filename is already unique because it exists - * out in the filesystem. + * out in the filesystem. * * However, when we bring it into the session, we could get a * collision. * * Eg. two embedded files: - * + * * /foo/bar/baz.wav * /frob/nic/baz.wav * - * When merged into session, these collide. + * When merged into session, these collide. * * There will not be a conflict with in-memory sources * because when the source was created we already picked @@ -4512,14 +4512,14 @@ Session::new_audio_source_path_for_embedded (const std::string& path) return newpath; } -/** Return true if there are no audio file sources that use @param name as - * the filename component of their path. +/** Return true if there are no audio file sources that use @param name as + * the filename component of their path. * * Return false otherwise. * - * This method MUST ONLY be used to check in-session, mono files since it + * This method MUST ONLY be used to check in-session, mono files since it * hard-codes the channel of the audio file source we are looking for as zero. - * + * * If/when Ardour supports native files in non-mono formats, the logic here * will need to be revisited. */ @@ -4755,21 +4755,21 @@ boost::shared_ptr<MidiSource> Session::create_midi_source_by_stealing_name (boost::shared_ptr<Track> track) { /* the caller passes in the track the source will be used in, - so that we can keep the numbering sane. - + so that we can keep the numbering sane. + Rationale: a track with the name "Foo" that has had N captures carried out so far will ALREADY have a write source named "Foo-N+1.mid" waiting to be used for the next capture. - + If we call new_midi_source_name() we will get "Foo-N+2". But there is no region corresponding to "Foo-N+1", so when "Foo-N+2" appears in the track, the gap presents the user with odd behaviour - why did it skip past Foo-N+1? - + We could explain this to the user in some odd way, but instead we rename "Foo-N+1.mid" as "Foo-N+2.mid", and then use "Foo-N+1" here. - + If that attempted rename fails, we get "Foo-N+2.mid" anyway. */ @@ -5289,7 +5289,7 @@ Session::freeze_all (InterThreadInfo& itt) boost::shared_ptr<Region> Session::write_one_track (Track& track, framepos_t start, framepos_t end, bool /*overwrite*/, vector<boost::shared_ptr<Source> >& srcs, - InterThreadInfo& itt, + InterThreadInfo& itt, boost::shared_ptr<Processor> endpoint, bool include_endpoint, bool for_export, bool for_freeze) { @@ -5649,11 +5649,11 @@ Session::update_route_record_state () break; } } - + g_atomic_int_set (&_have_rec_disabled_track, i != rl->end () ? 1 : 0); bool record_arm_state_changed = (old != g_atomic_int_get (&_have_rec_enabled_track) ); - + if (record_status() == Recording && record_arm_state_changed ) { RecordArmStateChanged (); } @@ -6200,7 +6200,7 @@ Session::session_name_is_legal (const string& path) return 0; } -uint32_t +uint32_t Session::next_control_id () const { int subtract = 0; diff --git a/libs/ardour/session_directory.cc b/libs/ardour/session_directory.cc index b6536ebec9..aaeb599a62 100644 --- a/libs/ardour/session_directory.cc +++ b/libs/ardour/session_directory.cc @@ -42,7 +42,7 @@ SessionDirectory::SessionDirectory (const std::string& session_path) } -SessionDirectory& +SessionDirectory& SessionDirectory::operator= (const std::string& newpath) { m_root_path = newpath; diff --git a/libs/ardour/session_events.cc b/libs/ardour/session_events.cc index 7d8cbdc274..baea980a65 100644 --- a/libs/ardour/session_events.cc +++ b/libs/ardour/session_events.cc @@ -79,7 +79,7 @@ SessionEvent::operator new (size_t) SessionEvent* ev = static_cast<SessionEvent*> (p->alloc ()); DEBUG_TRACE (DEBUG::SessionEvents, string_compose ("%1 Allocating SessionEvent from %2 ev @ %3 pool size %4 free %5 used %6\n", pthread_name(), p->name(), ev, p->total(), p->available(), p->used())); - + ev->own_pool = p; return ev; } diff --git a/libs/ardour/session_midi.cc b/libs/ardour/session_midi.cc index a97f405563..df2152192c 100644 --- a/libs/ardour/session_midi.cc +++ b/libs/ardour/session_midi.cc @@ -630,32 +630,32 @@ Session::start_midi_thread () return 0; } -MIDI::Port* +MIDI::Port* Session::midi_input_port () const { return _midi_ports->midi_input_port (); } -MIDI::Port* +MIDI::Port* Session::midi_output_port () const { return _midi_ports->midi_output_port (); } -boost::shared_ptr<MidiPort> +boost::shared_ptr<MidiPort> Session::midi_clock_output_port () const { return _midi_ports->midi_clock_output_port (); } -boost::shared_ptr<MidiPort> +boost::shared_ptr<MidiPort> Session::midi_clock_input_port () const { return _midi_ports->midi_clock_input_port (); } -boost::shared_ptr<MidiPort> +boost::shared_ptr<MidiPort> Session::mtc_output_port () const { return _midi_ports->mtc_output_port (); } -boost::shared_ptr<MidiPort> +boost::shared_ptr<MidiPort> Session::mtc_input_port () const { return _midi_ports->mtc_input_port (); diff --git a/libs/ardour/session_rtevents.cc b/libs/ardour/session_rtevents.cc index b00c4c1ebf..5e20421cca 100644 --- a/libs/ardour/session_rtevents.cc +++ b/libs/ardour/session_rtevents.cc @@ -249,9 +249,9 @@ Session::rt_set_record_safe (boost::shared_ptr<RouteList> rl, bool yn, bool grou if ((*i)->is_auditioner ()) { // REQUIRES REVIEW Can audiotioner be in Record Safe mode? continue; } - + boost::shared_ptr<Track> t; - + if ((t = boost::dynamic_pointer_cast<Track>(*i)) != 0) { t->set_record_safe (yn, (group_override ? (void*) t->route_group () : (void *) this)); } diff --git a/libs/ardour/session_transport.cc b/libs/ardour/session_transport.cc index 86ab62e1ef..0c5e3cbff5 100644 --- a/libs/ardour/session_transport.cc +++ b/libs/ardour/session_transport.cc @@ -336,12 +336,12 @@ Session::butler_transport_work () DEBUG_TRACE (DEBUG::Butler, "flush loop recording fragment to disk\n"); /* this locate might be happening while we are - * loop recording. + * loop recording. * * Non-seamless looping will require a locate (below) that * will reset capture buffers and throw away data. * - * Rather than first find all tracks and see if they + * Rather than first find all tracks and see if they * have outstanding data, just do a flush anyway. It * may be cheaper this way anyway, and is certainly * more accurate. @@ -597,7 +597,7 @@ Session::select_playhead_priority_target (framepos_t& jump_to) /* need to get track buffers reloaded */ set_track_loop (true); } - } + } } } @@ -605,7 +605,7 @@ Session::select_playhead_priority_target (framepos_t& jump_to) if (!_object_selection.empty()) { jump_to = _object_selection.from; } - } + } if (jump_to < 0 && (autoreturn & LastLocate)) { jump_to = _last_roll_location; @@ -811,7 +811,7 @@ Session::non_realtime_stop (bool abort, int on_entry, bool& finished) /* This (::non_realtime_stop()) gets called by main process thread, which will lead to confusion when calling AsyncMIDIPort::write(). - + Something must be done. XXX */ send_mmc_locate (_transport_frame); @@ -967,8 +967,8 @@ Session::set_play_loop (bool yn, double speed) /* set all tracks to use internal looping */ set_track_loop (true); } else { - /* we will do this in the locate to the start OR when we hit the end - * of the loop for the first time + /* we will do this in the locate to the start OR when we hit the end + * of the loop for the first time */ } } else { @@ -1100,7 +1100,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool * already have the correct data in them, and thus there is no need to * actually tell the tracks to locate. What does need to be done, * though, is all the housekeeping that is associated with non-linear - * changes in the value of _transport_frame. + * changes in the value of _transport_frame. */ DEBUG_TRACE (DEBUG::Transport, string_compose ("rt-locate to %1, roll %2 flush %3 loop-enabled %4 force %5 mmc %6\n", @@ -1285,7 +1285,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool void Session::set_transport_speed (double speed, framepos_t destination_frame, bool abort, bool clear_state, bool as_default) { - DEBUG_TRACE (DEBUG::Transport, string_compose ("@ %5 Set transport speed to %1, abort = %2 clear_state = %3, current = %4 as_default %6\n", + DEBUG_TRACE (DEBUG::Transport, string_compose ("@ %5 Set transport speed to %1, abort = %2 clear_state = %3, current = %4 as_default %6\n", speed, abort, clear_state, _transport_speed, _transport_frame, as_default)); if (_transport_speed == speed) { @@ -1297,7 +1297,7 @@ Session::set_transport_speed (double speed, framepos_t destination_frame, bool a if (actively_recording() && speed != 1.0 && speed != 0.0) { /* no varispeed during recording */ - DEBUG_TRACE (DEBUG::Transport, string_compose ("No varispeed during recording cur_speed %1, frame %2\n", + DEBUG_TRACE (DEBUG::Transport, string_compose ("No varispeed during recording cur_speed %1, frame %2\n", _transport_speed, _transport_frame)); return; } @@ -1434,13 +1434,13 @@ Session::set_transport_speed (double speed, framepos_t destination_frame, bool a DEBUG_TRACE (DEBUG::Transport, string_compose ("send TSC3 with speed = %1\n", _transport_speed)); - /* throttle signal emissions. + /* throttle signal emissions. * when slaved [_last]_transport_speed * usually changes every cycle (tiny amounts due to DLL). * Emitting a signal every cycle is overkill and unwarranted. * * Using _last_transport_speed is not acceptable, - * since it allows for large changes over a long period + * since it allows for large changes over a long period * of time. Hence we introduce a dedicated variable to keep track * * The 0.2% dead-zone is somewhat arbitrary. Main use-case @@ -1510,7 +1510,7 @@ Session::stop_transport (bool abort, bool clear_state) merge_event (ev); /* request a declick at the start of the next process cycle() so that playback ceases. - It will remain silent until we actually stop (at the StopOnce event somewhere in + It will remain silent until we actually stop (at the StopOnce event somewhere in the future). The extra flag (StopPendingCapture) is set to ensure that check_declick_out() does not stop the transport too early. */ @@ -1535,7 +1535,7 @@ Session::stop_transport (bool abort, bool clear_state) DEBUG_TRACE (DEBUG::Transport, "time to actually stop\n"); /* declick was scheduled, but we've been called again, which means it is really time to stop - + XXX: we should probably split this off into its own method and call it explicitly. */ diff --git a/libs/ardour/smf_source.cc b/libs/ardour/smf_source.cc index cbb8c5db1e..fe78e1fbc7 100644 --- a/libs/ardour/smf_source.cc +++ b/libs/ardour/smf_source.cc @@ -71,7 +71,7 @@ SMFSource::SMFSource (Session& s, const string& path, Source::Flag flags) if (init (_path, false)) { throw failed_constructor (); } - + assert (!Glib::file_test (_path, Glib::FILE_TEST_EXISTS)); existence_check (); @@ -107,7 +107,7 @@ SMFSource::SMFSource (Session& s, const string& path) if (init (_path, true)) { throw failed_constructor (); } - + assert (Glib::file_test (_path, Glib::FILE_TEST_EXISTS)); existence_check (); @@ -784,7 +784,7 @@ SMFSource::prevent_deletion () /* Unlike the audio case, the MIDI file remains mutable (because we can edit MIDI data) */ - + _flags = Flag (_flags & ~(Removable|RemovableIfEmpty|RemoveAtDestroy)); } diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 18c6df4a48..769ee0d1d5 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -78,7 +78,7 @@ SndFileSource::SndFileSource (Session& s, const XMLNode& node) } /** Constructor for existing external-to-session files. - Files created this way are never writable or removable + Files created this way are never writable or removable */ SndFileSource::SndFileSource (Session& s, const string& path, int chn, Flag flags) : Source(s, DataType::AUDIO, path, flags) @@ -103,8 +103,8 @@ SndFileSource::SndFileSource (Session& s, const string& path, int chn, Flag flag } } -/** This constructor is used to construct new internal-to-session files, - not open existing ones. +/** This constructor is used to construct new internal-to-session files, + not open existing ones. */ SndFileSource::SndFileSource (Session& s, const string& path, const string& origin, SampleFormat sfmt, HeaderFormat hf, framecnt_t rate, Flag flags) @@ -168,7 +168,7 @@ SndFileSource::SndFileSource (Session& s, const string& path, const string& orig fmt = SF_FORMAT_RF64; _flags = Flag (_flags & ~Broadcast); break; - + default: fatal << string_compose (_("programming error: %1"), X_("unsupported audio header format requested")) << endmsg; abort(); /*NOTREACHED*/ @@ -348,7 +348,7 @@ SndFileSource::open () delete _broadcast_info; _broadcast_info = 0; _flags = Flag (_flags & ~Broadcast); - } + } /* Set the broadcast flag if the BWF info is already there. We need * this when recovering or using existing files. diff --git a/libs/ardour/soundcloud_upload.cc b/libs/ardour/soundcloud_upload.cc index d725614ea7..c7bd4605df 100644 --- a/libs/ardour/soundcloud_upload.cc +++ b/libs/ardour/soundcloud_upload.cc @@ -72,7 +72,7 @@ SoundcloudUploader::Get_Auth_Token( std::string username, std::string password ) struct curl_httppost *formpost=NULL; struct curl_httppost *lastptr=NULL; - /* Fill in the filename field */ + /* Fill in the filename field */ curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "client_id", @@ -108,7 +108,7 @@ SoundcloudUploader::Get_Auth_Token( std::string username, std::string password ) headerlist = curl_slist_append(headerlist, "Accept: application/xml"); curl_easy_setopt(curl_handle, CURLOPT_HTTPHEADER, headerlist); - /* what URL that receives this POST */ + /* what URL that receives this POST */ std::string url = "https://api.soundcloud.com/oauth2/token"; curl_easy_setopt(curl_handle, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl_handle, CURLOPT_HTTPPOST, formpost); @@ -170,14 +170,14 @@ SoundcloudUploader::Upload(std::string file_path, std::string title, std::string struct curl_httppost *lastptr=NULL; /* Fill in the file upload field. This makes libcurl load data from - the given file name when curl_easy_perform() is called. */ + the given file name when curl_easy_perform() is called. */ curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "track[asset_data]", CURLFORM_FILE, file_path.c_str(), CURLFORM_END); - /* Fill in the filename field */ + /* Fill in the filename field */ curl_formadd(&formpost, &lastptr, CURLFORM_COPYNAME, "oauth_token", @@ -205,7 +205,7 @@ SoundcloudUploader::Upload(std::string file_path, std::string title, std::string /* initalize custom header list (stating that Expect: 100-continue is not - wanted */ + wanted */ struct curl_slist *headerlist=NULL; static const char buf[] = "Expect:"; headerlist = curl_slist_append(headerlist, buf); @@ -213,7 +213,7 @@ SoundcloudUploader::Upload(std::string file_path, std::string title, std::string if (curl_handle && multi_handle) { - /* what URL that receives this POST */ + /* what URL that receives this POST */ std::string url = "https://api.soundcloud.com/tracks"; curl_easy_setopt(curl_handle, CURLOPT_URL, url.c_str()); // curl_easy_setopt(curl_handle, CURLOPT_VERBOSE, 1L); @@ -235,7 +235,7 @@ SoundcloudUploader::Upload(std::string file_path, std::string title, std::string while(still_running) { struct timeval timeout; - int rc; /* select() return code */ + int rc; /* select() return code */ fd_set fdread; fd_set fdwrite; @@ -248,7 +248,7 @@ SoundcloudUploader::Upload(std::string file_path, std::string title, std::string FD_ZERO(&fdwrite); FD_ZERO(&fdexcep); - /* set a suitable timeout to play around with */ + /* set a suitable timeout to play around with */ timeout.tv_sec = 1; timeout.tv_usec = 0; @@ -261,33 +261,33 @@ SoundcloudUploader::Upload(std::string file_path, std::string title, std::string timeout.tv_usec = (curl_timeo % 1000) * 1000; } - /* get file descriptors from the transfers */ + /* get file descriptors from the transfers */ curl_multi_fdset(multi_handle, &fdread, &fdwrite, &fdexcep, &maxfd); /* In a real-world program you OF COURSE check the return code of the function calls. On success, the value of maxfd is guaranteed to be greater or equal than -1. We call select(maxfd + 1, ...), specially in case of (maxfd == -1), we call select(0, ...), which is basically equal - to sleep. */ + to sleep. */ rc = select(maxfd+1, &fdread, &fdwrite, &fdexcep, &timeout); switch(rc) { case -1: - /* select error */ + /* select error */ break; case 0: default: - /* timeout or readable/writable sockets */ + /* timeout or readable/writable sockets */ curl_multi_perform(multi_handle, &still_running); break; } - } + } - /* then cleanup the formpost chain */ + /* then cleanup the formpost chain */ curl_formfree(formpost); - /* free slist */ + /* free slist */ curl_slist_free_all (headerlist); } diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 7ef7ae12d1..6640a2493e 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -308,7 +308,7 @@ SourceFactory::createExternal (DataType type, Session& s, const string& path, } boost::shared_ptr<Source> -SourceFactory::createWritable (DataType type, Session& s, const std::string& path, +SourceFactory::createWritable (DataType type, Session& s, const std::string& path, bool destructive, framecnt_t rate, bool announce, bool defer_peaks) { /* this might throw failed_constructor(), which is OK */ diff --git a/libs/ardour/sse_functions_avx.cc b/libs/ardour/sse_functions_avx.cc index 89cb91f2ea..218f3f5e91 100644 --- a/libs/ardour/sse_functions_avx.cc +++ b/libs/ardour/sse_functions_avx.cc @@ -48,9 +48,9 @@ x86_sse_avx_find_peaks(const float* buf, uint32_t nframes, float *min, float *ma // use 64 byte prefetch for quadruple quads: // load each 64 bytes into cash before processing while (nframes >= 16) { -#if defined(COMPILER_MSVC) || defined(COMPILER_MINGW) +#if defined(COMPILER_MSVC) || defined(COMPILER_MINGW) _mm_prefetch(((char*)buf+64), _mm_hint(0) ); -#else +#else __builtin_prefetch(buf+64,0,0); #endif work = _mm256_load_ps(buf); diff --git a/libs/ardour/sse_functions_xmm.cc b/libs/ardour/sse_functions_xmm.cc index f8a53cc6f8..6eac488a25 100644 --- a/libs/ardour/sse_functions_xmm.cc +++ b/libs/ardour/sse_functions_xmm.cc @@ -45,7 +45,7 @@ x86_sse_find_peaks(const ARDOUR::Sample* buf, ARDOUR::pframes_t nframes, float * // use 64 byte prefetch for quadruple quads while (nframes >= 16) { -#ifdef COMPILER_MSVC +#ifdef COMPILER_MSVC _mm_prefetch(((char*)buf+64), 0); // A total guess! Assumed to be eqivalent to #else // the line below but waiting to be tested !! __builtin_prefetch(buf+64,0,0); diff --git a/libs/ardour/template_utils.cc b/libs/ardour/template_utils.cc index 24674f9226..70fffba680 100644 --- a/libs/ardour/template_utils.cc +++ b/libs/ardour/template_utils.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/tempo.cc b/libs/ardour/tempo.cc index 82520c19ea..df7c1ac2e3 100644 --- a/libs/ardour/tempo.cc +++ b/libs/ardour/tempo.cc @@ -46,11 +46,11 @@ Tempo TempoMap::_default_tempo (120.0); /***********************************************************************/ -double +double Meter::frames_per_grid (const Tempo& tempo, framecnt_t sr) const { /* This is tempo- and meter-sensitive. The number it returns - is based on the interval between any two lines in the + is based on the interval between any two lines in the grid that is constructed from tempo and meter sections. The return value IS NOT interpretable in terms of "beats". @@ -156,7 +156,7 @@ void TempoSection::update_bar_offset_from_bbt (const Meter& m) { - _bar_offset = ((start().beats - 1) * BBT_Time::ticks_per_beat + start().ticks) / + _bar_offset = ((start().beats - 1) * BBT_Time::ticks_per_beat + start().ticks) / (m.divisions_per_bar() * BBT_Time::ticks_per_beat); DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Tempo set bar offset to %1 from %2 w/%3\n", _bar_offset, start(), m.divisions_per_bar())); @@ -180,8 +180,8 @@ TempoSection::update_bbt_time_from_bar_offset (const Meter& meter) /* remember the 1-based counting properties of beats */ new_start.beats += 1; - - DEBUG_TRACE (DEBUG::TempoMath, string_compose ("from bar offset %1 and dpb %2, ticks = %3->%4 beats = %5\n", + + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("from bar offset %1 and dpb %2, ticks = %3->%4 beats = %5\n", _bar_offset, meter.divisions_per_bar(), ticks, new_start.ticks, new_start.beats)); set_start (new_start); @@ -219,7 +219,7 @@ MeterSection::MeterSection (const XMLNode& node) if ((prop = node.property ("beats-per-bar")) == 0) { error << _("MeterSection XML node has no \"beats-per-bar\" or \"divisions-per-bar\" property") << endmsg; throw failed_constructor(); - } + } } if (sscanf (prop->value().c_str(), "%lf", &_divisions_per_bar) != 1 || _divisions_per_bar < 0.0) { @@ -384,7 +384,7 @@ TempoMap::do_insert (MetricSection* section) assert (section->start().ticks == 0); /* we only allow new meters to be inserted on beat 1 of an existing - * measure. + * measure. */ if (dynamic_cast<MeterSection*>(section)) { @@ -440,7 +440,7 @@ TempoMap::do_insert (MetricSection* section) metrics.erase (i); } break; - } + } } else if (!iter_is_tempo && !insert_is_tempo) { @@ -538,7 +538,7 @@ TempoMap::add_tempo_locked (const Tempo& tempo, BBT_Time where, bool recompute) /* as we start, we are *guaranteed* to have m.meter and m.tempo pointing at something, because we insert the default tempo and meter during TempoMap construction. - + now see if we can find better candidates. */ @@ -611,7 +611,7 @@ TempoMap::add_meter_locked (const Meter& meter, BBT_Time where, bool recompute) round the start time appropriately. remember that `where' is based on the existing tempo map, not the result after we insert the new meter. - + */ if (where.beats != 1) { @@ -638,7 +638,7 @@ TempoMap::change_initial_tempo (double beats_per_minute, double note_type) for (Metrics::iterator i = metrics.begin(); i != metrics.end(); ++i) { if ((t = dynamic_cast<TempoSection*> (*i)) != 0) { - { + { Glib::Threads::RWLock::WriterLock lm (lock); *((Tempo*) t) = newtempo; recompute_map (false); @@ -929,7 +929,7 @@ TempoMap::extend_map (framepos_t end) } /* find the metric immediately after the tempo + meter sections for the - * last point in the map + * last point in the map */ for (next_metric = metrics.begin(); next_metric != metrics.end(); ++next_metric) { @@ -939,16 +939,16 @@ TempoMap::extend_map (framepos_t end) } /* we cast away const here because this is the one place where we need - * to actually modify the frame time of each metric section. + * to actually modify the frame time of each metric section. */ - _extend_map (const_cast<TempoSection*> ((*i).tempo), + _extend_map (const_cast<TempoSection*> ((*i).tempo), const_cast<MeterSection*> ((*i).meter), next_metric, BBT_Time ((*i).bar, (*i).beat, 0), (*i).frame, end); } void -TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter, +TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter, Metrics::iterator next_metric, BBT_Time current, framepos_t current_frame, framepos_t end) { @@ -1006,7 +1006,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter, * is within, which will be different * from the preceding following ones * since it takes part of its duration - * from the preceding tempo and part + * from the preceding tempo and part * from this new tempo. */ @@ -1023,9 +1023,9 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter, /* set tempo section location * based on offset from last - * bar start + * bar start */ - tempo->set_frame (bar_start_frame + + tempo->set_frame (bar_start_frame + llrint ((ts->bar_offset() * meter->divisions_per_bar() * beat_frames))); /* advance to the location of @@ -1074,7 +1074,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter, beat_frames = meter->frames_per_grid (*tempo, _frame_rate); - DEBUG_TRACE (DEBUG::TempoMath, string_compose ("New metric with beat frames = %1 dpb %2 meter %3 tempo %4\n", + DEBUG_TRACE (DEBUG::TempoMath, string_compose ("New metric with beat frames = %1 dpb %2 meter %3 tempo %4\n", beat_frames, meter->divisions_per_bar(), *((Meter*)meter), *((Tempo*)tempo))); ++next_metric; @@ -1086,7 +1086,7 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter, } } - } + } if (current.beats == 1) { DEBUG_TRACE (DEBUG::TempoMath, string_compose ("Add Bar at %1|1 @ %2\n", current.bars, current_frame)); @@ -1234,7 +1234,7 @@ TempoMap::frame_time (const BBT_Time& bbt) BBTPointList::const_iterator e = bbt_before_or_at (BBT_Time (bbt.bars, bbt.beats, 0)); if (bbt.ticks != 0) { - return ((*e).frame - (*s).frame) + + return ((*e).frame - (*s).frame) + llrint ((*e).tempo->frames_per_beat (_frame_rate) * (bbt.ticks/BBT_Time::ticks_per_beat)); } else { return ((*e).frame - (*s).frame); @@ -1252,7 +1252,7 @@ TempoMap::bbt_duration_at (framepos_t pos, const BBT_Time& bbt, int dir) } framecnt_t -TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int /*dir*/) +TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, int /*dir*/) { if (bbt.bars == 0 && bbt.beats == 0 && bbt.ticks == 0) { return 0; @@ -1284,7 +1284,7 @@ TempoMap::bbt_duration_at_unlocked (const BBT_Time& when, const BBT_Time& bbt, i /* add any additional frames related to ticks in the added value */ if (bbt.ticks != 0) { - return ((*wi).frame - (*start).frame) + + return ((*wi).frame - (*start).frame) + (*wi).tempo->frames_per_beat (_frame_rate) * (bbt.ticks/BBT_Time::ticks_per_beat); } else { return ((*wi).frame - (*start).frame); @@ -1344,7 +1344,7 @@ TempoMap::round_to_beat_subdivision (framepos_t fr, int sub_num, RoundMode dir) ++i; assert (i != _map.end()); the_beat.ticks -= BBT_Time::ticks_per_beat; - } + } } else if (dir < 0) { @@ -1391,7 +1391,7 @@ TempoMap::round_to_beat_subdivision (framepos_t fr, int sub_num, RoundMode dir) assert (i != _map.end()); the_beat.ticks -= BBT_Time::ticks_per_beat; DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("fold beat to %1\n", the_beat)); - } + } } else if (rem > 0) { @@ -1415,7 +1415,7 @@ TempoMap::round_to_beat_subdivision (framepos_t fr, int sub_num, RoundMode dir) } } - return (*i).frame + (the_beat.ticks/BBT_Time::ticks_per_beat) * + return (*i).frame + (the_beat.ticks/BBT_Time::ticks_per_beat) * (*i).tempo->frames_per_beat (_frame_rate); } @@ -1460,7 +1460,7 @@ TempoMap::round_to_type (framepos_t frame, RoundMode dir, BBTPointType type) } fi--; } - DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to bar: map iter at %1|%2 %3, return\n", + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to bar: map iter at %1|%2 %3, return\n", (*fi).bar, (*fi).beat, (*fi).frame)); return (*fi).frame; @@ -1483,7 +1483,7 @@ TempoMap::round_to_type (framepos_t frame, RoundMode dir, BBTPointType type) } } - DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to bar: map iter at %1|%2 %3, return\n", + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to bar: map iter at %1|%2 %3, return\n", (*fi).bar, (*fi).beat, (*fi).frame)); return (*fi).frame; @@ -1530,7 +1530,7 @@ TempoMap::round_to_type (framepos_t frame, RoundMode dir, BBTPointType type) DEBUG_TRACE (DEBUG::SnapBBT, "requested frame is on beat, step back\n"); --fi; } - DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to beat: map iter at %1|%2 %3, return\n", + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to beat: map iter at %1|%2 %3, return\n", (*fi).bar, (*fi).beat, (*fi).frame)); return (*fi).frame; } else if (dir > 0) { @@ -1538,7 +1538,7 @@ TempoMap::round_to_type (framepos_t frame, RoundMode dir, BBTPointType type) DEBUG_TRACE (DEBUG::SnapBBT, "requested frame is on beat, step forward\n"); ++fi; } - DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to beat: map iter at %1|%2 %3, return\n", + DEBUG_TRACE (DEBUG::SnapBBT, string_compose ("rounded to beat: map iter at %1|%2 %3, return\n", (*fi).bar, (*fi).beat, (*fi).frame)); return (*fi).frame; } else { @@ -1570,11 +1570,11 @@ TempoMap::round_to_type (framepos_t frame, RoundMode dir, BBTPointType type) } void -TempoMap::get_grid (TempoMap::BBTPointList::const_iterator& begin, - TempoMap::BBTPointList::const_iterator& end, - framepos_t lower, framepos_t upper) +TempoMap::get_grid (TempoMap::BBTPointList::const_iterator& begin, + TempoMap::BBTPointList::const_iterator& end, + framepos_t lower, framepos_t upper) { - { + { Glib::Threads::RWLock::WriterLock lm (lock); if (_map.empty() || (_map.back().frame < upper)) { recompute_map (false, upper); @@ -1697,7 +1697,7 @@ TempoMap::set_state (const XMLNode& node, int /*version*/) if (ts->bar_offset() < 0.0) { if (last_meter) { ts->update_bar_offset_from_bbt (*last_meter); - } + } } } @@ -2296,7 +2296,7 @@ TempoMap::framepos_plus_bbt (framepos_t pos, BBT_Time op) const if (op.ticks) { if (op.ticks >= BBT_Time::ticks_per_beat) { pos += llrint (frames_per_beat + /* extra beat */ - (frames_per_beat * ((op.ticks % (uint32_t) BBT_Time::ticks_per_beat) / + (frames_per_beat * ((op.ticks % (uint32_t) BBT_Time::ticks_per_beat) / (double) BBT_Time::ticks_per_beat))); } else { pos += llrint (frames_per_beat * (op.ticks / (double) BBT_Time::ticks_per_beat)); @@ -2420,7 +2420,7 @@ TempoMap::bbt_before_or_at (framepos_t pos) if (pos < 0) { /* not really correct, but we should catch pos < 0 at a higher - level + level */ return _map.begin(); } @@ -2456,7 +2456,7 @@ TempoMap::bbt_before_or_at (const BBT_Time& bbt) } TempoMap::BBTPointList::const_iterator -TempoMap::bbt_after_or_at (framepos_t pos) +TempoMap::bbt_after_or_at (framepos_t pos) { /* CALLER MUST HOLD READ LOCK */ @@ -2474,17 +2474,17 @@ TempoMap::bbt_after_or_at (framepos_t pos) return i; } -std::ostream& +std::ostream& operator<< (std::ostream& o, const Meter& m) { return o << m.divisions_per_bar() << '/' << m.note_divisor(); } -std::ostream& +std::ostream& operator<< (std::ostream& o, const Tempo& t) { return o << t.beats_per_minute() << " 1/" << t.note_type() << "'s per minute"; } -std::ostream& +std::ostream& operator<< (std::ostream& o, const MetricSection& section) { o << "MetricSection @ " << section.frame() << " aka " << section.start() << ' '; diff --git a/libs/ardour/test/framepos_minus_beats_test.cc b/libs/ardour/test/framepos_minus_beats_test.cc index cc6341fb0b..a96fec6531 100644 --- a/libs/ardour/test/framepos_minus_beats_test.cc +++ b/libs/ardour/test/framepos_minus_beats_test.cc @@ -46,14 +46,14 @@ FrameposMinusBeatsTest::doubleTempoTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames @@ -86,7 +86,7 @@ FrameposMinusBeatsTest::doubleTempoTest () tempo change (which shouldn't affect anything, since we are just dealing with beats) */ - + void FrameposMinusBeatsTest::doubleTempoWithMeterTest () { @@ -98,14 +98,14 @@ FrameposMinusBeatsTest::doubleTempoWithMeterTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames diff --git a/libs/ardour/test/framepos_plus_beats_test.cc b/libs/ardour/test/framepos_plus_beats_test.cc index efc57c5872..7069c54115 100644 --- a/libs/ardour/test/framepos_plus_beats_test.cc +++ b/libs/ardour/test/framepos_plus_beats_test.cc @@ -45,14 +45,14 @@ FrameposPlusBeatsTest::doubleTempoTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames @@ -85,7 +85,7 @@ FrameposPlusBeatsTest::doubleTempoTest () tempo change (which shouldn't affect anything, since we are just dealing with beats) */ - + void FrameposPlusBeatsTest::doubleTempoWithMeterTest () { @@ -97,14 +97,14 @@ FrameposPlusBeatsTest::doubleTempoWithMeterTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames diff --git a/libs/ardour/test/framewalk_to_beats_test.cc b/libs/ardour/test/framewalk_to_beats_test.cc index bcbd3e089f..501eca894e 100644 --- a/libs/ardour/test/framewalk_to_beats_test.cc +++ b/libs/ardour/test/framewalk_to_beats_test.cc @@ -51,14 +51,14 @@ FramewalkToBeatsTest::doubleTempoTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames @@ -107,7 +107,7 @@ FramewalkToBeatsTest::tripleTempoTest () /* 120bpm at bar 1, 240bpm at bar 2, 160bpm at bar 3 - + 120bpm = 24e3 samples per beat 160bpm = 18e3 samples per beat 240bpm = 12e3 samples per beat @@ -115,7 +115,7 @@ FramewalkToBeatsTest::tripleTempoTest () /* - + 120bpm 240bpm 160bpm 0 beats 4 beats 8 beats 0 frames 96e3 frames 144e3 frames diff --git a/libs/ardour/test/interpolation_test.cc b/libs/ardour/test/interpolation_test.cc index e8ed22d03b..7a91160e7a 100644 --- a/libs/ardour/test/interpolation_test.cc +++ b/libs/ardour/test/interpolation_test.cc @@ -82,7 +82,7 @@ InterpolationTest::linearInterpolationTest () } /* for (int i=0; i < NUM_SAMPLES; ++i) { - cout << i << " " << output[i] << endl; + cout << i << " " << output[i] << endl; } */ } diff --git a/libs/ardour/test/midi_clock_slave_test.cc b/libs/ardour/test/midi_clock_slave_test.cc index 4349df22eb..cea7a06ce9 100644 --- a/libs/ardour/test/midi_clock_slave_test.cc +++ b/libs/ardour/test/midi_clock_slave_test.cc @@ -24,11 +24,11 @@ MIDIClock_SlaveTest::testStepResponse () start (*parser, start_time); update_midi_clock (*parser, start_time); - + for (framecnt_t i = 1; i<= 100 * period_size; i++) { // simulate jitter framecnt_t input_delta = framecnt_t (one_ppqn_in_frames + 0.1 * (double(g_random_int()) / double (RAND_MAX)) * one_ppqn_in_frames); - + if (i % input_delta == 0) { update_midi_clock (*parser, start_time + i); } diff --git a/libs/ardour/test/midi_clock_slave_test.h b/libs/ardour/test/midi_clock_slave_test.h index 56bda2ba58..dd046fb8a8 100644 --- a/libs/ardour/test/midi_clock_slave_test.h +++ b/libs/ardour/test/midi_clock_slave_test.h @@ -1,16 +1,16 @@ -/* +/* * Copyright(C) 2000-2008 Paul Davis * Author: Hans Baier - * + * * Evoral 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. - * + * * Evoral 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 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., * 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA @@ -39,9 +39,9 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy { Meter meter; public: - TestSlaveSessionProxy() : - transport_speed (1.0), - _transport_frame (0), + TestSlaveSessionProxy() : + transport_speed (1.0), + _transport_frame (0), _frame_time (1000000), _tempo_map (0), tempo (120), @@ -49,14 +49,14 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy { { _tempo_map = new TempoMap (FRAME_RATE); _tempo_map->add_tempo (tempo, Timecode::BBT_Time(1, 1, 0)); - _tempo_map->add_meter (meter, Timecode::BBT_Time(1, 1, 0)); + _tempo_map->add_meter (meter, Timecode::BBT_Time(1, 1, 0)); } // Controlling the mock object void set_period_size (framecnt_t a_size) { _period_size = a_size; } framecnt_t period_size () const { return _period_size; } - void next_period () { - _transport_frame += double(_period_size) * double(transport_speed); + void next_period () { + _transport_frame += double(_period_size) * double(transport_speed); _frame_time += _period_size; } @@ -68,8 +68,8 @@ class TestSlaveSessionProxy : public ISlaveSessionProxy { pframes_t frames_since_cycle_start () const { return 0; } framepos_t frame_time () const { return _frame_time; } - void request_locate (framepos_t frame, bool with_roll = false) { - _transport_frame = frame; + void request_locate (framepos_t frame, bool with_roll = false) { + _transport_frame = frame; } void request_transport_speed (const double speed) { transport_speed = speed; } @@ -86,7 +86,7 @@ class MIDIClock_SlaveTest : public CppUnit::TestFixture, ARDOUR::MIDIClock_Slave void setUp() { } - + void tearDown() { } diff --git a/libs/ardour/test/tempo_test.cc b/libs/ardour/test/tempo_test.cc index fa9ad0a520..2cac1fa872 100644 --- a/libs/ardour/test/tempo_test.cc +++ b/libs/ardour/test/tempo_test.cc @@ -18,14 +18,14 @@ TempoTest::recomputeMapTest () /* 120bpm at bar 1, 240bpm at bar 4 - + 120bpm = 24e3 samples per beat 240bpm = 12e3 samples per beat */ /* - + 120bpm 240bpm 0 beats 12 beats 0 frames 288e3 frames diff --git a/libs/ardour/ticker.cc b/libs/ardour/ticker.cc index 7a2fa32ad7..3fe6e66b81 100644 --- a/libs/ardour/ticker.cc +++ b/libs/ardour/ticker.cc @@ -41,18 +41,18 @@ public: Position() : speed(0.0f), frame(0), midi_beats(0) { } ~Position() { } - + /** Sync timing information taken from the given Session - * @return True if timings differed + * @return True if timings differed */ bool sync (Session* s) { bool changed = false; - + double sp = s->transport_speed(); framecnt_t fr = s->transport_frame(); - + if (speed != sp) { speed = sp; changed = true; @@ -75,7 +75,7 @@ public: double mb; /** Midi Beats in terms of Song Position Pointer is equivalent to total - * sixteenth notes at 'time' + * sixteenth notes at 'time' */ mb = (((bars - 1) * divisions) + beats - 1); @@ -95,7 +95,7 @@ public: framecnt_t frame; double midi_beats; double midi_clocks; - + void print (std::ostream& s) { s << "frames: " << frame << " midi beats: " << midi_beats << " speed: " << speed; } diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index 2d46c60132..2c9e71ca46 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -932,9 +932,9 @@ Track::adjust_capture_buffering () #ifdef USE_TRACKS_CODE_FEATURES -/* This is the Tracks version of Track::monitoring_state(). +/* This is the Tracks version of Track::monitoring_state(). * - * Ardour developers: try to flag or fix issues if parts of the libardour API + * Ardour developers: try to flag or fix issues if parts of the libardour API * change in ways that invalidate this */ @@ -984,7 +984,7 @@ Track::monitoring_state () const #else -/* This is the Ardour/Mixbus version of Track::monitoring_state(). +/* This is the Ardour/Mixbus version of Track::monitoring_state(). * * Tracks developers: do NOT modify this method under any circumstances. */ @@ -1111,7 +1111,7 @@ Track::check_initial_delay (framecnt_t nframes, framepos_t& transport_frame) } - return nframes; + return nframes; } void diff --git a/libs/ardour/transient_detector.cc b/libs/ardour/transient_detector.cc index 5c92d2c843..5167828691 100644 --- a/libs/ardour/transient_detector.cc +++ b/libs/ardour/transient_detector.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/user_bundle.cc b/libs/ardour/user_bundle.cc index 312a3c58ed..aaafcb0479 100644 --- a/libs/ardour/user_bundle.cc +++ b/libs/ardour/user_bundle.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Paul Davis + Copyright (C) 2012 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 diff --git a/libs/ardour/utils.cc b/libs/ardour/utils.cc index 9f44f78705..eb4db99d87 100644 --- a/libs/ardour/utils.cc +++ b/libs/ardour/utils.cc @@ -133,7 +133,7 @@ ARDOUR::legalize_for_uri (const string& str) * version. */ -string +string ARDOUR::legalize_for_path_2X (const string& str) { string::size_type pos; |