diff options
Diffstat (limited to 'libs/ardour/ardour')
173 files changed, 1856 insertions, 1858 deletions
diff --git a/libs/ardour/ardour/amp.h b/libs/ardour/ardour/amp.h index 7be324dba1..f0a65c4ef5 100644 --- a/libs/ardour/ardour/amp.h +++ b/libs/ardour/ardour/amp.h @@ -1,16 +1,16 @@ /* - Copyright (C) 2006 Paul Davis - + Copyright (C) 2006 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 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. @@ -43,7 +43,7 @@ public: bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const; bool configure_io (ChanCount in, ChanCount out); - + void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes); bool apply_gain() const { return _apply_gain; } @@ -71,15 +71,15 @@ public: struct GainControl : public AutomationControl { GainControl (std::string name, Session& session, Amp* a, const Evoral::Parameter ¶m, - boost::shared_ptr<AutomationList> al = boost::shared_ptr<AutomationList>() ) - : AutomationControl (session, param, al, name ) + boost::shared_ptr<AutomationList> al = boost::shared_ptr<AutomationList>() ) + : AutomationControl (session, param, al, name) , _amp (a) {} - - void set_value (float val); - float get_value (void) const; - - Amp* _amp; + + void set_value (float val); + float get_value (void) const; + + Amp* _amp; }; boost::shared_ptr<GainControl> gain_control() { @@ -96,7 +96,7 @@ private: bool _apply_gain_automation; float _current_gain; - boost::shared_ptr<GainControl> _gain_control; + boost::shared_ptr<GainControl> _gain_control; boost::shared_ptr<MuteMaster> _mute_master; }; diff --git a/libs/ardour/ardour/analyser.h b/libs/ardour/ardour/analyser.h index 8771cab6b0..15e4220ad6 100644 --- a/libs/ardour/ardour/analyser.h +++ b/libs/ardour/ardour/analyser.h @@ -19,13 +19,13 @@ class Analyser { static void init (); static void queue_source_for_analysis (boost::shared_ptr<Source>, bool force); static void work (); - + private: static Analyser* the_analyser; static Glib::StaticMutex analysis_queue_lock; static Glib::Cond* SourcesToAnalyse; static std::list<boost::weak_ptr<Source> > analysis_queue; - + static void analyse_audio_file_source (boost::shared_ptr<AudioFileSource>); }; diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 4ea020403c..d7c67998c7 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -58,7 +58,7 @@ namespace ARDOUR { microseconds_t get_microseconds (); /* { - JACK has exported this functionality for a long time now + JACK has exported this functionality for a long time now but inlining this causes problems return (microseconds_t) jack_get_time(); } @@ -72,9 +72,9 @@ namespace ARDOUR { extern Change BoundsChanged; struct LocaleGuard { - LocaleGuard (const char*); - ~LocaleGuard (); - const char* old; + LocaleGuard (const char*); + ~LocaleGuard (); + const char* old; }; static const double SHUTTLE_FRACT_SPEED1=0.48412291827; /* derived from A1,A2 */ @@ -85,7 +85,7 @@ namespace ARDOUR { extern MIDI::Port* default_mtc_port; extern MIDI::Port* default_midi_port; extern MIDI::Port *default_midi_clock_port; - + int setup_midi (); } diff --git a/libs/ardour/ardour/audio_buffer.h b/libs/ardour/ardour/audio_buffer.h index be1af03061..65eb38d6db 100644 --- a/libs/ardour/ardour/audio_buffer.h +++ b/libs/ardour/ardour/audio_buffer.h @@ -1,16 +1,16 @@ /* - Copyright (C) 2006 Paul Davis - + Copyright (C) 2006 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 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. @@ -41,7 +41,7 @@ public: } _written = true; } - + /** Read @a len frames @a src starting at @a src_offset into self starting at @ dst_offset*/ void read_from (const Buffer& src, nframes_t len, nframes_t dst_offset = 0, nframes_t src_offset = 0) { assert(&src != this); @@ -63,7 +63,7 @@ public: assert (ab); accumulate_from (*ab, len, dst_offset, src_offset); } - + /** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @ dst_offset*/ void accumulate_from (const AudioBuffer& src, nframes_t len, nframes_t dst_offset = 0, nframes_t src_offset = 0) { assert(_capacity > 0); @@ -77,7 +77,7 @@ public: _silent = (src.silent() && _silent); _written = true; } - + /** Acumulate (add) @a len frames @a src starting at @a src_offset into self starting at @ dst_offset * scaling by @a gain_coeff */ void accumulate_with_gain_from (const AudioBuffer& src, nframes_t len, gain_t gain_coeff, nframes_t dst_offset = 0, nframes_t src_offset = 0) { @@ -112,13 +112,13 @@ public: _silent = (_silent && gain_coeff == 0); _written = true; } - + void apply_gain (gain_t gain, nframes_t len) { apply_gain_to_buffer (_data, len, gain); } /** Set the data contained by this buffer manually (for setting directly to jack buffer). - * + * * Constructor MUST have been passed capacity=0 or this will die (to prevent mem leaks). */ void set_data (Sample* data, size_t size) { @@ -131,20 +131,20 @@ public: } /** Reallocate the buffer used internally to handle at least @nframes of data - * + * * Constructor MUST have been passed capacity!=0 or this will die (to prevent mem leaks). */ void resize (size_t nframes); - const Sample* data (nframes_t offset = 0) const { - assert(offset <= _capacity); - return _data + offset; + const Sample* data (nframes_t offset = 0) const { + assert(offset <= _capacity); + return _data + offset; } - Sample* data (nframes_t offset = 0) { - assert(offset <= _capacity); - return _data + offset; + Sample* data (nframes_t offset = 0) { + assert(offset <= _capacity); + return _data + offset; } void prepare () { _written = false; } @@ -154,7 +154,7 @@ public: bool _owns_data; bool _written; Sample* _data; ///< Actual buffer contents - + }; diff --git a/libs/ardour/ardour/audio_diskstream.h b/libs/ardour/ardour/audio_diskstream.h index 23744dfc57..a8072695ff 100644 --- a/libs/ardour/ardour/audio_diskstream.h +++ b/libs/ardour/ardour/audio_diskstream.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-2006 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,8 +31,8 @@ #include "pbd/fastlog.h" #include "pbd/ringbufferNPT.h" -#include "pbd/stateful.h" -#include "pbd/rcu.h" +#include "pbd/stateful.h" +#include "pbd/rcu.h" #include "ardour/ardour.h" #include "ardour/utils.h" @@ -53,7 +53,7 @@ class AudioFileSource; class IO; class AudioDiskstream : public Diskstream -{ +{ public: AudioDiskstream (Session &, const std::string& name, Diskstream::Flag f = Recordable); AudioDiskstream (Session &, const XMLNode&); @@ -67,13 +67,13 @@ class AudioDiskstream : public Diskstream if (n < c->size()) { return (*c)[n]->source ? (*c)[n]->source->name() : ""; } else { - return ""; + return ""; } } - Port *input_source_port (uint32_t n=0) const { + Port *input_source_port (uint32_t n=0) const { boost::shared_ptr<ChannelList> c = channels.reader(); - if (n < c->size()) return (*c)[n]->source; return 0; + if (n < c->size()) return (*c)[n]->source; return 0; } void set_record_enabled (bool yn); @@ -81,7 +81,7 @@ class AudioDiskstream : public Diskstream int set_non_layered (bool yn); bool can_become_destructive (bool& requires_bounce) const; - float peak_power(uint32_t n = 0) { + float peak_power(uint32_t n = 0) { boost::shared_ptr<ChannelList> c = channels.reader(); ChannelInfo* chaninfo = (*c)[n]; float x = chaninfo->peak_power; @@ -92,7 +92,7 @@ class AudioDiskstream : public Diskstream return minus_infinity(); } } - + boost::shared_ptr<AudioPlaylist> audio_playlist () { return boost::dynamic_pointer_cast<AudioPlaylist>(_playlist); } int use_playlist (boost::shared_ptr<Playlist>); @@ -105,7 +105,7 @@ class AudioDiskstream : public Diskstream return (*c)[n]->current_playback_buffer; return 0; } - + Sample *capture_buffer (uint32_t n = 0) { boost::shared_ptr<ChannelList> c = channels.reader(); if (n < c->size()) @@ -122,7 +122,7 @@ class AudioDiskstream : public Diskstream int add_channel (uint32_t how_many); int remove_channel (uint32_t how_many); - + /* stateful */ XMLNode& get_state(void); @@ -145,11 +145,11 @@ class AudioDiskstream : public Diskstream *last-- = tmp; } } - + CubicInterpolation interpolation; XMLNode* deprecated_io_node; - + protected: friend class Session; @@ -181,53 +181,52 @@ class AudioDiskstream : public Diskstream private: struct ChannelInfo { - - ChannelInfo (nframes_t buffer_size, nframes_t speed_buffer_size, nframes_t wrap_buffer_size); - ~ChannelInfo (); - - Sample *playback_wrap_buffer; - Sample *capture_wrap_buffer; - Sample *speed_buffer; - - float peak_power; - - boost::shared_ptr<AudioFileSource> fades_source; - boost::shared_ptr<AudioFileSource> write_source; - - /// the Port that our audio data comes from - Port *source; - Sample *current_capture_buffer; - Sample *current_playback_buffer; - - RingBufferNPT<Sample> *playback_buf; - RingBufferNPT<Sample> *capture_buf; - - Sample* scrub_buffer; - Sample* scrub_forward_buffer; - Sample* scrub_reverse_buffer; - - RingBufferNPT<Sample>::rw_vector playback_vector; - RingBufferNPT<Sample>::rw_vector capture_vector; - - RingBufferNPT<CaptureTransition> * capture_transition_buf; - // the following are used in the butler thread only - nframes_t curr_capture_cnt; + + ChannelInfo (nframes_t buffer_size, nframes_t speed_buffer_size, nframes_t wrap_buffer_size); + ~ChannelInfo (); + + Sample *playback_wrap_buffer; + Sample *capture_wrap_buffer; + Sample *speed_buffer; + + float peak_power; + + boost::shared_ptr<AudioFileSource> fades_source; + boost::shared_ptr<AudioFileSource> write_source; + + /// the Port that our audio data comes from + Port *source; + Sample *current_capture_buffer; + Sample *current_playback_buffer; + + RingBufferNPT<Sample> *playback_buf; + RingBufferNPT<Sample> *capture_buf; + + Sample* scrub_buffer; + Sample* scrub_forward_buffer; + Sample* scrub_reverse_buffer; + + RingBufferNPT<Sample>::rw_vector playback_vector; + RingBufferNPT<Sample>::rw_vector capture_vector; + + RingBufferNPT<CaptureTransition> * capture_transition_buf; + // the following are used in the butler thread only + nframes_t curr_capture_cnt; }; typedef std::vector<ChannelInfo*> ChannelList; void process_varispeed_playback(nframes_t nframes, boost::shared_ptr<ChannelList> c); - + /* The two central butler operations */ int do_flush (RunContext context, bool force = false); int do_refill () { return _do_refill(_mixdown_buffer, _gain_buffer); } - + int do_refill_with_alloc (); int read (Sample* buf, Sample* mixdown_buffer, float* gain_buffer, - nframes_t& start, nframes_t cnt, - ChannelInfo* channel_info, int channel, bool reversed); - + nframes_t& start, nframes_t cnt, + ChannelInfo* channel_info, int channel, bool reversed); void finish_capture (bool rec_monitors_input, boost::shared_ptr<ChannelList>); void transport_stopped (struct tm&, time_t, bool abort); @@ -237,7 +236,7 @@ class AudioDiskstream : public Diskstream void init_channel (ChannelInfo &chan); void destroy_channel (ChannelInfo &chan); - + int use_new_write_source (uint32_t n=0); int find_and_use_playlist (const std::string &); @@ -264,9 +263,9 @@ class AudioDiskstream : public Diskstream static gain_t* _gain_buffer; std::vector<boost::shared_ptr<AudioFileSource> > capturing_sources; - + SerializedRCUManager<ChannelList> channels; - + /* really */ private: int _do_refill (Sample *mixdown_buffer, float *gain_buffer); diff --git a/libs/ardour/ardour/audio_library.h b/libs/ardour/ardour/audio_library.h index ed18ae9cbf..aada317dbd 100644 --- a/libs/ardour/ardour/audio_library.h +++ b/libs/ardour/ardour/audio_library.h @@ -38,7 +38,7 @@ class AudioLibrary void search_members_and (std::vector<std::string>& results, const std::vector<std::string> tags); void save_changes(); - + private: std::string src; }; diff --git a/libs/ardour/ardour/audio_playlist_importer.h b/libs/ardour/ardour/audio_playlist_importer.h index 5ae87cea01..5ab8ae9b26 100644 --- a/libs/ardour/ardour/audio_playlist_importer.h +++ b/libs/ardour/ardour/audio_playlist_importer.h @@ -49,12 +49,12 @@ class AudioPlaylistImportHandler : public ElementImportHandler AudioPlaylistImportHandler (XMLTree const & source, Session & session, AudioRegionImportHandler & region_handler, const char * nodename = "Playlists"); virtual ~AudioPlaylistImportHandler () {} virtual std::string get_info () const; - + void get_regions (XMLNode const & node, ElementList & list) const; void update_region_id (XMLProperty* id_prop); void playlists_by_diskstream (PBD::ID const & id, PlaylistList & list) const; - + protected: AudioRegionImportHandler & region_handler; }; @@ -75,7 +75,7 @@ class AudioPlaylistImporter : public ElementImporter ~AudioPlaylistImporter (); std::string get_info () const; - + void set_diskstream (PBD::ID const & id); PBD::ID const & orig_diskstream () const { return orig_diskstream_id; } diff --git a/libs/ardour/ardour/audio_port.h b/libs/ardour/ardour/audio_port.h index 09bd8bdd1e..0c08795819 100644 --- a/libs/ardour/ardour/audio_port.h +++ b/libs/ardour/ardour/audio_port.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2009 Paul Davis + Copyright (C) 2002-2009 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 @@ -26,37 +26,37 @@ namespace ARDOUR { -class AudioPort : public Port +class AudioPort : public Port { public: ~AudioPort (); - + DataType type () const { return DataType::AUDIO; } - + void cycle_start (nframes_t); void cycle_end (nframes_t); void cycle_split (); - + size_t raw_buffer_size(jack_nframes_t nframes) const; Buffer& get_buffer (nframes_t nframes, nframes_t offset = 0) { return get_audio_buffer (nframes, offset); } - + AudioBuffer& get_audio_buffer (nframes_t nframes, nframes_t offset = 0); protected: friend class AudioEngine; AudioPort (std::string const &, Flags); - + private: AudioBuffer* _buffer; }; - + } // namespace ARDOUR #endif /* __ardour_audio_port_h__ */ diff --git a/libs/ardour/ardour/audio_region_importer.h b/libs/ardour/ardour/audio_region_importer.h index 71e8718ce8..d6d5c192d9 100644 --- a/libs/ardour/ardour/audio_region_importer.h +++ b/libs/ardour/ardour/audio_region_importer.h @@ -44,9 +44,9 @@ class AudioRegionImportHandler : public ElementImportHandler // Inerface implementation AudioRegionImportHandler (XMLTree const & source, Session & session); std::string get_info () const; - + void create_regions_from_children (XMLNode const & node, ElementList & list); - + // Source management bool check_source (std::string const & filename) const; void add_source (std::string const & filename, boost::shared_ptr<Source> const & source); @@ -77,7 +77,7 @@ class AudioRegionImporter : public ElementImporter // Interface implementation std::string get_info () const; Session::ImportStatus * get_import_status () { return &status; } - + // other stuff void add_sources_to_session (); XMLNode const & get_xml (); @@ -95,11 +95,11 @@ class AudioRegionImporter : public ElementImporter PBD::ID id; std::list<std::string> filenames; Session::ImportStatus status; - + bool parse_xml_region (); bool parse_source_xml (); PBD::sys::path get_sound_dir (XMLTree const & tree); - + void prepare_region (); void prepare_sources (); std::vector<boost::shared_ptr<Region> > region; diff --git a/libs/ardour/ardour/audio_track.h b/libs/ardour/ardour/audio_track.h index 5813c2d697..bdbc4b8165 100644 --- a/libs/ardour/ardour/audio_track.h +++ b/libs/ardour/ardour/audio_track.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2006 Paul Davis + Copyright (C) 2002-2006 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 @@ -36,17 +36,17 @@ class AudioTrack : public Track AudioTrack (Session&, const XMLNode&); ~AudioTrack (); - int set_mode (TrackMode m); + int set_mode (TrackMode m); bool can_use_mode (TrackMode m, bool& bounce_required); - int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, - int declick, bool can_record, bool rec_monitors_input); + int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, + int declick, bool can_record, bool rec_monitors_input); boost::shared_ptr<AudioDiskstream> audio_diskstream() const; int use_diskstream (std::string name); int use_diskstream (const PBD::ID& id); - + int export_stuff (BufferSet& bufs, sframes_t start_frame, nframes_t nframes, bool enable_processing = true); void freeze (InterThreadInfo&); @@ -59,7 +59,7 @@ class AudioTrack : public Track protected: XMLNode& state (bool full); - + int _set_state (const XMLNode&, bool call_base); private: diff --git a/libs/ardour/ardour/audio_track_importer.h b/libs/ardour/ardour/audio_track_importer.h index 59b5b520ac..683417de24 100644 --- a/libs/ardour/ardour/audio_track_importer.h +++ b/libs/ardour/ardour/audio_track_importer.h @@ -70,18 +70,18 @@ class AudioTrackImporter : public ElementImporter bool parse_route_xml (); bool parse_io (); - + bool parse_processor (XMLNode & node); bool parse_controllable (XMLNode & node); bool parse_automation (XMLNode & node); bool rate_convert_events (XMLNode & node); - + AudioTrackImportHandler & track_handler; XMLNode xml_track; - + PBD::ID old_ds_id; PBD::ID new_ds_id; - + PlaylistList playlists; AudioPlaylistImportHandler & pl_handler; }; diff --git a/libs/ardour/ardour/audio_unit.h b/libs/ardour/ardour/audio_unit.h index 83d85ec5d0..a1f22a88df 100644 --- a/libs/ardour/ardour/audio_unit.h +++ b/libs/ardour/ardour/audio_unit.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis Written by Taybin Rutkin This program is free software; you can redistribute it and/or modify @@ -64,7 +64,7 @@ class AUPlugin : public ARDOUR::Plugin AUPlugin (AudioEngine& engine, Session& session, boost::shared_ptr<CAComponent> comp); AUPlugin (const AUPlugin& other); virtual ~AUPlugin (); - + std::string unique_id () const; const char * label () const; const char * name () const { return _info->name.c_str(); } @@ -74,34 +74,34 @@ class AUPlugin : public ARDOUR::Plugin nframes_t latency () const; void set_parameter (uint32_t which, float val); float get_parameter (uint32_t which) const; - + int get_parameter_descriptor (uint32_t which, ParameterDescriptor&) const; uint32_t nth_parameter (uint32_t which, bool& ok) const; void activate (); void deactivate (); void set_block_size (nframes_t nframes); - + int connect_and_run (vector<Sample*>& bufs, uint32_t maxbuf, int32_t& in, int32_t& out, nframes_t nframes, nframes_t offset); std::set<uint32_t> automatable() const; string describe_parameter (uint32_t); string state_node_name () const { return "audiounit"; } void print_parameter (uint32_t, char*, uint32_t len) const; - + bool parameter_is_audio (uint32_t) const; bool parameter_is_control (uint32_t) const; bool parameter_is_input (uint32_t) const; bool parameter_is_output (uint32_t) const; - + XMLNode& get_state(); int set_state(const XMLNode& node); - + bool save_preset (string name); bool load_preset (const string preset_label); std::vector<std::string> get_presets (); std::string current_preset() const; bool has_editor () const; - + int32_t can_do (int32_t in, int32_t& out); uint32_t output_streams() const; uint32_t input_streams() const; @@ -109,17 +109,17 @@ class AUPlugin : public ARDOUR::Plugin boost::shared_ptr<CAAudioUnit> get_au () { return unit; } boost::shared_ptr<CAComponent> get_comp () const { return comp; } - - OSStatus render_callback(AudioUnitRenderActionFlags *ioActionFlags, - const AudioTimeStamp *inTimeStamp, - UInt32 inBusNumber, - UInt32 inNumberFrames, - AudioBufferList* ioData); + + OSStatus render_callback(AudioUnitRenderActionFlags *ioActionFlags, + const AudioTimeStamp *inTimeStamp, + UInt32 inBusNumber, + UInt32 inNumberFrames, + AudioBufferList* ioData); private: - boost::shared_ptr<CAComponent> comp; - boost::shared_ptr<CAAudioUnit> unit; - - bool initialized; + boost::shared_ptr<CAComponent> comp; + boost::shared_ptr<CAAudioUnit> unit; + + bool initialized; int32_t input_channels; int32_t output_channels; std::vector<std::pair<int,int> > io_configs; @@ -133,7 +133,7 @@ class AUPlugin : public ARDOUR::Plugin UInt32 global_elements; UInt32 output_elements; UInt32 input_elements; - + int set_output_format (AudioStreamBasicDescription&); int set_input_format (AudioStreamBasicDescription&); int set_stream_format (int scope, uint32_t cnt, AudioStreamBasicDescription&); @@ -142,24 +142,24 @@ class AUPlugin : public ARDOUR::Plugin std::vector<std::pair<uint32_t, uint32_t> > parameter_map; uint32_t current_maxbuf; - nframes_t current_offset; - nframes_t cb_offset; - vector<Sample*>* current_buffers; - nframes_t frames_processed; - + nframes_t current_offset; + nframes_t cb_offset; + vector<Sample*>* current_buffers; + nframes_t frames_processed; + std::vector<AUParameterDescriptor> descriptors; void init (); }; - + typedef boost::shared_ptr<AUPlugin> AUPluginPtr; -struct AUPluginCachedInfo { +struct AUPluginCachedInfo { std::vector<std::pair<int,int> > io_configs; }; class AUPluginInfo : public PluginInfo { - public: - AUPluginInfo (boost::shared_ptr<CAComponentDescription>); + public: + AUPluginInfo (boost::shared_ptr<CAComponentDescription>); ~AUPluginInfo (); PluginPtr load (Session& session); @@ -175,7 +175,7 @@ class AUPluginInfo : public PluginInfo { private: boost::shared_ptr<CAComponentDescription> descriptor; UInt32 version; - + static void discover_music (PluginInfoList&); static void discover_fx (PluginInfoList&); static void discover_generators (PluginInfoList&); @@ -184,7 +184,7 @@ class AUPluginInfo : public PluginInfo { typedef std::map<std::string,AUPluginCachedInfo> CachedInfoMap; static CachedInfoMap cached_info; - + static bool cached_io_configuration (const std::string&, UInt32, CAComponent&, AUPluginCachedInfo&, const std::string& name); static void add_cached_info (const std::string&, AUPluginCachedInfo&); static void save_cached_info (); diff --git a/libs/ardour/ardour/audioanalyser.h b/libs/ardour/ardour/audioanalyser.h index 824e63d312..627dc3f137 100644 --- a/libs/ardour/ardour/audioanalyser.h +++ b/libs/ardour/ardour/audioanalyser.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Paul Davis + Copyright (C) 2008 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 @@ -41,7 +41,7 @@ class AudioAnalyser : public boost::noncopyable { AudioAnalyser (float sample_rate, AnalysisPluginKey key); virtual ~AudioAnalyser(); - + /* analysis object should provide a run method that accepts a path to write the results to (optionally empty) a Readable* to read data from @@ -58,7 +58,7 @@ class AudioAnalyser : public boost::noncopyable { nframes64_t bufsize; nframes64_t stepsize; - + int initialize_plugin (AnalysisPluginKey name, float sample_rate); int analyse (const std::string& path, Readable*, uint32_t channel); diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index f0bd7cdb3d..9d3bfdb719 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2004 Paul Davis + Copyright (C) 2002-2004 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 @@ -52,7 +52,7 @@ class AudioEngine : public sigc::trackable AudioEngine (std::string client_name); virtual ~AudioEngine (); - + jack_client_t* jack() const; bool connected() const { return _jack != 0; } @@ -94,12 +94,12 @@ class AudioEngine : public sigc::trackable if (!_running || !_jack) return 0; return jack_get_current_transport_frame (_jack); } - + int request_buffer_size (nframes_t); - + nframes_t set_monitor_check_interval (nframes_t); - float get_cpu_load() { + float get_cpu_load() { if (!_running || !_jack) return 0; return jack_cpu_load (_jack); } @@ -108,18 +108,18 @@ class AudioEngine : public sigc::trackable void remove_session (); class PortRegistrationFailure : public std::exception { - public: + public: PortRegistrationFailure (const char* why = "") { reason = why; } virtual const char *what() const throw() { return reason; } - private: + private: const char* reason; }; class NoBackendAvailable : public std::exception { - public: + public: virtual const char *what() const throw() { return "could not connect to engine backend"; } }; @@ -128,11 +128,11 @@ class AudioEngine : public sigc::trackable int unregister_port (Port &); void split_cycle (nframes_t offset); - + int connect (const std::string& source, const std::string& destination); int disconnect (const std::string& source, const std::string& destination); int disconnect (Port &); - + const char ** get_ports (const std::string& port_name_pattern, const std::string& type_name_pattern, uint32_t flags); bool can_request_hardware_monitoring (); @@ -204,7 +204,7 @@ class AudioEngine : public sigc::trackable sigc::signal<void> Stopped; /* this signal is emitted if a JACK port is registered or unregistered */ - + sigc::signal<void> PortRegisteredOrUnregistered; std::string make_port_name_relative (std::string); diff --git a/libs/ardour/ardour/audiofile_tagger.h b/libs/ardour/ardour/audiofile_tagger.h index 9da84df561..0519e2233c 100644 --- a/libs/ardour/ardour/audiofile_tagger.h +++ b/libs/ardour/ardour/audiofile_tagger.h @@ -38,7 +38,7 @@ class AudiofileTagger public: /* Tags file with metadata, return true on success */ - + static bool tag_file (std::string const & filename, SessionMetadata const & metadata); private: diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h index b161bcada1..4da7943a2d 100644 --- a/libs/ardour/ardour/audiofilesource.h +++ b/libs/ardour/ardour/audiofilesource.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 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 @@ -17,7 +17,7 @@ */ -#ifndef __ardour_audiofilesource_h__ +#ifndef __ardour_audiofilesource_h__ #define __ardour_audiofilesource_h__ #include <exception> @@ -42,10 +42,10 @@ public: bool set_name (const std::string& newname) { return (set_source_name(newname, destructive()) == 0); } - + Glib::ustring peak_path (Glib::ustring audio_path); Glib::ustring find_broken_peakfile (Glib::ustring missing_peak_path, - Glib::ustring audio_path); + Glib::ustring audio_path); static void set_peak_dir (Glib::ustring dir) { peak_dir = dir; } @@ -75,12 +75,12 @@ public: int set_state (const XMLNode&); bool can_truncate_peaks() const { return !destructive(); } - bool can_be_analysed() const { return _length > 0; } - + bool can_be_analysed() const { return _length > 0; } + static bool safe_audio_file_extension (const Glib::ustring& path); - + static bool is_empty (Session&, Glib::ustring path); - + static void set_bwf_serial_number (int); static void set_header_position_offset (nframes_t offset ); @@ -92,16 +92,16 @@ protected: /** Constructor to be called for new in-session files */ AudioFileSource (Session&, const Glib::ustring& path, bool embedded, Source::Flag flags, - SampleFormat samp_format, HeaderFormat hdr_format); + SampleFormat samp_format, HeaderFormat hdr_format); /** Constructor to be called for existing in-session files */ AudioFileSource (Session&, const XMLNode&, bool must_exist = true); int init (const Glib::ustring& idstr, bool must_exist); - + virtual void set_header_timeline_position () = 0; virtual void handle_header_position_change () {} - + int move_dependents_to_trash(); static Sample* get_interleave_buffer (nframes_t size); diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h index 1d4118cf83..32fc77f2d6 100644 --- a/libs/ardour/ardour/audioplaylist.h +++ b/libs/ardour/ardour/audioplaylist.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003 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 @@ -37,7 +37,7 @@ class AudioPlaylist : public ARDOUR::Playlist { public: typedef std::list<boost::shared_ptr<Crossfade> > Crossfades; - + public: AudioPlaylist (Session&, const XMLNode&, bool hidden = false); AudioPlaylist (Session&, std::string name, bool hidden = false); @@ -52,7 +52,7 @@ class AudioPlaylist : public ARDOUR::Playlist int set_state (const XMLNode&); - sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade; + sigc::signal<void,boost::shared_ptr<Crossfade> > NewCrossfade; void foreach_crossfade (sigc::slot<void, boost::shared_ptr<Crossfade> >); void crossfades_at (nframes_t frame, Crossfades&); @@ -66,7 +66,7 @@ class AudioPlaylist : public ARDOUR::Playlist void flush_notifications (); void finalize_split_region (boost::shared_ptr<Region> orig, boost::shared_ptr<Region> left, boost::shared_ptr<Region> right); - + void refresh_dependents (boost::shared_ptr<Region> region); void check_dependents (boost::shared_ptr<Region> region, bool norefresh); void remove_dependents (boost::shared_ptr<Region> region); diff --git a/libs/ardour/ardour/audioregion.h b/libs/ardour/ardour/audioregion.h index cda9cab878..ff718bb4b0 100644 --- a/libs/ardour/ardour/audioregion.h +++ b/libs/ardour/ardour/audioregion.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-2006 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 @@ -65,7 +65,7 @@ class AudioRegion : public Region void set_scale_amplitude (gain_t); gain_t scale_amplitude() const { return _scale_amplitude; } - + void normalize_to (float target_in_dB = 0.0f); bool envelope_active () const { return _flags & Region::EnvelopeActive; } @@ -77,9 +77,9 @@ class AudioRegion : public Region boost::shared_ptr<AutomationList> envelope() { return _envelope; } virtual nframes_t read_peaks (PeakData *buf, nframes_t npeaks, - nframes_t offset, nframes_t cnt, - uint32_t chan_n=0, double samples_per_unit= 1.0) const; - + nframes_t offset, nframes_t cnt, + uint32_t chan_n=0, double samples_per_unit= 1.0) const; + /* Readable interface */ enum ReadOps { @@ -89,7 +89,7 @@ class AudioRegion : public Region ReadOpsCount = 0x4, ReadOpsFades = 0x8 }; - + virtual nframes_t read (Sample*, sframes_t pos, nframes_t cnt, int channel) const; virtual nframes_t read_with_ops (Sample*, sframes_t pos, nframes_t cnt, int channel, ReadOps rops) const; virtual nframes64_t readable_length() const { return length(); } @@ -100,10 +100,10 @@ class AudioRegion : public Region uint32_t chan_n = 0, nframes_t read_frames = 0, nframes_t skip_frames = 0) const; - + virtual nframes_t master_read_at (Sample *buf, Sample *mixdown_buf, float *gain_buf, sframes_t position, nframes_t cnt, uint32_t chan_n=0) const; - + virtual nframes_t read_raw_internal (Sample*, sframes_t, nframes_t, int channel) const; XMLNode& state (bool); @@ -135,9 +135,9 @@ class AudioRegion : public Region void set_default_envelope (); int separate_by_channel (ARDOUR::Session&, std::vector<boost::shared_ptr<Region> >&) const; - + /* automation */ - + boost::shared_ptr<Evoral::Control> control(const Evoral::Parameter& id, bool create=false) { return _automatable.data().control(id, create); @@ -185,12 +185,12 @@ class AudioRegion : public Region void recompute_gain_at_start (); nframes_t _read_at (const SourceList&, nframes_t limit, - Sample *buf, Sample *mixdown_buffer, float *gain_buffer, - sframes_t position, nframes_t cnt, - uint32_t chan_n = 0, - nframes_t read_frames = 0, - nframes_t skip_frames = 0, - ReadOps readops = ReadOps (~0)) const; + Sample *buf, Sample *mixdown_buffer, float *gain_buffer, + sframes_t position, nframes_t cnt, + uint32_t chan_n = 0, + nframes_t read_frames = 0, + nframes_t skip_frames = 0, + ReadOps readops = ReadOps (~0)) const; void recompute_at_start (); void recompute_at_end (); @@ -217,7 +217,7 @@ class AudioRegion : public Region protected: /* default constructor for derived (compound) types */ - AudioRegion (Session& s, nframes_t, nframes_t, std::string name); + AudioRegion (Session& s, nframes_t, nframes_t, std::string name); int set_live_state (const XMLNode&, Change&, bool send); }; diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index d097025e52..bc06642c33 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -32,7 +32,7 @@ #include "ardour/source.h" #include "ardour/ardour.h" -#include "pbd/stateful.h" +#include "pbd/stateful.h" #include "pbd/xml++.h" namespace ARDOUR { @@ -48,7 +48,7 @@ class AudioSource : virtual public Source, nframes64_t readable_length() const { return _length; } uint32_t n_channels() const { return 1; } - + sframes_t length (sframes_t pos) const; void update_length (sframes_t pos, sframes_t cnt); @@ -69,15 +69,15 @@ class AudioSource : virtual public Source, uint32_t read_data_count() const { return _read_data_count; } uint32_t write_data_count() const { return _write_data_count; } - int read_peaks (PeakData *peaks, nframes_t npeaks, + int read_peaks (PeakData *peaks, nframes_t npeaks, sframes_t start, nframes_t cnt, double samples_per_visual_peak) const; - int build_peaks (); + int build_peaks (); bool peaks_ready (sigc::slot<void>, sigc::connection&) const; mutable sigc::signal<void> PeaksReady; mutable sigc::signal<void,nframes_t,nframes_t> PeakRangeReady; - + XMLNode& get_state (); int set_state (const XMLNode&); @@ -117,7 +117,7 @@ class AudioSource : virtual public Source, int initialize_peakfile (bool newfile, Glib::ustring path); int build_peaks_from_scratch (); int compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframes_t cnt, - bool force, bool intermediate_peaks_ready_signal); + bool force, bool intermediate_peaks_ready_signal); void truncate_peakfile(); mutable off_t _peak_byte_max; // modified in compute_and_write_peak() @@ -127,13 +127,13 @@ class AudioSource : virtual public Source, virtual Glib::ustring peak_path(Glib::ustring audio_path) = 0; virtual Glib::ustring find_broken_peakfile (Glib::ustring missing_peak_path, Glib::ustring audio_path) = 0; - - virtual int read_peaks_with_fpp (PeakData *peaks, - nframes_t npeaks, sframes_t start, nframes_t cnt, - double samples_per_visual_peak, nframes_t fpp) const; + + virtual int read_peaks_with_fpp (PeakData *peaks, + nframes_t npeaks, sframes_t start, nframes_t cnt, + double samples_per_visual_peak, nframes_t fpp) const; int compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframes_t cnt, - bool force, bool intermediate_peaks_ready_signal, nframes_t frames_per_peak); + bool force, bool intermediate_peaks_ready_signal, nframes_t frames_per_peak); private: int peakfile; diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index 6114da0552..aa525b68c9 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 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 @@ -46,7 +46,7 @@ class Auditioner : public AudioTrack int play_audition (nframes_t nframes); - void cancel_audition () { + void cancel_audition () { g_atomic_int_set (&_active, 0); } @@ -63,7 +63,7 @@ class Auditioner : public AudioTrack static void *_drop_ports (void *); void actually_drop_ports (); void output_changed (IOChange, void*); -}; +}; }; /* namespace ARDOUR */ diff --git a/libs/ardour/ardour/auto_bundle.h b/libs/ardour/ardour/auto_bundle.h index e3899069de..b41a5d344f 100644 --- a/libs/ardour/ardour/auto_bundle.h +++ b/libs/ardour/ardour/auto_bundle.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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 @@ -41,6 +41,6 @@ class AutoBundle : public Bundle { private: }; -} - +} + #endif /* __ardour_auto_bundle_h__ */ diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h index 7fac339f77..90250abf52 100644 --- a/libs/ardour/ardour/automatable.h +++ b/libs/ardour/ardour/automatable.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 @@ -51,20 +51,20 @@ public: boost::shared_ptr<AutomationControl> automation_control (const Evoral::Parameter& id, bool create_if_missing=false); - + boost::shared_ptr<const AutomationControl> automation_control (const Evoral::Parameter& id) const; virtual void add_control(boost::shared_ptr<Evoral::Control>); - + virtual void automation_snapshot(nframes_t now, bool force); virtual void transport_stopped (sframes_t now); virtual std::string describe_parameter(Evoral::Parameter param); - + AutoState get_parameter_automation_state (Evoral::Parameter param, bool lock = true); virtual void set_parameter_automation_state (Evoral::Parameter param, AutoState); - + AutoStyle get_parameter_automation_style (Evoral::Parameter param); void set_parameter_automation_style (Evoral::Parameter param, AutoStyle); @@ -74,22 +74,22 @@ public: const std::set<Evoral::Parameter>& what_can_be_automated() const { return _can_automate_list; } void mark_automation_visible(Evoral::Parameter, bool); - + inline bool should_snapshot (nframes_t now) { return (_last_automation_snapshot > now || (now - _last_automation_snapshot) > _automation_interval); } - + static void set_automation_interval (jack_nframes_t frames) { _automation_interval = frames; } - static jack_nframes_t automation_interval() { + static jack_nframes_t automation_interval() { return _automation_interval; } - + typedef Evoral::ControlSet::Controls Controls; - + Evoral::ControlSet& data() { return *this; } const Evoral::ControlSet& data() const { return *this; } @@ -102,13 +102,13 @@ public: void can_automate(Evoral::Parameter); virtual void auto_state_changed (Evoral::Parameter /*which*/) {} - + int load_automation (const std::string& path); int old_set_automation_state(const XMLNode&); std::set<Evoral::Parameter> _visible_controls; std::set<Evoral::Parameter> _can_automate_list; - + nframes_t _last_automation_snapshot; static nframes_t _automation_interval; }; diff --git a/libs/ardour/ardour/automatable_controls.h b/libs/ardour/ardour/automatable_controls.h index 38df144694..9dd0988cf7 100644 --- a/libs/ardour/ardour/automatable_controls.h +++ b/libs/ardour/ardour/automatable_controls.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 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/automatable_sequence.h b/libs/ardour/ardour/automatable_sequence.h index 23ebb161c8..88e1733c1b 100644 --- a/libs/ardour/ardour/automatable_sequence.h +++ b/libs/ardour/ardour/automatable_sequence.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 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/automation_control.h b/libs/ardour/ardour/automation_control.h index f9b21b932c..15bac5fef8 100644 --- a/libs/ardour/ardour/automation_control.h +++ b/libs/ardour/ardour/automation_control.h @@ -38,10 +38,10 @@ class AutomationControl : public PBD::Controllable, public Evoral::Control { public: AutomationControl(ARDOUR::Session&, - const Evoral::Parameter& parameter, - boost::shared_ptr<ARDOUR::AutomationList> l=boost::shared_ptr<ARDOUR::AutomationList>(), - const std::string& name=""); - + const Evoral::Parameter& parameter, + boost::shared_ptr<ARDOUR::AutomationList> l=boost::shared_ptr<ARDOUR::AutomationList>(), + const std::string& name=""); + boost::shared_ptr<AutomationList> alist() const { return boost::dynamic_pointer_cast<AutomationList>(_list); } @@ -51,24 +51,24 @@ public: inline bool automation_playback() const { return ((ARDOUR::AutomationList*)_list.get())->automation_playback(); } - + inline bool automation_write() const { return ((ARDOUR::AutomationList*)_list.get())->automation_write(); } - + inline AutoState automation_state() const { return ((ARDOUR::AutomationList*)_list.get())->automation_state(); } - + inline void set_automation_state(AutoState as) { return ((ARDOUR::AutomationList*)_list.get())->set_automation_state(as); } - + inline void start_touch() { set_touching (true); return ((ARDOUR::AutomationList*)_list.get())->start_touch(); } - + inline void stop_touch() { set_touching (false); return ((ARDOUR::AutomationList*)_list.get())->stop_touch(); diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index 7d34fe72b9..9b899e8cd1 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 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 @@ -29,7 +29,7 @@ #include "pbd/undo.h" #include "pbd/xml++.h" -#include "pbd/statefuldestructible.h" +#include "pbd/statefuldestructible.h" #include "ardour/ardour.h" @@ -50,7 +50,7 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL AutomationList& operator= (const AutomationList&); bool operator== (const AutomationList&); - + void freeze(); void thaw (); void mark_dirty () const; @@ -69,9 +69,9 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL bool automation_write () const { return (_state & Write) || ((_state & Touch) && _touching); } - + sigc::signal<void> StateChanged; - + static sigc::signal<void, AutomationList*> AutomationListCreated; mutable sigc::signal<void> Dirty; @@ -79,7 +79,7 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL void stop_touch (); bool touching() const { return _touching; } - XMLNode& get_state(void); + XMLNode& get_state(void); int set_state (const XMLNode &s); XMLNode& state (bool full); XMLNode& serialize_events (); @@ -87,9 +87,9 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL private: void create_curve_if_necessary (); int deserialize_events (const XMLNode&); - + void maybe_signal_changed (); - + AutoState _state; AutoStyle _style; bool _touching; diff --git a/libs/ardour/ardour/beats_frames_converter.h b/libs/ardour/ardour/beats_frames_converter.h index 381ea6c3d8..7134ea2fe9 100644 --- a/libs/ardour/ardour/beats_frames_converter.h +++ b/libs/ardour/ardour/beats_frames_converter.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 Paul Davis Author: Dave Robillard This program is free software; you can redistribute it and/or modify @@ -35,7 +35,7 @@ public: : _session(session) , _origin(origin) {} - + sframes_t to(double beats) const; double from(sframes_t frames) const; diff --git a/libs/ardour/ardour/broadcast_info.h b/libs/ardour/ardour/broadcast_info.h index 39ea96c590..522d7e7361 100644 --- a/libs/ardour/ardour/broadcast_info.h +++ b/libs/ardour/ardour/broadcast_info.h @@ -40,38 +40,38 @@ class BroadcastInfo /// Construct empty broadcast info BroadcastInfo (); ~BroadcastInfo (); - + /// Returns last error sring from libsndfile std::string get_error () const { return error; } - + /* Convenience functions */ - + void set_from_session (Session const & session, int64_t time_ref); - + /* Reading */ - + bool load_from_file (std::string const & filename); bool load_from_file (SNDFILE* sf); - + std::string get_description () const; int64_t get_time_reference () const; struct tm get_origination_time () const; std::string get_originator () const; std::string get_originator_ref () const; - + /* Writing */ - + bool write_to_file (std::string const & filename); bool write_to_file (SNDFILE* sf); - + void set_description (std::string const & desc); void set_time_reference (int64_t when); void set_origination_time (struct tm * now = 0); // if 0, use time generated at construction void set_originator (std::string const & str = ""); void set_originator_ref (Session const &, std::string const & str = ""); - + /* State info */ - + /// Returns true if a info has been succesfully loaded or anything has been manually set bool has_info () const { return _has_info; } @@ -79,10 +79,10 @@ class BroadcastInfo SF_BROADCAST_INFO * info; struct tm _time; - + void update_error (); std::string error; - + bool _has_info; }; diff --git a/libs/ardour/ardour/buffer.h b/libs/ardour/ardour/buffer.h index 8ed054923b..46a6d62667 100644 --- a/libs/ardour/ardour/buffer.h +++ b/libs/ardour/ardour/buffer.h @@ -1,16 +1,16 @@ /* - Copyright (C) 2006 Paul Davis - + Copyright (C) 2006 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 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. @@ -38,7 +38,7 @@ namespace ARDOUR { * methods to actually access the data). This provides a way for code that * doesn't care about the data type to still deal with buffers (which is * why the base class can't be a template). - * + * * To actually read/write buffer contents, use the appropriate derived class. */ class Buffer : public boost::noncopyable @@ -61,20 +61,20 @@ public: DataType type() const { return _type; } bool silent() const { return _silent; } - + /** Reallocate the buffer used internally to handle at least @a size_t units of data. * * The buffer is not silent after this operation. the @a capacity argument * passed to the constructor must have been non-zero. */ virtual void resize (size_t) = 0; - + /** Clear (eg zero, or empty) buffer */ virtual void silence (nframes_t len, nframes_t offset = 0) = 0; - + /** Clear the entire buffer */ virtual void clear() { silence(_capacity, 0); } - + virtual void read_from (const Buffer& src, nframes_t len, nframes_t dst_offset = 0, nframes_t src_offset = 0) = 0; virtual void merge_from (const Buffer& src, nframes_t len, nframes_t dst_offset = 0, nframes_t src_offset = 0) = 0; diff --git a/libs/ardour/ardour/buffer_set.h b/libs/ardour/ardour/buffer_set.h index 49c392ce6a..df842613cb 100644 --- a/libs/ardour/ardour/buffer_set.h +++ b/libs/ardour/ardour/buffer_set.h @@ -1,16 +1,16 @@ /* - Copyright (C) 2006 Paul Davis - + Copyright (C) 2006 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 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. @@ -59,7 +59,7 @@ public: ~BufferSet(); void clear(); - + void attach_buffers(PortSet& ports, nframes_t nframes, nframes_t offset = 0); /* the capacity here is a size_t and has a different interpretation depending @@ -79,10 +79,10 @@ public: void is_silent(bool yn) { _is_silent = yn; } bool is_silent() const { return _is_silent; } void silence (nframes_t nframes, nframes_t offset); - bool is_mirror() const { return _is_mirror; } + bool is_mirror() const { return _is_mirror; } void set_count(const ChanCount& count) { assert(count <= _available); _count = count; } - + size_t buffer_capacity(DataType type) const; Buffer& get(DataType type, size_t i); @@ -90,7 +90,7 @@ public: AudioBuffer& get_audio(size_t i) { return (AudioBuffer&)get(DataType::AUDIO, i); } - + MidiBuffer& get_midi(size_t i) { return (MidiBuffer&)get(DataType::MIDI, i); } @@ -110,7 +110,7 @@ public: // ITERATORS // FIXME: possible to combine these? templates? - + class audio_iterator { public: AudioBuffer& operator*() { return _set.get_audio(_index); } @@ -175,13 +175,13 @@ public: iterator begin(DataType type) { return iterator(*this, type, 0); } iterator end(DataType type) { return iterator(*this, type, _count.get(type)); } - + private: typedef std::vector<Buffer*> BufferVec; /// Vector of vectors, indexed by DataType std::vector<BufferVec> _buffers; - + #ifdef HAVE_SLV2 /// LV2 MIDI buffers (for conversion to/from MIDI buffers) typedef std::vector< std::pair<bool, LV2EventBuffer*> > LV2Buffers; diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h index 98344e8406..0e80c5433d 100644 --- a/libs/ardour/ardour/bundle.h +++ b/libs/ardour/ardour/bundle.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002-2007 Paul Davis + Copyright (C) 2002-2007 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 @@ -29,8 +29,8 @@ namespace ARDOUR { -class AudioEngine; - +class AudioEngine; + /** A set of `channels', each of which is associated with 0 or more ports. * Each channel has a name which can be anything useful. * Intended for grouping things like, for example, a buss' outputs. @@ -52,7 +52,7 @@ class Bundle : public sigc::trackable bool operator== (Channel const &o) const { return name == o.name && ports == o.ports; } - + std::string name; PortList ports; }; @@ -61,7 +61,7 @@ class Bundle : public sigc::trackable Bundle (std::string const &, bool i = true); Bundle (std::string const &, DataType, bool i = true); Bundle (boost::shared_ptr<Bundle>); - + virtual ~Bundle() {} /** @return Number of channels that this Bundle has */ @@ -127,7 +127,7 @@ class Bundle : public sigc::trackable sigc::signal<void, Change> Changed; protected: - + /// mutex for _channel_ports and _channel_names /// XXX: is this necessary? mutable Glib::Mutex _channel_mutex; @@ -137,7 +137,7 @@ class Bundle : public sigc::trackable int set_channels (std::string const &); int parse_io_string (std::string const &, std::vector<std::string> &); void emit_changed (Change); - + std::string _name; DataType _type; bool _ports_are_inputs; @@ -151,14 +151,14 @@ class Bundle : public sigc::trackable struct BundleChannel { BundleChannel () : channel (0) {} - + BundleChannel (boost::shared_ptr<Bundle> b, uint32_t c) : bundle (b), channel (c) {} - + bool operator== (BundleChannel const& other) const { return bundle == other.bundle && channel == other.channel; } - + bool operator!= (BundleChannel const& other) const { return bundle != other.bundle || channel != other.channel; } @@ -166,7 +166,7 @@ struct BundleChannel boost::shared_ptr<Bundle> bundle; uint32_t channel; }; - + } #endif /* __ardour_bundle_h__ */ diff --git a/libs/ardour/ardour/caimportable.h b/libs/ardour/ardour/caimportable.h index 2cc20d21b7..dbf93dbb73 100644 --- a/libs/ardour/ardour/caimportable.h +++ b/libs/ardour/ardour/caimportable.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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/chan_count.h b/libs/ardour/ardour/chan_count.h index ccae3920f6..3dc6423607 100644 --- a/libs/ardour/ardour/chan_count.h +++ b/libs/ardour/ardour/chan_count.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis Author: Dave Robillard This program is free software; you can redistribute it and/or modify @@ -38,7 +38,7 @@ class ChanCount { public: ChanCount(const XMLNode& node); ChanCount() { reset(); } - + // Convenience constructor for making single-typed streams (stereo, mono, etc) ChanCount(DataType type, uint32_t channels) { reset(); @@ -50,16 +50,16 @@ public: _counts[*t] = 0; } } - + void set(DataType t, uint32_t count) { assert(t != DataType::NIL); _counts[t] = count; } uint32_t get(DataType t) const { assert(t != DataType::NIL); return _counts[t]; } - + inline uint32_t n_audio() const { return _counts[DataType::AUDIO]; } inline void set_audio(uint32_t a) { _counts[DataType::AUDIO] = a; } - + inline uint32_t n_midi() const { return _counts[DataType::MIDI]; } inline void set_midi(uint32_t m) { _counts[DataType::MIDI] = m; } - + uint32_t n_total() const { uint32_t ret = 0; for (uint32_t i=0; i < DataType::num_types; ++i) @@ -75,7 +75,7 @@ public: return true; } - + bool operator!=(const ChanCount& other) const { return ! (*this == other); } @@ -92,7 +92,7 @@ public: bool operator<=(const ChanCount& other) const { return ( (*this < other) || (*this == other) ); } - + bool operator>(const ChanCount& other) const { for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { if (_counts[*t] < other._counts[*t]) { @@ -105,7 +105,7 @@ public: bool operator>=(const ChanCount& other) const { return ( (*this > other) || (*this == other) ); } - + ChanCount operator+(const ChanCount& other) const { ChanCount ret; for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { @@ -113,7 +113,7 @@ public: } return ret; } - + static ChanCount min(const ChanCount& a, const ChanCount& b) { ChanCount ret; for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { @@ -121,7 +121,7 @@ public: } return ret; } - + static ChanCount max(const ChanCount& a, const ChanCount& b) { ChanCount ret; for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) { @@ -129,7 +129,7 @@ public: } return ret; } - + XMLNode* state(const std::string& name) const; static const ChanCount INFINITE; diff --git a/libs/ardour/ardour/chan_mapping.h b/libs/ardour/ardour/chan_mapping.h index 5f948a77b0..a08ff011af 100644 --- a/libs/ardour/ardour/chan_mapping.h +++ b/libs/ardour/ardour/chan_mapping.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 Paul Davis Author: Dave Robillard This program is free software; you can redistribute it and/or modify @@ -38,15 +38,15 @@ class ChanMapping { public: ChanMapping() {} ChanMapping(ARDOUR::ChanCount identity); - + uint32_t get(DataType t, uint32_t from); void set(DataType t, uint32_t from, uint32_t to); void offset_from(DataType t, int32_t delta); void offset_to(DataType t, int32_t delta); - + typedef std::map<uint32_t, uint32_t> TypeMapping; typedef std::map<DataType, TypeMapping> Mappings; - + Mappings mappings() { return _mappings; } const Mappings mappings() const { return _mappings; } diff --git a/libs/ardour/ardour/click.h b/libs/ardour/ardour/click.h index 2f174ab472..50efe7ce46 100644 --- a/libs/ardour/ardour/click.h +++ b/libs/ardour/ardour/click.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2004 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/configuration.h b/libs/ardour/ardour/configuration.h index e655cfde0e..d00cadb179 100644 --- a/libs/ardour/ardour/configuration.h +++ b/libs/ardour/ardour/configuration.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 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/configuration_variable.h b/libs/ardour/ardour/configuration_variable.h index 6282da2c54..90859b72b1 100644 --- a/libs/ardour/ardour/configuration_variable.h +++ b/libs/ardour/ardour/configuration_variable.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 @@ -37,12 +37,12 @@ class ConfigVariableBase { std::string name () const { return _name; } void add_to_node (XMLNode&); bool set_from_node (XMLNode const &); - + virtual std::string get_as_string () const = 0; virtual void set_from_string (std::string const &) = 0; void show_stored_value (const std::string&); - + static void set_show_stored_values (bool); protected: @@ -96,14 +96,14 @@ template<class T> class ConfigVariableWithMutation : public ConfigVariable<T> { public: - ConfigVariableWithMutation (std::string name, T val, T (*m)(T)) + ConfigVariableWithMutation (std::string name, T val, T (*m)(T)) : ConfigVariable<T> (name, val), mutator (m) {} bool set (T val) { if (unmutated_value != val) { unmutated_value = val; return ConfigVariable<T>::set (mutator (val)); - } + } return false; } diff --git a/libs/ardour/ardour/control_outputs.h b/libs/ardour/ardour/control_outputs.h index 0a09ab10f4..069a000139 100644 --- a/libs/ardour/ardour/control_outputs.h +++ b/libs/ardour/ardour/control_outputs.h @@ -1,16 +1,16 @@ /* - Copyright (C) 2006 Paul Davis - + Copyright (C) 2006 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 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. @@ -26,7 +26,7 @@ namespace ARDOUR { -/* this exists for one reason only: so that it can override the "type" +/* this exists for one reason only: so that it can override the "type" property in the state of the Delivery processor. we need this because ControlOutputs are "unique" because they deliver to an IO object that is private to a Route and so cannot be looked diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h index f315744e50..bceece9adf 100644 --- a/libs/ardour/ardour/control_protocol_manager.h +++ b/libs/ardour/ardour/control_protocol_manager.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 @@ -27,7 +27,7 @@ #include <glibmm/thread.h> -#include "pbd/stateful.h" +#include "pbd/stateful.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/control_protocol_search_path.h b/libs/ardour/ardour/control_protocol_search_path.h index 69b13c493e..8795f4501a 100644 --- a/libs/ardour/ardour/control_protocol_search_path.h +++ b/libs/ardour/ardour/control_protocol_search_path.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Tim Mayberry + Copyright (C) 2007 Tim Mayberry 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 @@ -25,7 +25,7 @@ namespace ARDOUR { /** - * return a SearchPath containing directories in which to look for + * return a SearchPath containing directories in which to look for * control surface plugins. * * If ARDOUR_SURFACES_PATH is defined then the SearchPath returned diff --git a/libs/ardour/ardour/coreaudiosource.h b/libs/ardour/ardour/coreaudiosource.h index e8b22e5524..7720ca7395 100644 --- a/libs/ardour/ardour/coreaudiosource.h +++ b/libs/ardour/ardour/coreaudiosource.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -17,7 +17,7 @@ */ -#ifndef __coreaudio_source_h__ +#ifndef __coreaudio_source_h__ #define __coreaudio_source_h__ #include <appleutility/CAAudioFile.h> diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h index 9e1e39bb14..577bee8257 100644 --- a/libs/ardour/ardour/crossfade.h +++ b/libs/ardour/ardour/crossfade.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -27,7 +27,7 @@ #include <sigc++/signal.h> #include "pbd/undo.h" -#include "pbd/statefuldestructible.h" +#include "pbd/statefuldestructible.h" #include "ardour/ardour.h" #include "ardour/audioregion.h" @@ -44,29 +44,29 @@ class Crossfade : public ARDOUR::AudioRegion public: class NoCrossfadeHere: std::exception { - public: + public: virtual const char *what() const throw() { return "no crossfade should be constructed here"; } }; - + /* constructor for "fixed" xfades at each end of an internal overlap */ Crossfade (boost::shared_ptr<ARDOUR::AudioRegion> in, boost::shared_ptr<ARDOUR::AudioRegion> out, - nframes_t position, - nframes_t initial_length, - AnchorPoint); + nframes_t position, + nframes_t initial_length, + AnchorPoint); /* constructor for xfade between two regions that are overlapped in any way except the "internal" case. */ - + Crossfade (boost::shared_ptr<ARDOUR::AudioRegion> in, boost::shared_ptr<ARDOUR::AudioRegion> out, CrossfadeModel, bool active); /* copy constructor to copy a crossfade with new regions. used (for example) - when a playlist copy is made + when a playlist copy is made */ Crossfade (boost::shared_ptr<Crossfade>, boost::shared_ptr<ARDOUR::AudioRegion>, boost::shared_ptr<ARDOUR::AudioRegion>); - + /* the usual XML constructor */ Crossfade (const Playlist&, XMLNode&); @@ -79,13 +79,13 @@ class Crossfade : public ARDOUR::AudioRegion boost::shared_ptr<ARDOUR::AudioRegion> in() const { return _in; } boost::shared_ptr<ARDOUR::AudioRegion> out() const { return _out; } - - nframes_t read_at (Sample *buf, Sample *mixdown_buffer, - float *gain_buffer, sframes_t position, nframes_t cnt, - uint32_t chan_n, - nframes_t read_frames = 0, - nframes_t skip_frames = 0) const; - + + nframes_t read_at (Sample *buf, Sample *mixdown_buffer, + float *gain_buffer, sframes_t position, nframes_t cnt, + uint32_t chan_n, + nframes_t read_frames = 0, + nframes_t skip_frames = 0) const; + bool refresh (); uint32_t upper_layer () const { @@ -124,16 +124,16 @@ class Crossfade : public ARDOUR::AudioRegion bool can_follow_overlap() const; void set_follow_overlap (bool yn); - AutomationList& fade_in() { return _fade_in; } + AutomationList& fade_in() { return _fade_in; } AutomationList& fade_out() { return _fade_out; } nframes_t set_xfade_length (nframes_t); bool is_dependent() const { return true; } - bool depends_on (boost::shared_ptr<Region> other) const { - return other == _in || other == _out; + bool depends_on (boost::shared_ptr<Region> other) const { + return other == _in || other == _out; } - + static nframes_t short_xfade_length() { return _short_xfade_length; } static void set_short_xfade_length (nframes_t n); @@ -168,10 +168,10 @@ class Crossfade : public ARDOUR::AudioRegion bool update (); protected: - nframes_t read_raw_internal (Sample*, sframes_t, nframes_t, int) const; + nframes_t read_raw_internal (Sample*, sframes_t, nframes_t, int) const; }; } // namespace ARDOUR -#endif /* __ardour_overlap_h__ */ +#endif /* __ardour_overlap_h__ */ diff --git a/libs/ardour/ardour/crossfade_compare.h b/libs/ardour/ardour/crossfade_compare.h index b92806a6bb..ee934a2220 100644 --- a/libs/ardour/ardour/crossfade_compare.h +++ b/libs/ardour/ardour/crossfade_compare.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003 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/cycle_timer.h b/libs/ardour/ardour/cycle_timer.h index 2861533025..146b393a63 100644 --- a/libs/ardour/ardour/cycle_timer.h +++ b/libs/ardour/ardour/cycle_timer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 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 @@ class CycleTimer { cycles_t _entry; cycles_t _exit; std::string _name; - + public: CycleTimer(std::string name) : _name (name){ if (cycles_per_usec == 0) { diff --git a/libs/ardour/ardour/cycles.h b/libs/ardour/ardour/cycles.h index 2199a2eb9c..9f6d9b4b5c 100644 --- a/libs/ardour/ardour/cycles.h +++ b/libs/ardour/ardour/cycles.h @@ -1,7 +1,7 @@ /* Copyright (C) 2001 Paul Davis Code derived from various headers from the Linux kernel - + 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 @@ -37,7 +37,7 @@ * We only use the low 32 bits, and we'd simply better make sure * that we reschedule before that wraps. Scheduling at least every * four billion cycles just basically sounds like a good idea, - * regardless of how fast the machine is. + * regardless of how fast the machine is. */ typedef uint64_t cycles_t; @@ -103,7 +103,7 @@ get_cycles (void) * Standard way to access the cycle counter. * Currently only used on SMP for scheduling. * - * Only the low 32 bits are available as a continuously counting entity. + * Only the low 32 bits are available as a continuously counting entity. * But this only means we'll force a reschedule every 8 seconds or so, * which isn't an evil thing. */ diff --git a/libs/ardour/ardour/dB.h b/libs/ardour/ardour/dB.h index 1b5bb03d1f..209ab11edc 100644 --- a/libs/ardour/ardour/dB.h +++ b/libs/ardour/ardour/dB.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 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/data_type.h b/libs/ardour/ardour/data_type.h index 854f52acba..36114b29a9 100644 --- a/libs/ardour/ardour/data_type.h +++ b/libs/ardour/ardour/data_type.h @@ -1,17 +1,17 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis Author: Dave Robillard - + 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. @@ -49,7 +49,7 @@ public: MIDI = 1, NIL = 2, }; - + /** Number of types (not including NIL). * WARNING: make sure this matches Symbol! */ @@ -78,7 +78,7 @@ public: default: return ""; } } - + /** Inverse of the from-string constructor */ const char* to_string() const { switch (_symbol) { @@ -111,10 +111,10 @@ public: static iterator begin() { return iterator(0); } static iterator end() { return iterator(num_types); } - + bool operator==(const Symbol symbol) { return (_symbol == symbol); } bool operator!=(const Symbol symbol) { return (_symbol != symbol); } - + bool operator==(const DataType other) { return (_symbol == other._symbol); } bool operator!=(const DataType other) { return (_symbol != other._symbol); } diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index 5cb11a9348..d2991a2d04 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -1,16 +1,16 @@ /* - Copyright (C) 2006 Paul Davis - + Copyright (C) 2006 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 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. diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index 9eb5bae3de..6932913958 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-2006 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 @@ -36,7 +36,7 @@ #include "pbd/fastlog.h" #include "pbd/ringbufferNPT.h" #include "pbd/stateful.h" -#include "pbd/statefuldestructible.h" +#include "pbd/statefuldestructible.h" #include "ardour/ardour.h" #include "ardour/location.h" @@ -59,7 +59,7 @@ class Send; class Session; class Diskstream : public SessionObject, public boost::noncopyable -{ +{ public: enum Flag { Recordable = 0x1, @@ -71,7 +71,7 @@ class Diskstream : public SessionObject, public boost::noncopyable Diskstream (Session &, const std::string& name, Flag f = Recordable); Diskstream (Session &, const XMLNode&); virtual ~Diskstream(); - + bool set_name (const std::string& str); boost::shared_ptr<ARDOUR::IO> io() const { return _io; } @@ -86,7 +86,7 @@ class Diskstream : public SessionObject, public boost::noncopyable AlignStyle alignment_style() const { return _alignment_style; } void set_align_style (AlignStyle); void set_persistent_align_style (AlignStyle a) { _persistent_alignment_style = a; } - + nframes_t roll_delay() const { return _roll_delay; } void set_roll_delay (nframes_t); @@ -103,7 +103,7 @@ class Diskstream : public SessionObject, public boost::noncopyable bool non_layered() const { return _flags & NonLayered; } bool reversed() const { return _actual_speed < 0.0f; } double speed() const { return _visible_speed; } - + virtual void punch_in() {} virtual void punch_out() {} @@ -122,7 +122,7 @@ class Diskstream : public SessionObject, public boost::noncopyable nframes_t current_capture_end() const { return capture_start_frame + capture_captured; } nframes_t get_capture_start_frame (uint32_t n=0); nframes_t get_captured_frames (uint32_t n=0); - + ChanCount n_channels() { return _n_channels; } static nframes_t disk_io_frames() { return disk_io_chunk_frames; } @@ -131,7 +131,7 @@ class Diskstream : public SessionObject, public boost::noncopyable /* Stateful */ virtual XMLNode& get_state(void) = 0; virtual int set_state(const XMLNode& node) = 0; - + virtual void monitor_input (bool) {} nframes_t capture_offset() const { return _capture_offset; } @@ -193,12 +193,12 @@ class Diskstream : public SessionObject, public boost::noncopyable virtual void recover (); /* called if commit will not be called, but process was */ //private: - + enum TransitionType { CaptureStart = 0, CaptureEnd }; - + struct CaptureTransition { TransitionType type; nframes_t capture_val; ///< The start or end file frame position @@ -207,10 +207,10 @@ class Diskstream : public SessionObject, public boost::noncopyable /* The two central butler operations */ virtual int do_flush (RunContext context, bool force = false) = 0; virtual int do_refill () = 0; - + /** For non-butler contexts (allocates temporary working buffers) */ virtual int do_refill_with_alloc() = 0; - + /* XXX fix this redundancy ... */ virtual void playlist_changed (Change); @@ -221,8 +221,8 @@ class Diskstream : public SessionObject, public boost::noncopyable virtual void transport_looped (nframes_t transport_frame) = 0; struct CaptureInfo { - uint32_t start; - uint32_t frames; + uint32_t start; + uint32_t frames; }; virtual void init (Flag); @@ -263,7 +263,7 @@ class Diskstream : public SessionObject, public boost::noncopyable /* items needed for speed change logic */ bool _buffer_reallocation_required; bool _seek_required; - + bool force_refill; nframes_t capture_start_frame; nframes_t capture_captured; @@ -287,10 +287,10 @@ class Diskstream : public SessionObject, public boost::noncopyable nframes_t wrap_buffer_size; nframes_t speed_buffer_size; - double _speed; + double _speed; double _target_speed; - - nframes_t file_frame; + + nframes_t file_frame; nframes_t playback_sample; nframes_t playback_distance; bool commit_should_unlock; @@ -312,7 +312,7 @@ class Diskstream : public SessionObject, public boost::noncopyable sigc::connection plmod_connection; sigc::connection plgone_connection; sigc::connection plregion_connection; - + Flag _flags; void route_going_away (); diff --git a/libs/ardour/ardour/element_import_handler.h b/libs/ardour/ardour/element_import_handler.h index 2401cf7a06..be2e3fafb0 100644 --- a/libs/ardour/ardour/element_import_handler.h +++ b/libs/ardour/ardour/element_import_handler.h @@ -34,7 +34,7 @@ namespace ARDOUR { class Session; class ElementImporter; -/// Virtual interface class for element import handlers +/// Virtual interface class for element import handlers class ElementImportHandler { public: @@ -48,58 +48,58 @@ class ElementImportHandler * @param source XML tree to be parsed * @see elements */ - ElementImportHandler (XMLTree const & source, ARDOUR::Session & session) : - source (source), session (session) { } - + ElementImportHandler (XMLTree const & source, ARDOUR::Session & session) + : source (source), session (session) { } + virtual ~ElementImportHandler (); - + /** Gets a textual representation of the element type * @return textual representation of element type */ virtual std::string get_info () const = 0; - + /// Elements this handler handles ElementList elements; - + /* For checking duplicates names against queued elements */ - + /** Checks whether or not an element with some name is queued or not * @param name name to check * @return true if name is not used */ bool check_name (const std::string & name) const; - + /// Adds name to the list of used names void add_name (std::string name); - + /// Removes name from the list of used names void remove_name (const std::string & name); - + /// Checks wheter or not all elements can be imported cleanly static bool dirty () { return _dirty; } - + /// Sets handler dirty static void set_dirty () { _dirty = true; } - + /// Checks wheter or not all elements were imported cleanly static bool errors () { return _errors; } - + /// Sets handler dirty static void set_errors () { _errors = true; } protected: /// Source session XML tree XMLTree const & source; - + /// Destination session ARDOUR::Session & session; - + /// Session XML readability static bool _dirty; - + /// Errors post initialization static bool _errors; - + private: /// Set of names for duplicate checking std::set<std::string> names; diff --git a/libs/ardour/ardour/element_importer.h b/libs/ardour/ardour/element_importer.h index 4a69565838..9d2d9cc0de 100644 --- a/libs/ardour/ardour/element_importer.h +++ b/libs/ardour/ardour/element_importer.h @@ -39,43 +39,43 @@ class ElementImporter ElementImporter (XMLTree const & source, ARDOUR::Session & session); virtual ~ElementImporter (); - + /** Returns the element name * @return the name of the element */ virtual std::string get_name () const { return name; }; - + /** Gets a textual representation of the element * @return a textual representation on this specific element */ virtual std::string get_info () const = 0; - + /** Gets import status, if applicable. */ virtual Session::ImportStatus * get_import_status () { return 0; } - + /** Prepares to move element * * @return whther or not the element could be prepared for moving */ bool prepare_move (); - + /** Cancels moving of element * If the element has been set to be moved, this cancels the move. */ void cancel_move (); - + /// Moves the element to the taget session void move (); - + /// Check if element is broken. Cannot be moved if broken. bool broken () { return _broken; } - + /// Signal that requests for anew name static sigc::signal <std::pair<bool, std::string>, std::string, std::string> Rename; - + /// Signal for ok/cancel prompting static sigc::signal <bool, std::string> Prompt; - + protected: /** Moves the element to the taget session @@ -84,44 +84,44 @@ class ElementImporter */ virtual void _move () = 0; - /** Should take care of all tasks that need to be done + /** Should take care of all tasks that need to be done * before moving the element. This includes prompting * the user for more information if necessary. * * @return whether or not the element can be moved */ virtual bool _prepare_move () = 0; - - /// Cancel move + + /// Cancel move virtual void _cancel_move () = 0; /// Source XML-tree XMLTree const & source; - + /// Target session ARDOUR::Session & session; - + /// Ture if the element has been prepared and queued for importing bool queued () { return _queued; } - + /// Name of element std::string name; - + /// The sample rate of the session from which we are importing nframes_t sample_rate; - + /// Converts smpte time to a string std::string smpte_to_string (SMPTE::Time & time) const; - + /// Converts samples so that times match the sessions sample rate nframes_t rate_convert_samples (nframes_t samples) const; - + /// Converts samples so that times match the sessions sample rate (for straight use in XML) std::string rate_convert_samples (std::string const & samples) const; - + /// Set element broken void set_broken () { _broken = true; } - + private: bool _queued; bool _broken; diff --git a/libs/ardour/ardour/event_type_map.h b/libs/ardour/ardour/event_type_map.h index 371adfc0ee..b3c6b89b3f 100644 --- a/libs/ardour/ardour/event_type_map.h +++ b/libs/ardour/ardour/event_type_map.h @@ -41,7 +41,7 @@ public: Evoral::Parameter new_parameter(uint32_t type, uint8_t channel=0, uint32_t id=0) const; Evoral::Parameter new_parameter(const std::string& str) const; std::string to_symbol(const Evoral::Parameter& param) const; - + bool is_midi_parameter(const Evoral::Parameter& param); static EventTypeMap& instance() { return event_type_map; } diff --git a/libs/ardour/ardour/export.h b/libs/ardour/ardour/export.h index ffc6ae5854..78a0e9abb0 100644 --- a/libs/ardour/ardour/export.h +++ b/libs/ardour/ardour/export.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 @@ -32,7 +32,7 @@ #include "ardour/ardour.h" #include "ardour/gdither.h" -namespace ARDOUR +namespace ARDOUR { class Port; @@ -41,59 +41,59 @@ namespace ARDOUR struct ExportSpecification : public SF_INFO, public sigc::trackable { - ExportSpecification(); - ~ExportSpecification (); + ExportSpecification(); + ~ExportSpecification (); - void init (); - void clear (); + void init (); + void clear (); - int prepare (nframes_t blocksize, nframes_t frame_rate); + int prepare (nframes_t blocksize, nframes_t frame_rate); - int process (nframes_t nframes); + int process (nframes_t nframes); - /* set by the user */ + /* set by the user */ - std::string path; - nframes_t sample_rate; + std::string path; + nframes_t sample_rate; - int src_quality; - SNDFILE* out; - uint32_t channels; - ExportPortMap port_map; - nframes_t start_frame; - nframes_t end_frame; - GDitherType dither_type; - bool do_freewheel; + int src_quality; + SNDFILE* out; + uint32_t channels; + ExportPortMap port_map; + nframes_t start_frame; + nframes_t end_frame; + GDitherType dither_type; + bool do_freewheel; - /* used exclusively during export */ + /* used exclusively during export */ - nframes_t frame_rate; - GDither dither; - float* dataF; - float* dataF2; - float* leftoverF; - nframes_t leftover_frames; - nframes_t max_leftover_frames; - void* output_data; - nframes_t out_samples_max; - uint32_t sample_bytes; - uint32_t data_width; + nframes_t frame_rate; + GDither dither; + float* dataF; + float* dataF2; + float* leftoverF; + nframes_t leftover_frames; + nframes_t max_leftover_frames; + void* output_data; + nframes_t out_samples_max; + uint32_t sample_bytes; + uint32_t data_width; - nframes_t total_frames; - SF_INFO sfinfo; - SRC_DATA src_data; - SRC_STATE* src_state; - nframes_t pos; + nframes_t total_frames; + SF_INFO sfinfo; + SRC_DATA src_data; + SRC_STATE* src_state; + nframes_t pos; - sigc::connection freewheel_connection; + sigc::connection freewheel_connection; - /* shared between UI thread and audio thread */ + /* shared between UI thread and audio thread */ - volatile float progress; /* audio thread sets this */ - volatile bool stop; /* UI sets this */ - volatile bool running; /* audio thread sets to false when export is done */ + volatile float progress; /* audio thread sets this */ + volatile bool stop; /* UI sets this */ + volatile bool running; /* audio thread sets to false when export is done */ - int status; + int status; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index 4fe1efa294..fdb466a06e 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -44,13 +44,13 @@ class ExportChannel virtual void read (Sample * data, nframes_t frames) const = 0; virtual bool empty () const = 0; - + /// Adds state to node passed virtual void get_state (XMLNode * node) const = 0; - + /// Sets state from node passed virtual void set_state (XMLNode * node, Session & session) = 0; - + // Operator< must be defined for usage in e.g. std::map or std::set to disallow duplicates when necessary virtual bool operator< (ExportChannel const & other) const = 0; }; @@ -72,13 +72,13 @@ class PortExportChannel : public ExportChannel typedef std::set<AudioPort *> PortSet; PortExportChannel () {} - + void read (Sample * data, nframes_t frames) const; bool empty () const { return ports.empty(); } - + void get_state (XMLNode * node) const; void set_state (XMLNode * node, Session & session); - + bool operator< (ExportChannel const & other) const; void add_port (AudioPort * port) { ports.insert (port); } @@ -97,13 +97,13 @@ class RegionExportChannelFactory : public sigc::trackable Fades, Processed }; - + RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type); ~RegionExportChannelFactory (); ExportChannelPtr create (uint32_t channel); void read (uint32_t channel, Sample * data, nframes_t frames_to_read); - + private: int new_cycle_started () { buffers_up_to_date = false; return 0; } @@ -119,7 +119,7 @@ class RegionExportChannelFactory : public sigc::trackable bool buffers_up_to_date; nframes_t region_start; nframes_t position; - + Sample * mixdown_buffer; Sample * gain_buffer; }; @@ -139,11 +139,11 @@ class RegionExportChannel : public ExportChannel private: - RegionExportChannel (RegionExportChannelFactory & factory, uint32_t channel) : - factory (factory), - channel (channel) + RegionExportChannel (RegionExportChannelFactory & factory, uint32_t channel) + : factory (factory) + , channel (channel) {} - + RegionExportChannelFactory & factory; uint32_t channel; }; diff --git a/libs/ardour/ardour/export_channel_configuration.h b/libs/ardour/ardour/export_channel_configuration.h index 70b2bb00d9..8ef9bba6dc 100644 --- a/libs/ardour/ardour/export_channel_configuration.h +++ b/libs/ardour/ardour/export_channel_configuration.h @@ -51,20 +51,20 @@ class ExportChannelConfiguration typedef boost::shared_ptr<ExportTimespan> TimespanPtr; typedef boost::shared_ptr<ExportFormatSpecification const> FormatPtr; typedef boost::shared_ptr<ExportFilename> FilenamePtr; - + typedef std::pair<FormatPtr, FilenamePtr> FileConfig; typedef std::list<FileConfig> FileConfigList; - + /// Struct for threading, acts like a pointer to a ExportChannelConfiguration struct WriterThread { WriterThread (ExportChannelConfiguration & channel_config) : - channel_config (channel_config), running (false) {} - + channel_config (channel_config), running (false) {} + ExportChannelConfiguration * operator-> () { return &channel_config; } ExportChannelConfiguration & operator* () { return channel_config; } - + ExportChannelConfiguration & channel_config; - + pthread_t thread; bool running; }; @@ -72,46 +72,46 @@ class ExportChannelConfiguration private: friend class ExportElementFactory; ExportChannelConfiguration (Session & session); - + public: XMLNode & get_state (); int set_state (const XMLNode &); - + typedef std::list<ExportChannelPtr> ChannelList; - + ChannelList const & get_channels () const { return channels; } bool all_channels_have_ports () const; - + Glib::ustring name () const { return _name; } void set_name (Glib::ustring name) { _name = name; } void set_split (bool value) { split = value; } - + bool get_split () const { return split; } uint32_t get_n_chans () const { return channels.size(); } - + void register_channel (ExportChannelPtr channel) { channels.push_back (channel); } void register_file_config (FormatPtr format, FilenamePtr filename) { file_configs.push_back (FileConfig (format, filename)); } - + void clear_channels () { channels.clear (); } - + /// Writes all files for this channel config @return true if a new thread was spawned bool write_files (boost::shared_ptr<ExportProcessor> new_processor); sigc::signal<void> FilesWritten; - + // Tells the handler the necessary information for it to handle tempfiles void register_with_timespan (TimespanPtr timespan); - + void unregister_all (); - + private: typedef boost::shared_ptr<ExportStatus> ExportStatusPtr; - Session & session; + Session & session; // processor has to be prepared before doing this. void write_file (); - + /// The actual write files, needed for threading static void * _write_files (void *arg); WriterThread writer_thread; @@ -123,7 +123,7 @@ class ExportChannelConfiguration TimespanPtr timespan; ChannelList channels; FileConfigList file_configs; - + bool split; // Split to mono files Glib::ustring _name; }; diff --git a/libs/ardour/ardour/export_failed.h b/libs/ardour/ardour/export_failed.h index 63256b458e..37f572f345 100644 --- a/libs/ardour/ardour/export_failed.h +++ b/libs/ardour/ardour/export_failed.h @@ -33,19 +33,19 @@ namespace ARDOUR class ExportFailed : public std::exception { public: - ExportFailed (std::string const & reason) : - reason (reason.c_str()) + ExportFailed (std::string const & reason) + : reason (reason.c_str()) { PBD::error << string_compose (_("Export failed: %1"), reason) << endmsg; } - + ~ExportFailed () throw() { } - + const char* what() const throw() { return reason; } - + private: const char * reason; diff --git a/libs/ardour/ardour/export_file_io.h b/libs/ardour/ardour/export_file_io.h index 0df2f99e29..48d5984f78 100644 --- a/libs/ardour/ardour/export_file_io.h +++ b/libs/ardour/ardour/export_file_io.h @@ -45,9 +45,9 @@ class ExportFileWriter std::string filename () const { return _filename; } nframes_t position () const { return _position; } - + void set_position (nframes_t position) { _position = position; } - + protected: ExportFileWriter (std::string filename) : _filename (filename) {} @@ -99,58 +99,58 @@ class ExportTempFile : public SndfileWriter<float>, public GraphSource<float> public: ExportTempFile (uint32_t channels, nframes_t samplerate); ~ExportTempFile () {} - + /// Causes the file to be read from the beginning again void reset_read () { reading = false; } nframes_t read (float * data, nframes_t frames); - + /* Silence management */ - + nframes_t trim_beginning (bool yn = true); nframes_t trim_end (bool yn = true); - + void set_silence_beginning (nframes_t frames); void set_silence_end (nframes_t frames); private: /* File access */ - + sf_count_t get_length (); sf_count_t get_position (); sf_count_t get_read_position (); // get position seems to default to the write pointer sf_count_t locate_to (nframes_t frames); sf_count_t _read (float * data, nframes_t frames); - + uint32_t channels; bool reading; - + /* Silence related */ - + /* start and end are used by read() */ - + nframes_t start; nframes_t end; - + /* these are the silence processing results and state */ - + void process_beginning (); void process_end (); - + bool beginning_processed; bool end_processed; - + nframes_t silent_frames_beginning; nframes_t silent_frames_end; - + /* Silence to add to start and end */ - + nframes_t silence_beginning; nframes_t silence_end; - + /* Takes care that the end postion gets set at some stage */ - + bool end_set; - + }; class ExportFileFactory @@ -160,7 +160,7 @@ class ExportFileFactory typedef GraphSink<float> FloatSink; typedef boost::shared_ptr<FloatSink> FloatSinkPtr; typedef boost::shared_ptr<ExportFileWriter> FileWriterPtr; - + typedef std::pair<FloatSinkPtr, FileWriterPtr> FilePair; static FilePair create (FormatPtr format, uint32_t channels, Glib::ustring const & filename); diff --git a/libs/ardour/ardour/export_filename.h b/libs/ardour/ardour/export_filename.h index 3dccda728f..2847291a13 100644 --- a/libs/ardour/ardour/export_filename.h +++ b/libs/ardour/ardour/export_filename.h @@ -49,7 +49,7 @@ class ExportFilename { D_BE, // big endian (no deliminator) D_BEShortY // big endian short year representation }; - + enum TimeFormat { T_None, T_NoDelim, @@ -60,39 +60,39 @@ class ExportFilename { friend class ExportElementFactory; ExportFilename (Session & session); - public: + public: /* Serialization */ - + XMLNode & get_state (); int set_state (const XMLNode &); - + /* data access */ - + Glib::ustring get_path (FormatPtr format) const; Glib::ustring get_folder () const { return folder; } - + TimeFormat get_time_format () const { return time_format; } DateFormat get_date_format () const { return date_format; } Glib::ustring get_time_format_str (TimeFormat format) const; Glib::ustring get_date_format_str (DateFormat format) const; - + Glib::ustring get_label () const { return label; } uint32_t get_revision () const { return revision; } - + /* data modification */ - + void set_time_format (TimeFormat format); void set_date_format (DateFormat format); void set_label (Glib::ustring value); void set_revision (uint32_t value) { revision = value; } void set_channel (uint32_t value) { channel = value; } bool set_folder (Glib::ustring path); - + void set_timespan (TimespanPtr ts) { timespan = ts; } void set_channel_config (ChannelConfigPtr cc) { channel_config = cc; } - + /* public members */ - + bool include_label; bool include_session; bool include_revision; @@ -101,7 +101,7 @@ class ExportFilename { bool include_timespan; bool include_time; bool include_date; - + private: Session & session; @@ -109,22 +109,22 @@ class ExportFilename { Glib::ustring label; uint32_t revision; uint32_t channel; - + Glib::ustring folder; - + DateFormat date_format; TimeFormat time_format; - + Glib::ustring get_formatted_time (Glib::ustring const & format) const; struct tm * time_struct; // Due to static allocation no destructor or copy-ctor is needed because of this - + TimespanPtr timespan; ChannelConfigPtr channel_config; - + /* Serialization helpers */ - + typedef std::pair<bool, Glib::ustring> FieldPair; - + void add_field (XMLNode * node, Glib::ustring const & name, bool enabled, Glib::ustring const & value = ""); FieldPair get_field (XMLNode const & node, Glib::ustring const & name); FieldPair analyse_folder (); diff --git a/libs/ardour/ardour/export_format_base.h b/libs/ardour/ardour/export_format_base.h index 7d5757a77d..7bc0125004 100644 --- a/libs/ardour/ardour/export_format_base.h +++ b/libs/ardour/ardour/export_format_base.h @@ -43,7 +43,7 @@ class ExportFormatBase { T_None = 0, T_Sndfile }; - + enum FormatId { F_None = 0, F_WAV = SF_FORMAT_WAV, @@ -55,7 +55,7 @@ class ExportFormatBase { F_FLAC = SF_FORMAT_FLAC, F_Ogg = SF_FORMAT_OGG }; - + enum Endianness { E_FileDefault = SF_ENDIAN_FILE, /* Default file endian-ness. */ E_Little = SF_ENDIAN_LITTLE, /* Force little endian-ness. */ @@ -74,14 +74,14 @@ class ExportFormatBase { SF_Double = SF_FORMAT_DOUBLE, SF_Vorbis = SF_FORMAT_VORBIS }; - + enum DitherType { D_None = GDitherNone, D_Rect = GDitherRect, D_Tri = GDitherTri, D_Shaped = GDitherShaped }; - + enum Quality { Q_None = 0, Q_Any, @@ -89,7 +89,7 @@ class ExportFormatBase { Q_LosslessCompression, Q_LossyCompression }; - + enum SampleRate { SR_None = 0, SR_22_05 = 220500, @@ -99,7 +99,7 @@ class ExportFormatBase { SR_96 = 96000, SR_192 = 192000 }; - + enum SRCQuality { SRC_SincBest = SRC_SINC_BEST_QUALITY, SRC_SincMedium = SRC_SINC_MEDIUM_QUALITY, @@ -107,31 +107,31 @@ class ExportFormatBase { SRC_ZeroOrderHold = SRC_ZERO_ORDER_HOLD, SRC_Linear = SRC_LINEAR }; - + /// Class for managing selection and compatibility states class SelectableCompatible { public: - SelectableCompatible () : - _selected (false), _compatible (true) { } + SelectableCompatible () + : _selected (false), _compatible (true) { } ~SelectableCompatible () {} - + sigc::signal<void, bool> SelectChanged; sigc::signal<void, bool> CompatibleChanged; - + bool selected () const { return _selected; } bool compatible () const { return _compatible; } Glib::ustring name () const { return _name; } - + void set_selected (bool value); void set_compatible (bool value); - + protected: void set_name (Glib::ustring name) { _name = name; } - + private: bool _selected; bool _compatible; - + Glib::ustring _name; }; @@ -139,9 +139,9 @@ class ExportFormatBase { ExportFormatBase (); ExportFormatBase (ExportFormatBase const & other); - + virtual ~ExportFormatBase (); - + boost::shared_ptr<ExportFormatBase> get_intersection (ExportFormatBase const & other) const; boost::shared_ptr<ExportFormatBase> get_difference (ExportFormatBase const & other) const; boost::shared_ptr<ExportFormatBase> get_union (ExportFormatBase const & other) const; @@ -151,13 +151,13 @@ class ExportFormatBase { bool sample_rates_empty () const { return sample_rates.empty (); } bool formats_empty () const { return format_ids.empty (); } bool qualities_empty () const { return qualities.empty (); } - + bool has_endianness (Endianness endianness) const { return endiannesses.find (endianness) != endiannesses.end() ; } bool has_sample_format (SampleFormat format) const { return sample_formats.find (format) != sample_formats.end(); } bool has_sample_rate (SampleRate rate) const { return sample_rates.find (rate) != sample_rates.end(); } bool has_format (FormatId format) const { return format_ids.find (format) != format_ids.end(); } bool has_quality (Quality quality) const { return qualities.find (quality) != qualities.end(); } - + void set_extension (Glib::ustring const & extension) { _extension = extension; } Glib::ustring const & extension () const { return _extension; } @@ -172,22 +172,22 @@ class ExportFormatBase { typedef std::set<SampleRate> SampleRateSet; typedef std::set<FormatId> FormatSet; typedef std::set<Quality> QualitySet; - + EndianSet endiannesses; SampleRateSet sample_rates; FormatSet format_ids; QualitySet qualities; - + private: Glib::ustring _extension; - + enum SetOperation { SetUnion, SetDifference, SetIntersection }; - + boost::shared_ptr<ExportFormatBase> do_set_operation (ExportFormatBase const & other, SetOperation operation) const; }; diff --git a/libs/ardour/ardour/export_format_compatibility.h b/libs/ardour/ardour/export_format_compatibility.h index 895937dc98..cd2dae5e20 100644 --- a/libs/ardour/ardour/export_format_compatibility.h +++ b/libs/ardour/ardour/export_format_compatibility.h @@ -39,12 +39,12 @@ class ExportFormatCompatibility : public ExportFormatBase, public ExportFormatBa format_ids.insert (F_None); qualities.insert (Q_None); } - + ~ExportFormatCompatibility () {}; - - ExportFormatCompatibility (ExportFormatBase const & other) : - ExportFormatBase (other) {} - + + ExportFormatCompatibility (ExportFormatBase const & other) + : ExportFormatBase (other) {} + void add_endianness (Endianness endianness) { endiannesses.insert (endianness); } void add_sample_format (SampleFormat format) { sample_formats.insert (format); } void add_sample_rate (SampleRate rate) { sample_rates.insert (rate); } diff --git a/libs/ardour/ardour/export_format_manager.h b/libs/ardour/ardour/export_format_manager.h index f69cfca986..705b9dcf17 100644 --- a/libs/ardour/ardour/export_format_manager.h +++ b/libs/ardour/ardour/export_format_manager.h @@ -46,39 +46,39 @@ class ExportFormatManager : public sigc::trackable typedef boost::shared_ptr<ExportFormatCompatibility> CompatPtr; typedef boost::weak_ptr<ExportFormatCompatibility> WeakCompatPtr; typedef std::list<CompatPtr> CompatList; - + typedef boost::shared_ptr<ExportFormat> FormatPtr; typedef boost::weak_ptr<ExportFormat> WeakFormatPtr; typedef std::list<FormatPtr> FormatList; - + typedef HasSampleFormat::SampleFormatPtr SampleFormatPtr; typedef HasSampleFormat::SampleFormatList SampleFormatList; typedef HasSampleFormat::WeakSampleFormatPtr WeakSampleFormatPtr; - + typedef HasSampleFormat::DitherTypePtr DitherTypePtr; typedef HasSampleFormat::WeakDitherTypePtr WeakDitherTypePtr; - + typedef boost::shared_ptr<ExportFormatSpecification> SpecPtr; typedef boost::shared_ptr<ExportFormatBase> FormatBasePtr; - + /* Quality states */ - + class QualityState : public ExportFormatBase::SelectableCompatible { - public: + public: QualityState (ExportFormatBase::Quality quality, Glib::ustring name) : - quality (quality) { set_name (name); } + quality (quality) { set_name (name); } ExportFormatBase::Quality quality; }; typedef boost::shared_ptr<QualityState> QualityPtr; typedef boost::weak_ptr<QualityState> WeakQualityPtr; typedef std::list<QualityPtr> QualityList; - + /* Sample rate states */ - + class SampleRateState : public ExportFormatBase::SelectableCompatible { public: - SampleRateState (ExportFormatBase::SampleRate rate, Glib::ustring name) : - rate (rate) { set_name (name); } + SampleRateState (ExportFormatBase::SampleRate rate, Glib::ustring name) + : rate (rate) { set_name (name); } ExportFormatBase::SampleRate rate; }; typedef boost::shared_ptr<SampleRateState> SampleRatePtr; @@ -100,11 +100,11 @@ class ExportFormatManager : public sigc::trackable QualityList const & get_qualities () { return qualities; } FormatList const & get_formats () { return formats; } SampleRateList const & get_sample_rates () { return sample_rates; } - + /* Non interactive selections */ - + void set_name (Glib::ustring name); - + void select_src_quality (ExportFormatBase::SRCQuality value); void select_trim_beginning (bool value); void select_silence_beginning (AnyTime const & time); @@ -127,41 +127,41 @@ class ExportFormatManager : public sigc::trackable void add_sample_rate (SampleRatePtr ptr); /* Connected to signals */ - + void change_compatibility_selection (bool select, WeakCompatPtr const & compat); void change_quality_selection (bool select, WeakQualityPtr const & quality); void change_format_selection (bool select, WeakFormatPtr const & format); void change_sample_rate_selection (bool select, WeakSampleRatePtr const & rate); - + void change_sample_format_selection (bool select, WeakSampleFormatPtr const & format); void change_dither_type_selection (bool select, WeakDitherTypePtr const & type); - + /* Do actual selection */ - + void select_compatibility (WeakCompatPtr const & compat); void select_quality (QualityPtr const & quality); void select_format (FormatPtr const & format); void select_sample_rate (SampleRatePtr const & rate); - + void select_sample_format (SampleFormatPtr const & format); void select_dither_type (DitherTypePtr const & type); - + bool pending_selection_change; void selection_changed (); - + /* Formats and compatibilities */ - + QualityPtr get_selected_quality (); FormatPtr get_selected_format (); SampleRatePtr get_selected_sample_rate (); - + SampleFormatPtr get_selected_sample_format (); - + FormatBasePtr get_compatibility_intersection (); - + FormatBasePtr universal_set; SpecPtr current_selection; - + CompatList compatibilities; QualityList qualities; FormatList formats; diff --git a/libs/ardour/ardour/export_format_specification.h b/libs/ardour/ardour/export_format_specification.h index a3f4d4fe19..628c70d25a 100644 --- a/libs/ardour/ardour/export_format_specification.h +++ b/libs/ardour/ardour/export_format_specification.h @@ -46,14 +46,14 @@ class ExportFormatSpecification : public ExportFormatBase { struct Time : public AnyTime { Time (Session & session) : AnyTime (), session (session) {} Time & operator= (AnyTime const & other); - + nframes_t get_frames (nframes_t target_rate) const; - + /* Serialization */ - + XMLNode & get_state (); int set_state (const XMLNode & node); - + private: Session & session; }; @@ -62,18 +62,18 @@ class ExportFormatSpecification : public ExportFormatBase { friend class ExportElementFactory; explicit ExportFormatSpecification (Session & s); ExportFormatSpecification (Session & s, XMLNode const & state); - + public: ExportFormatSpecification (ExportFormatSpecification const & other); ~ExportFormatSpecification (); /* compatibility */ - + bool is_compatible_with (ExportFormatCompatibility const & compatibility) const; bool is_complete () const; /* Modifying functions */ - + void set_format (boost::shared_ptr<ExportFormat> format); void set_name (Glib::ustring const & name) { _name = name; } @@ -84,29 +84,29 @@ class ExportFormatSpecification : public ExportFormatBase { void set_sample_format (SampleFormat value) { sample_formats.clear(); sample_formats.insert (value); } void set_sample_rate (SampleRate value) { sample_rates.clear(); sample_rates.insert (value); } void set_quality (Quality value) { qualities.clear(); qualities.insert (value); } - + void set_dither_type (DitherType value) { _dither_type = value; } void set_src_quality (SRCQuality value) { _src_quality = value; } void set_trim_beginning (bool value) { _trim_beginning = value; } void set_trim_end (bool value) { _trim_end = value; } void set_normalize (bool value) { _normalize = value; } void set_normalize_target (float value) { _normalize_target = value; } - + void set_tag (bool tag_it) { _tag = tag_it; } - + void set_silence_beginning (AnyTime const & value) { _silence_beginning = value; } void set_silence_end (AnyTime const & value) { _silence_end = value; } - + /* Accessing functions */ - + PBD::UUID const & id () { return _id; } Glib::ustring const & name () const { return _name; } Glib::ustring description (); - + bool has_broadcast_info () const { return _has_broadcast_info; } uint32_t channel_limit () const { return _channel_limit; } Glib::ustring format_name () const { return _format_name; } - + Type type () const { return _type; } FormatId format_id () const { return *format_ids.begin(); } Endianness endianness () const { return *endiannesses.begin(); } @@ -120,54 +120,54 @@ class ExportFormatSpecification : public ExportFormatBase { bool trim_end () const { return _trim_end; } bool normalize () const { return _normalize; } float normalize_target () const { return _normalize_target; } - + bool tag () const { return _tag && supports_tagging; } - + nframes_t silence_beginning () const { return _silence_beginning.get_frames (sample_rate()); } nframes_t silence_end () const { return _silence_end.get_frames (sample_rate()); } - + AnyTime silence_beginning_time () const { return _silence_beginning; } AnyTime silence_end_time () const { return _silence_end; } - + /* Serialization */ - + XMLNode & get_state (); int set_state (const XMLNode & root); - + private: - + Session & session; - + /* The variables below do not have setters (usually set via set_format) */ - + Glib::ustring _format_name; bool has_sample_format; bool supports_tagging; bool _has_broadcast_info; uint32_t _channel_limit; - + /* The variables below have getters and setters */ - + Glib::ustring _name; PBD::UUID _id; - + Type _type; DitherType _dither_type; SRCQuality _src_quality; - + bool _tag; - + bool _trim_beginning; Time _silence_beginning; bool _trim_end; Time _silence_end; - + bool _normalize; float _normalize_target; - + /* serialization helpers */ - + void add_option (XMLNode * node, std::string const & name, std::string const & value); std::string get_option (XMLNode const * node, std::string const & name); diff --git a/libs/ardour/ardour/export_formats.h b/libs/ardour/ardour/export_formats.h index b7a7916767..3312e9abd6 100644 --- a/libs/ardour/ardour/export_formats.h +++ b/libs/ardour/ardour/export_formats.h @@ -42,43 +42,43 @@ class ExportFormat : public ExportFormatBase, public ExportFormatBase::Selectabl public: ExportFormat () {}; ~ExportFormat () {}; - + virtual bool set_compatibility_state (ExportFormatCompatibility const & compatibility) = 0; virtual Type get_type () const = 0; - + FormatId get_format_id () const { return *format_ids.begin(); } Quality get_quality () const { return *qualities.begin(); } - + bool has_sample_format (); bool sample_format_is_compatible (SampleFormat format) const; - + /* If the format has a specific sample format, this function should be overriden * if the format has a selectable sample format, do not override this! */ - + virtual SampleFormat get_explicit_sample_format () const { return SF_None; } /* If the above is not overriden, this one should be */ virtual ExportFormat::SampleFormat default_sample_format () const { return SF_None; } - + /* If the format has a channel count limit, override this */ - + virtual uint32_t get_channel_limit () const { return 256; } - + /* If the format can be tagged with metadata override this */ - + virtual bool supports_tagging () const { return false; } - + /* If the format contains broadcast info override this */ - + virtual bool has_broadcast_info () const { return false; } protected: - + void add_sample_rate (SampleRate rate) { sample_rates.insert (rate); } void add_endianness (Endianness endianness) { endiannesses.insert (endianness); } - + void set_format_id (FormatId id) { format_ids.clear (); format_ids.insert (id); } void set_quality (Quality value) { qualities.clear(); qualities.insert (value); } }; @@ -91,7 +91,7 @@ class HasSampleFormat { public: SampleFormatState (ExportFormatBase::SampleFormat format, Glib::ustring name) : format (format) { set_name (name); } - + ExportFormatBase::SampleFormat format; }; @@ -99,14 +99,14 @@ class HasSampleFormat { public: DitherTypeState (ExportFormatBase::DitherType type, Glib::ustring name) : type (type) { set_name (name); } - + ExportFormatBase::DitherType type; }; - + typedef boost::shared_ptr<SampleFormatState> SampleFormatPtr; typedef boost::weak_ptr<SampleFormatState> WeakSampleFormatPtr; typedef std::list<SampleFormatPtr> SampleFormatList; - + typedef boost::shared_ptr<DitherTypeState> DitherTypePtr; typedef boost::weak_ptr<DitherTypeState> WeakDitherTypePtr; typedef std::list<DitherTypePtr> DitherTypeList; @@ -117,21 +117,21 @@ class HasSampleFormat { virtual ~HasSampleFormat () {}; void add_sample_format (ExportFormatBase::SampleFormat format); - + SampleFormatList const & get_sample_formats () const { return sample_format_states; } DitherTypeList const & get_dither_types () const { return dither_type_states; } - + SampleFormatPtr get_selected_sample_format (); DitherTypePtr get_selected_dither_type (); - + /* Proxies for signals from sample formats and dither types */ - + sigc::signal<void, bool, WeakSampleFormatPtr> SampleFormatSelectChanged; sigc::signal<void, bool, WeakSampleFormatPtr> SampleFormatCompatibleChanged; - + sigc::signal<void, bool, WeakDitherTypePtr> DitherTypeSelectChanged; sigc::signal<void, bool, WeakDitherTypePtr> DitherTypeCompatibleChanged; - + static std::string get_sample_format_name (ExportFormatBase::SampleFormat format); protected: @@ -142,11 +142,11 @@ class HasSampleFormat { private: /* Connected to signals */ - + void add_dither_type (ExportFormatBase::DitherType type, Glib::ustring name); void update_sample_format_selection (bool); void update_dither_type_selection (bool); - + /* Reference to ExportFormatBase::sample_formats */ ExportFormatBase::SampleFormatSet & _sample_formats; }; @@ -156,15 +156,15 @@ class ExportFormatLinear : public ExportFormat, public HasSampleFormat { ExportFormatLinear (Glib::ustring name, FormatId format_id); ~ExportFormatLinear () {}; - + bool set_compatibility_state (ExportFormatCompatibility const & compatibility); Type get_type () const { return T_Sndfile; } - + void add_endianness (Endianness endianness) { endiannesses.insert (endianness); } - + void set_default_sample_format (SampleFormat sf) { _default_sample_format = sf; } SampleFormat default_sample_format () const { return _default_sample_format; } - + protected: SampleFormat _default_sample_format; }; @@ -173,7 +173,7 @@ class ExportFormatOggVorbis : public ExportFormat { public: ExportFormatOggVorbis (); ~ExportFormatOggVorbis () {}; - + bool set_compatibility_state (ExportFormatCompatibility const & compatibility); Type get_type () const { return T_Sndfile; } SampleFormat get_explicit_sample_format () const { return SF_Vorbis; } @@ -184,10 +184,10 @@ class ExportFormatFLAC : public ExportFormat, public HasSampleFormat { public: ExportFormatFLAC (); ~ExportFormatFLAC () {}; - + bool set_compatibility_state (ExportFormatCompatibility const & compatibility); Type get_type () const { return T_Sndfile; } - + uint32_t get_channel_limit () const { return 8; } SampleFormat default_sample_format () const { return SF_16; } virtual bool supports_tagging () const { return true; } @@ -197,10 +197,10 @@ class ExportFormatBWF : public ExportFormat, public HasSampleFormat { public: ExportFormatBWF (); ~ExportFormatBWF () {}; - + bool set_compatibility_state (ExportFormatCompatibility const & compatibility); Type get_type () const { return T_Sndfile; } - + SampleFormat default_sample_format () const { return SF_16; } virtual bool has_broadcast_info () const { return true; } }; diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h index c945070408..b222c04eb4 100644 --- a/libs/ardour/ardour/export_handler.h +++ b/libs/ardour/ardour/export_handler.h @@ -71,27 +71,27 @@ class ExportElementFactory class ExportHandler : public ExportElementFactory, public sigc::trackable { private: - + /* Stuff for export configs * The multimap maps timespans to file specifications */ - + struct FileSpec { - + FileSpec (ChannelConfigPtr channel_config, FormatPtr format, FilenamePtr filename) : channel_config (channel_config), format (format), filename (filename) {} - + ChannelConfigPtr channel_config; FormatPtr format; FilenamePtr filename; }; - + typedef std::pair<TimespanPtr, FileSpec> ConfigPair; typedef std::multimap<TimespanPtr, FileSpec> ConfigMap; - + typedef boost::shared_ptr<ExportProcessor> ProcessorPtr; typedef boost::shared_ptr<ExportStatus> StatusPtr; @@ -102,7 +102,7 @@ class ExportHandler : public ExportElementFactory, public sigc::trackable friend boost::shared_ptr<ExportHandler> Session::get_export_handler(); ExportHandler (Session & session); - + public: ~ExportHandler (); @@ -115,62 +115,62 @@ class ExportHandler : public ExportElementFactory, public sigc::trackable ProcessorPtr processor; StatusPtr export_status; ConfigMap config_map; - + bool realtime; - + sigc::connection files_written_connection; std::list<Glib::ustring> files_written; - + /* CD Marker stuff */ - + struct CDMarkerStatus { CDMarkerStatus (std::string out_file, TimespanPtr timespan, FormatPtr format, std::string filename) : out (out_file.c_str()), timespan (timespan), format (format), filename (filename), track_number (1), track_position (0), track_duration (0), track_start_frame (0), index_number (1), index_position (0) {} - + /* General info */ std::ofstream out; TimespanPtr timespan; FormatPtr format; std::string filename; Location * marker; - + /* Track info */ uint32_t track_number; nframes_t track_position; nframes_t track_duration; nframes_t track_start_frame; - + /* Index info */ uint32_t index_number; nframes_t index_position; }; - - + + void export_cd_marker_file (TimespanPtr timespan, FormatPtr file_format, std::string filename, CDMarkerFormat format); - + void write_cue_header (CDMarkerStatus & status); void write_toc_header (CDMarkerStatus & status); - + void write_track_info_cue (CDMarkerStatus & status); void write_track_info_toc (CDMarkerStatus & status); void write_index_info_cue (CDMarkerStatus & status); void write_index_info_toc (CDMarkerStatus & status); - + void frames_to_cd_frames_string (char* buf, nframes_t when); - + int cue_tracknum; int cue_indexnum; - + /* Timespan management */ - + void start_timespan (); void finish_timespan (); void timespan_thread_finished (); - + typedef std::pair<ConfigMap::iterator, ConfigMap::iterator> TimespanBounds; TimespanPtr current_timespan; ConfigMap::iterator current_map_it; diff --git a/libs/ardour/ardour/export_multiplication.h b/libs/ardour/ardour/export_multiplication.h index c8fd20c60e..4826a35668 100644 --- a/libs/ardour/ardour/export_multiplication.h +++ b/libs/ardour/ardour/export_multiplication.h @@ -12,42 +12,42 @@ public: GraphNode (); virtual ~GraphNode (); - + uint32_t id() const { return _id; } - + /* Children and parents. Note: only children are kept in order! */ - + list<GraphNode *> const & get_parents () const { return parents; } - + void add_child (GraphNode * child, GraphNode * left_sibling); void remove_child (GraphNode * child); GraphNode * first_child () const { return children.front(); } GraphNode * last_child () const { return children.back(); } list<GraphNode *> const & get_children () const { return children; } - + /* Relation functions */ - + bool is_ancestor_of (GraphNode const * node) const; bool is_descendant_of (GraphNode const * node) const; bool equals (GraphNode const * node) const { return node == this; } - + /* Selection functions */ - + bool selected () const { return _selected; } void select (bool value); - + sigc::signal<void, bool> SelectChanged; - + protected: - + /* Parent manipulation functions should be used only from child manipulation functions! */ - + void add_parent (GraphNode * parent); void remove_parent (GraphNode * parent); - + list<GraphNode *> parents; list<GraphNode *> children; - + bool _selected; uint32_t _id; static uint32_t id_counter; @@ -60,10 +60,10 @@ typedef boost::shared_ptr<T> DataPtr; typedef boost::shared_ptr<DataNode<T> > SelfPtr; typedef boost::weak_ptr<DataNode<T> > WeakSelfPtr; - + DataNode (DataPtr data) : _data (data) {} void set_self_ptr (boost::shared_ptr<DataNode<T> > ptr) { _self_ptr = ptr; } - + public: static SelfPtr create (T * data) { @@ -71,14 +71,14 @@ ptr->set_self_ptr (ptr); return ptr; } - + static SelfPtr create (DataPtr data) { SelfPtr ptr = SelfPtr (new DataNode<T> (data)); ptr->set_self_ptr (ptr); return ptr; } - + DataPtr data() { return _data; } SelfPtr self_ptr () { return _self_ptr.lock(); } @@ -87,7 +87,7 @@ { parents.sort (NodeSorter<P> (sort_list)); } - + private: DataPtr _data; WeakSelfPtr _self_ptr; @@ -95,14 +95,14 @@ private: /* Sorts GraphNodes according to a list of DataNodes */ - + template<typename T> class NodeSorter { public: typedef list<boost::shared_ptr<DataNode<T> > > ListType; - + NodeSorter (ListType const & list) : list (list) {} - + bool operator() (GraphNode * one, GraphNode * other) // '<' operator { if (one == other) { return false; } // Strict weak ordering @@ -114,12 +114,12 @@ return false; } } - + std::cerr << "Invalid comparison list given to NodeSorter" << std::endl; - + abort(); } - + private: ListType const & list; }; @@ -129,16 +129,16 @@ typedef DataNode<TimespanState> TimespanNode; typedef boost::shared_ptr<TimespanNode> TimespanNodePtr; - + typedef DataNode<ChannelConfigState> ChannelConfigNode; typedef boost::shared_ptr<ChannelConfigNode> ChannelConfigNodePtr; - + typedef DataNode<FormatState> FormatNode; typedef boost::shared_ptr<FormatNode> FormatNodePtr; - + typedef DataNode<FilenameState> FilenameNode; typedef boost::shared_ptr<FilenameNode> FilenameNodePtr; - + struct MultiplicationGraph { list<TimespanNodePtr> timespans; list<ChannelConfigNodePtr> channel_configs; @@ -147,35 +147,35 @@ }; MultiplicationGraph const & get_graph () { return graph; } - + void split_node (GraphNode * node, float position); void remove_node (GraphNode * node); - + sigc::signal<void> GraphChanged; private: void purge_graph (); - + template<typename T> static void insert_after (list<T> & the_list, T const & position, T const & element); - + template<typename T> static void remove_by_element (list<T> & the_list, T const & element); - + bool nodes_have_one_common_child (list<GraphNode *> const & the_list); list<GraphNode *>::const_iterator end_of_common_child_range (list<GraphNode *> const & the_list, list<GraphNode *>::const_iterator beginning); void split_node_at_position (GraphNode * old_node, GraphNode * new_node, float position); - + void split_timespan (TimespanNodePtr node, float position = 0.5); void split_channel_config (ChannelConfigNodePtr node, float position = 0.5); void split_format (FormatNodePtr node, float position = 0.5); void split_filename (FilenameNodePtr node, float position = 0.5); - + void duplicate_timespan_children (TimespanNodePtr source, TimespanNodePtr target, GraphNode * insertion_point = 0); void duplicate_channel_config_children (ChannelConfigNodePtr source, ChannelConfigNodePtr target, GraphNode * insertion_point = 0); void duplicate_format_children (FormatNodePtr source, FormatNodePtr target, GraphNode * insertion_point = 0); - + TimespanNodePtr duplicate_timespan_node (TimespanNodePtr node); ChannelConfigNodePtr duplicate_channel_config_node (ChannelConfigNodePtr node); FormatNodePtr duplicate_format_node (FormatNodePtr node); diff --git a/libs/ardour/ardour/export_preset.h b/libs/ardour/ardour/export_preset.h index c518a208ea..b24cc70dcf 100644 --- a/libs/ardour/ardour/export_preset.h +++ b/libs/ardour/ardour/export_preset.h @@ -44,10 +44,10 @@ class ExportPreset { // Note: The set_..._state functions take ownership of the XMLNode void set_global_state (XMLNode & state); void set_local_state (XMLNode & state); - + XMLNode const * get_global_state () const { return global.root(); } XMLNode const * get_local_state () const { return local; } - + void save (std::string const & filename); void remove_local () const; @@ -65,7 +65,7 @@ class ExportPreset { Session & session; XMLTree global; XMLNode * local; - + }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/export_processor.h b/libs/ardour/ardour/export_processor.h index 832b200848..c2cb5034c7 100644 --- a/libs/ardour/ardour/export_processor.h +++ b/libs/ardour/ardour/export_processor.h @@ -43,22 +43,22 @@ class ExportProcessor { private: /* Typedefs for utility processors */ - + typedef boost::shared_ptr<SampleRateConverter> SRConverterPtr; typedef boost::shared_ptr<PeakReader> PReaderPtr; typedef boost::shared_ptr<Normalizer> NormalizerPtr; typedef boost::shared_ptr<ExportTempFile> TempFilePtr; - + typedef GraphSink<float> FloatSink; typedef boost::shared_ptr<FloatSink> FloatSinkPtr; typedef std::vector<FloatSinkPtr> FloatSinkVect; - + typedef boost::shared_ptr<ExportFilename> FilenamePtr; typedef boost::shared_ptr<ExportFormatSpecification const> FormatPtr; - + typedef boost::shared_ptr<ExportFileWriter> FileWriterPtr; typedef std::list<FileWriterPtr> FileWriterList; - + public: ExportProcessor (Session & session); @@ -70,27 +70,27 @@ class ExportProcessor * @return 0 on success */ int prepare (FormatPtr format, FilenamePtr fname, uint32_t chans, bool split = false, nframes_t start = 0); - + /// Process data /** @param frames frames to process @return frames written **/ nframes_t process (float * data, nframes_t frames); - + /** should be called after all data is given to process **/ void prepare_post_processors (); - + void write_files (); - + static sigc::signal<void, Glib::ustring> WritingFile; - + private: - + void reset (); - + Session & session; boost::shared_ptr<ExportStatus> status; - + /* these are initalized in prepare() */ - + FilenamePtr filename; NormalizerPtr normalizer; SRConverterPtr src; @@ -98,15 +98,15 @@ class ExportProcessor TempFilePtr temp_file; FloatSinkVect file_sinks; FileWriterList writer_list; - + /* general info */ - + uint32_t channels; nframes_t blocksize; nframes_t frame_rate; - + /* Processing */ - + bool tag; bool broadcast_info; bool split_files; @@ -115,9 +115,9 @@ class ExportProcessor bool trim_end; nframes_t silence_beginning; nframes_t silence_end; - + /* Progress info */ - + nframes_t temp_file_position; nframes_t temp_file_length; }; diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h index bf261cad46..b402550a64 100644 --- a/libs/ardour/ardour/export_profile_manager.h +++ b/libs/ardour/ardour/export_profile_manager.h @@ -61,10 +61,10 @@ class ExportProfileManager void load_profile (); void prepare_for_export (); - + typedef boost::shared_ptr<ExportPreset> PresetPtr; typedef std::list<PresetPtr> PresetList; - + PresetList const & get_presets () { return preset_list; } bool load_preset (PresetPtr preset); PresetPtr save_preset (std::string const & name); @@ -75,27 +75,27 @@ class ExportProfileManager typedef std::pair<PBD::UUID, PBD::sys::path> FilePair; typedef std::map<PBD::UUID, PBD::sys::path> FileMap; - + HandlerPtr handler; Session & session; - + void load_presets (); void load_preset_from_disk (PBD::sys::path const & path); - + bool set_state (XMLNode const & root); bool set_global_state (XMLNode const & root); bool set_local_state (XMLNode const & root); - + void serialize_profile (XMLNode & root); void serialize_global_profile (XMLNode & root); void serialize_local_profile (XMLNode & root); - + PresetList preset_list; PresetPtr current_preset; FileMap preset_file_map; - + std::vector<PBD::sys::path> find_file (std::string const & pattern); - + PBD::sys::path export_config_dir; PBD::SearchPath search_path; @@ -118,47 +118,47 @@ class ExportProfileManager struct TimespanState { TimespanListPtr timespans; TimeFormat time_format; - + boost::shared_ptr<Location> session_range; boost::shared_ptr<Location> selection_range; boost::shared_ptr<LocationList> ranges; - + TimespanState (boost::shared_ptr<Location> session_range, boost::shared_ptr<Location> selection_range, boost::shared_ptr<LocationList> ranges) : timespans (new TimespanList ()), time_format (SMPTE), - + session_range (session_range), selection_range (selection_range), ranges (ranges) {} }; - + typedef boost::shared_ptr<TimespanState> TimespanStatePtr; typedef std::list<TimespanStatePtr> TimespanStateList; - + void set_selection_range (nframes_t start = 0, nframes_t end = 0); std::string set_single_range (nframes_t start, nframes_t end, Glib::ustring name); TimespanStateList const & get_timespans () { return check_list (timespans); } - + private: TimespanStateList timespans; bool init_timespans (XMLNodeList nodes); - + TimespanStatePtr deserialize_timespan (XMLNode & root); XMLNode & serialize_timespan (TimespanStatePtr state); - + /* Locations */ - + void update_ranges (); - + boost::shared_ptr<Location> session_range; boost::shared_ptr<Location> selection_range; boost::shared_ptr<LocationList> ranges; - + bool single_range_mode; boost::shared_ptr<Location> single_range; @@ -169,12 +169,12 @@ class ExportProfileManager struct ChannelConfigState { ChannelConfigPtr config; - + ChannelConfigState (ChannelConfigPtr ptr) : config (ptr) {} }; typedef boost::shared_ptr<ChannelConfigState> ChannelConfigStatePtr; typedef std::list<ChannelConfigStatePtr> ChannelConfigStateList; - + ChannelConfigStateList const & get_channel_configs () { return check_list (channel_configs); } private: @@ -192,21 +192,21 @@ class ExportProfileManager struct FormatState { boost::shared_ptr<FormatList const> list; FormatPtr format; - + FormatState (boost::shared_ptr<FormatList const> list, FormatPtr format) : list (list), format (format) {} }; typedef boost::shared_ptr<FormatState> FormatStatePtr; typedef std::list<FormatStatePtr> FormatStateList; - + FormatStateList const & get_formats () { return check_list (formats); } FormatStatePtr duplicate_format_state (FormatStatePtr state); void remove_format_state (FormatStatePtr state); - + PBD::sys::path save_format_to_disk (FormatPtr format); void remove_format_profile (FormatPtr format); FormatPtr get_new_format (FormatPtr original); - + sigc::signal<void> FormatListChanged; private: @@ -218,26 +218,26 @@ class ExportProfileManager XMLNode & serialize_format (FormatStatePtr state); void load_formats (); - + FormatPtr load_format (XMLNode & node); void load_format_from_disk (PBD::sys::path const & path); boost::shared_ptr<FormatList> format_list; FileMap format_file_map; - + /* Filenames */ public: - + typedef boost::shared_ptr<ExportFilename> FilenamePtr; - + struct FilenameState { FilenamePtr filename; - + FilenameState (FilenamePtr ptr) : filename (ptr) {} }; typedef boost::shared_ptr<FilenameState> FilenameStatePtr; typedef std::list<FilenameStatePtr> FilenameStateList; - + FilenameStateList const & get_filenames () { return check_list (filenames); } FilenameStatePtr duplicate_filename_state (FilenameStatePtr state); void remove_filename_state (FilenameStatePtr state); @@ -245,7 +245,7 @@ class ExportProfileManager private: FilenameStateList filenames; - + bool init_filenames (XMLNodeList nodes); FilenamePtr load_filename (XMLNode & node); @@ -256,9 +256,9 @@ class ExportProfileManager std::list<Glib::ustring> warnings; std::list<Glib::ustring> conflicting_filenames; }; - + boost::shared_ptr<Warnings> get_warnings (); - + private: void check_config (boost::shared_ptr<Warnings> warnings, TimespanStatePtr timespan_state, diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h index 42b0b061f0..3322ca639c 100644 --- a/libs/ardour/ardour/export_status.h +++ b/libs/ardour/ardour/export_status.h @@ -40,40 +40,40 @@ struct ExportStatus : public sigc::trackable { ExportStatus (); void init (); - + /* Status info */ - + volatile bool stop; volatile bool running; - + sigc::signal<void> Aborting; void abort (bool error_occurred = false); bool aborted () const { return _aborted; } bool errors () const { return _errors; } - + sigc::signal<void> Finished; void finish (); bool finished () const { return _finished; } - + /* Progress info */ - + volatile ExportStage stage; volatile float progress; - + volatile uint32_t total_timespans; volatile uint32_t timespan; - + volatile uint32_t total_channel_configs; volatile uint32_t channel_config; - + volatile uint32_t total_formats; volatile uint32_t format; - + private: volatile bool _aborted; volatile bool _errors; volatile bool _finished; - + }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h index 8c1ce10730..255d1e377d 100644 --- a/libs/ardour/ardour/export_timespan.h +++ b/libs/ardour/ardour/export_timespan.h @@ -47,30 +47,30 @@ class ExportTimespan : public sigc::trackable private: friend class ExportElementFactory; ExportTimespan (ExportStatusPtr status, nframes_t frame_rate); - + public: ~ExportTimespan (); - + Glib::ustring name () const { return _name; } void set_name (Glib::ustring name) { _name = name; } - + Glib::ustring range_id () const { return _range_id; } void set_range_id (Glib::ustring range_id) { _range_id = range_id; } - + /// Registers a channel to be read when export starts rolling void register_channel (ExportChannelPtr channel); - + /// "Rewinds" the tempfiles to start reading the beginnings again void rewind (); - + /// Reads data from the tempfile belonging to channel into data nframes_t get_data (float * data, nframes_t frames, ExportChannelPtr channel); - + /// Reads data from each channel and writes to tempfile int process (nframes_t frames); - + sigc::connection process_connection; - + void set_range (nframes_t start, nframes_t end); nframes_t get_length () const { return end_frame - start_frame; } nframes_t get_start () const { return start_frame; } @@ -86,7 +86,7 @@ class ExportTimespan : public sigc::trackable nframes_t frame_rate; TempFileMap filemap; - + Glib::ustring _name; Glib::ustring _range_id; diff --git a/libs/ardour/ardour/export_utilities.h b/libs/ardour/ardour/export_utilities.h index a9044345a6..5733ebb403 100644 --- a/libs/ardour/ardour/export_utilities.h +++ b/libs/ardour/ardour/export_utilities.h @@ -44,22 +44,22 @@ class SampleRateConverter : public GraphSinkVertex<float, float> protected: nframes_t process (float * data, nframes_t frames); - + private: bool active; uint32_t channels; - + nframes_t leftover_frames; nframes_t max_leftover_frames; nframes_t frames_in; nframes_t frames_out; - + float * data_in; float * leftover_data; - + float * data_out; nframes_t data_out_size; - + SRC_DATA src_data; SRC_STATE* src_state; }; @@ -72,21 +72,21 @@ class SampleFormatConverter : public GraphSinkVertex<float, TOut> public: SampleFormatConverter (uint32_t channels, ExportFormatBase::DitherType type = ExportFormatBase::D_None, int data_width_ = 0); ~SampleFormatConverter (); - + void set_clip_floats (bool yn) { clip_floats = yn; } - + protected: nframes_t process (float * data, nframes_t frames); - + private: uint32_t channels; int data_width; GDither dither; nframes_t data_out_size; TOut * data_out; - + bool clip_floats; - + }; /* Peak reader */ @@ -96,16 +96,16 @@ class PeakReader : public GraphSinkVertex<float, float> public: PeakReader (uint32_t channels) : channels (channels), peak (0) {} ~PeakReader () {} - + float get_peak () { return peak; } - + protected: nframes_t process (float * data, nframes_t frames) { peak = compute_peak (data, channels * frames, peak); return piped_to->write (data, frames); } - + private: uint32_t channels; float peak; @@ -118,15 +118,15 @@ class Normalizer : public GraphSinkVertex<float, float> public: Normalizer (uint32_t channels, float target_dB); ~Normalizer (); - + void set_peak (float peak); - + protected: nframes_t process (float * data, nframes_t frames); - + private: uint32_t channels; - + bool enabled; gain_t target; gain_t gain; diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index 82a54094ef..7844bb513a 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006-2009 Paul Davis + Copyright (C) 2006-2009 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 @@ -17,7 +17,7 @@ */ -#ifndef __ardour_filesource_h__ +#ifndef __ardour_filesource_h__ #define __ardour_filesource_h__ #include <exception> @@ -37,11 +37,11 @@ public: const Glib::ustring& path() const { return _path; } virtual bool safe_file_extension (const Glib::ustring& path) const = 0; - + int move_to_trash (const Glib::ustring& trash_dir_name); void mark_take (const Glib::ustring& id); void mark_immutable (); - + const Glib::ustring& take_id () const { return _take_id; } bool is_embedded () const { return _is_embedded; } uint16_t channel() const { return _channel; } @@ -49,24 +49,24 @@ public: int set_state (const XMLNode&); int set_source_name (const Glib::ustring& newname, bool destructive); - + static void set_search_path (DataType type, const Glib::ustring& path); static bool find (DataType type, const Glib::ustring& path, - bool must_exist, bool& is_new, uint16_t& chan, - Glib::ustring& found_path); + bool must_exist, bool& is_new, uint16_t& chan, + Glib::ustring& found_path); protected: FileSource (Session& session, DataType type, const Glib::ustring& path, bool embedded, Source::Flag flags = Source::Flag(0)); - + FileSource (Session& session, const XMLNode& node, bool must_exist); virtual int init (const Glib::ustring& idstr, bool must_exist); - + virtual int move_dependents_to_trash() { return 0; } - + bool removable () const; Glib::ustring _path; diff --git a/libs/ardour/ardour/filesystem_paths.h b/libs/ardour/ardour/filesystem_paths.h index 7e14c9a4fa..e183193cb0 100644 --- a/libs/ardour/ardour/filesystem_paths.h +++ b/libs/ardour/ardour/filesystem_paths.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Tim Mayberry + Copyright (C) 2007 Tim Mayberry 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/filter.h b/libs/ardour/ardour/filter.h index ad0c7d268c..697e19539e 100644 --- a/libs/ardour/ardour/filter.h +++ b/libs/ardour/ardour/filter.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 Paul Davis Author: Dave Robillard This program is free software; you can redistribute it and/or modify @@ -42,7 +42,7 @@ class Filter { int make_new_sources (boost::shared_ptr<ARDOUR::Region>, ARDOUR::SourceList&, std::string suffix = ""); int finish (boost::shared_ptr<ARDOUR::Region>, ARDOUR::SourceList&, std::string region_name = ""); - + ARDOUR::Session& session; }; diff --git a/libs/ardour/ardour/gain.h b/libs/ardour/ardour/gain.h index 207f794910..785475444a 100644 --- a/libs/ardour/ardour/gain.h +++ b/libs/ardour/ardour/gain.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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/gdither_types_internal.h b/libs/ardour/ardour/gdither_types_internal.h index e73a256310..6cb0c48af9 100644 --- a/libs/ardour/ardour/gdither_types_internal.h +++ b/libs/ardour/ardour/gdither_types_internal.h @@ -25,7 +25,7 @@ #ifdef __cplusplus extern "C" { #endif - + #define GDITHER_SH_BUF_SIZE 8 #define GDITHER_SH_BUF_MASK 7 diff --git a/libs/ardour/ardour/graph.h b/libs/ardour/ardour/graph.h index c0e29b6735..5d6919f56e 100644 --- a/libs/ardour/ardour/graph.h +++ b/libs/ardour/ardour/graph.h @@ -34,10 +34,10 @@ class GraphSink { public: GraphSink () : end_of_input (false) {} virtual ~GraphSink () { end_of_input = false; } - + // writes data and return number of frames written virtual nframes_t write (T * data, nframes_t frames) = 0; - + // Notifies end of input. All left over data must be written at this stage virtual void set_end_of_input (bool state = true) { @@ -54,7 +54,7 @@ class GraphSource { public: GraphSource () {} virtual ~GraphSource () {} - + virtual nframes_t read (T * data, nframes_t frames) = 0; }; @@ -64,19 +64,19 @@ class GraphSinkVertex : public GraphSink<TIn> { public: GraphSinkVertex () {} virtual ~GraphSinkVertex () {} - + void pipe_to (boost::shared_ptr<GraphSink<TOut> > dest) { piped_to = dest; } - + nframes_t write (TIn * data, nframes_t frames) { if (!piped_to) { return -1; } return process (data, frames); - } - + } + virtual void set_end_of_input (bool state = true) { if (!piped_to) { @@ -85,10 +85,10 @@ class GraphSinkVertex : public GraphSink<TIn> { piped_to->set_end_of_input (state); GraphSink<TIn>::end_of_input = state; } - + protected: boost::shared_ptr<GraphSink<TOut> > piped_to; - + /* process must process data, use piped_to->write to write the data and return number of frames written */ diff --git a/libs/ardour/ardour/importable_source.h b/libs/ardour/ardour/importable_source.h index 26c840b60f..801e7888a9 100644 --- a/libs/ardour/ardour/importable_source.h +++ b/libs/ardour/ardour/importable_source.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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/internal_return.h b/libs/ardour/ardour/internal_return.h index 384f2900d8..4d2839cb12 100644 --- a/libs/ardour/ardour/internal_return.h +++ b/libs/ardour/ardour/internal_return.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 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 @@ -30,7 +30,7 @@ namespace ARDOUR { class InternalReturn : public Return { - public: + public: InternalReturn (Session&); InternalReturn (Session&, const XMLNode&); diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h index 4cca8e2c89..ef7d3d3d54 100644 --- a/libs/ardour/ardour/internal_send.h +++ b/libs/ardour/ardour/internal_send.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 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 @@ -27,7 +27,7 @@ namespace ARDOUR { class InternalSend : public Send { - public: + public: InternalSend (Session&, boost::shared_ptr<MuteMaster>, boost::shared_ptr<Route> send_to, Delivery::Role role); InternalSend (Session&, boost::shared_ptr<MuteMaster>, const XMLNode&); virtual ~InternalSend (); @@ -39,7 +39,7 @@ class InternalSend : public Send XMLNode& state(bool full); XMLNode& get_state(void); int set_state(const XMLNode& node); - + void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes); bool feeds (boost::shared_ptr<Route> other) const; bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const; diff --git a/libs/ardour/ardour/interpolation.h b/libs/ardour/ardour/interpolation.h index cdd3bfc1b5..2b777ac840 100644 --- a/libs/ardour/ardour/interpolation.h +++ b/libs/ardour/ardour/interpolation.h @@ -12,22 +12,22 @@ class Interpolation { protected: double _speed, _target_speed; - // the idea is that when the speed is not 1.0, we have to - // interpolate between samples and then we have to store where we thought we were. + // the idea is that when the speed is not 1.0, we have to + // interpolate between samples and then we have to store where we thought we were. // rather than being at sample N or N+1, we were at N+0.8792922 std::vector<double> phase; - + public: Interpolation () { _speed = 1.0; _target_speed = 1.0; } ~Interpolation () { phase.clear(); } - + void set_speed (double new_speed) { _speed = new_speed; _target_speed = new_speed; } void set_target_speed (double new_speed) { _target_speed = new_speed; } double target_speed() const { return _target_speed; } double speed() const { return _speed; } - + void add_channel_to (int /*input_buffer_size*/, int /*output_buffer_size*/) { phase.push_back (0.0); } void remove_channel_from () { phase.pop_back (); } @@ -40,7 +40,7 @@ class Interpolation { class LinearInterpolation : public Interpolation { protected: - + public: nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output); }; @@ -55,11 +55,11 @@ class CubicInterpolation : public Interpolation { fr * (4.0f * inp1 + 2.0f * inm1 - 5.0f * in - inp2 + fr * (3.0f * (in - inp1) - inm1 + inp2))); } - + public: nframes_t interpolate (int channel, nframes_t nframes, Sample* input, Sample* output); }; - + } // namespace ARDOUR #endif diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index 858302442e..0be1493dbb 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -30,7 +30,7 @@ #include "pbd/fastlog.h" #include "pbd/undo.h" -#include "pbd/statefuldestructible.h" +#include "pbd/statefuldestructible.h" #include "pbd/controllable.h" #include "ardour/ardour.h" @@ -78,7 +78,7 @@ class IO : public SessionObject, public Latent IO (Session&, const std::string& name, Direction, DataType default_type = DataType::AUDIO); IO (Session&, const XMLNode&, DataType default_type = DataType::AUDIO); - + virtual ~IO(); Direction direction() const { return _direction; } @@ -88,7 +88,7 @@ class IO : public SessionObject, public Latent bool active() const { return _active; } void set_active(bool yn) { _active = yn; } - + bool set_name (const std::string& str); virtual void silence (nframes_t); @@ -101,7 +101,7 @@ class IO : public SessionObject, public Latent BundleList bundles_connected (); boost::shared_ptr<Bundle> bundle () { return _bundle; } - + int add_port (std::string connection, void *src, DataType type = DataType::NIL); int remove_port (Port *, void *src); int connect (Port *our_port, std::string other_port, void *src); @@ -143,7 +143,7 @@ class IO : public SessionObject, public Latent static int enable_connecting (void); static int disable_ports (void); static int enable_ports (void); - + static sigc::signal<void,ChanCount> PortCountChanged; // emitted when the number of ports changes static std::string name_from_state (const XMLNode&); @@ -156,7 +156,7 @@ class IO : public SessionObject, public Latent static bool connecting_legal; XMLNode *pending_state_node; - + /* three utility functions - this just seems to be simplest place to put them */ void collect_input (BufferSet& bufs, nframes_t nframes, ChanCount offset); @@ -175,7 +175,7 @@ class IO : public SessionObject, public Latent Direction _direction; DataType _default_type; bool _active; - + private: int connecting_became_legal (); @@ -185,16 +185,16 @@ class IO : public SessionObject, public Latent struct UserBundleInfo { UserBundleInfo (IO*, boost::shared_ptr<UserBundle> b); - + boost::shared_ptr<UserBundle> bundle; sigc::connection changed; }; - + std::vector<UserBundleInfo> _bundles_connected; ///< user bundles connected to our ports static int parse_io_string (const std::string&, std::vector<std::string>& chns); static int parse_gain_string (const std::string&, std::vector<std::string>& chns); - + int ensure_ports (ChanCount, bool clear, bool lockit, void *src); void check_bundles_connected (); diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h index d591962733..dc376b9a42 100644 --- a/libs/ardour/ardour/io_processor.h +++ b/libs/ardour/ardour/io_processor.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 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 @@ -45,12 +45,12 @@ class IOProcessor : public Processor { public: IOProcessor (Session&, bool with_input, bool with_output, - const std::string& proc_name, const std::string io_name="", - ARDOUR::DataType default_type = DataType::AUDIO); + const std::string& proc_name, const std::string io_name="", + ARDOUR::DataType default_type = DataType::AUDIO); IOProcessor (Session&, boost::shared_ptr<IO> input, boost::shared_ptr<IO> output, - const std::string& proc_name, ARDOUR::DataType default_type = DataType::AUDIO); + const std::string& proc_name, ARDOUR::DataType default_type = DataType::AUDIO); virtual ~IOProcessor (); - + bool set_name (const std::string& str); virtual ChanCount natural_output_streams() const; @@ -62,7 +62,7 @@ class IOProcessor : public Processor boost::shared_ptr<const IO> output() const { return _output; } void set_input (boost::shared_ptr<IO>); void set_output (boost::shared_ptr<IO>); - + void silence (nframes_t nframes); void disconnect (); @@ -70,10 +70,10 @@ class IOProcessor : public Processor sigc::signal<void,IOProcessor*,bool> AutomationPlaybackChanged; sigc::signal<void,IOProcessor*,uint32_t> AutomationChanged; - + XMLNode& state (bool full_state); int set_state (const XMLNode&); - + protected: boost::shared_ptr<IO> _input; boost::shared_ptr<IO> _output; diff --git a/libs/ardour/ardour/jack_port.h b/libs/ardour/ardour/jack_port.h index 30ffdd9d76..3101ce9523 100644 --- a/libs/ardour/ardour/jack_port.h +++ b/libs/ardour/ardour/jack_port.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 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 @@ -37,22 +37,22 @@ class JackPort : public virtual Port, public PortConnectableByName { ~JackPort(); - std::string short_name() const { + std::string short_name() const { return jack_port_short_name (_port); } - + int set_name (const std::string& str); - + bool connected () const { return jack_port_connected (_port); } - + int reestablish (); int reconnect (); int connect (Port& other) { - if( _flags & IsOutput ) { - return 0; + if (_flags & IsOutput) { + return 0; } return connect (other.name()); } @@ -73,7 +73,7 @@ class JackPort : public virtual Port, public PortConnectableByName { } int get_connections (std::vector<std::string>& names) const; - + bool monitoring_input () const { return jack_port_monitoring_input (_port); } @@ -104,12 +104,12 @@ class JackPort : public virtual Port, public PortConnectableByName { JackPort (const std::string&, DataType type, Flags flags); jack_port_t* _port; - int disconnect (); + int disconnect (); void recompute_total_latency() const; std::set<std::string> _named_connections; }; - + } // namespace ARDOUR #endif /* __ardour_jack_port_h__ */ diff --git a/libs/ardour/ardour/ladspa.h b/libs/ardour/ardour/ladspa.h index e552f35bb5..c6d7ddd0ff 100644 --- a/libs/ardour/ardour/ladspa.h +++ b/libs/ardour/ardour/ladspa.h @@ -3,17 +3,17 @@ Linux Audio Developer's Simple Plugin API Version 1.1[LGPL]. Copyright (C) 2000-2002 Richard W.E. Furse, Paul Barton-Davis, Stefan Westerfeld. - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either version 2.1 of the License, or (at your option) any later version. - + This library 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 Lesser General Public License for more details. - + You should have received a copy of the GNU Lesser General Public License along with this library; if not, write to the Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 @@ -32,7 +32,7 @@ extern "C" { /*****************************************************************************/ -/* Overview: +/* Overview: There is a large number of synthesis packages in use or development on the Linux platform at this time. This API (`The Linux Audio @@ -76,7 +76,7 @@ extern "C" { /* Fundamental data type passed in and out of plugin. This data type is used to communicate audio samples and control values. It is assumed that the plugin will work sensibly given any numeric input - value although it may have a preferred range (see hints below). + value although it may have a preferred range (see hints below). For audio it is generally assumed that 1.0f is the `0dB' reference amplitude and is a `normal' signal level. */ @@ -85,8 +85,8 @@ typedef float LADSPA_Data; /*****************************************************************************/ -/* Special Plugin Properties: - +/* Special Plugin Properties: + Optional features of the plugin type are encapsulated in the LADSPA_Properties type. This is assembled by ORing individual properties together. */ @@ -123,7 +123,7 @@ typedef int LADSPA_Properties; (3) The plugin will not access files, devices, pipes, sockets, IPC or any other mechanism that might result in process or thread blocking. - + (4) The plugin will take an amount of time to execute a run() or run_adding() call approximately of form (A+B*SampleCount) where A and B depend on the machine and host in use. This amount of time @@ -138,7 +138,7 @@ typedef int LADSPA_Properties; /*****************************************************************************/ -/* Plugin Ports: +/* Plugin Ports: Plugins have `ports' that are inputs or outputs for audio or data. Ports can communicate arrays of LADSPA_Data (for audio @@ -174,23 +174,23 @@ typedef int LADSPA_PortDescriptor; /*****************************************************************************/ -/* Plugin Port Range Hints: +/* Plugin Port Range Hints: The host may wish to provide a representation of data entering or leaving a plugin (e.g. to generate a GUI automatically). To make this more meaningful, the plugin should provide `hints' to the host describing the usual values taken by the data. - + Note that these are only hints. The host may ignore them and the plugin must not assume that data supplied to it is meaningful. If the plugin receives invalid input data it is expected to continue to run without failure and, where possible, produce a sensible output (e.g. a high-pass filter given a negative cutoff frequency might switch to an all-pass mode). - + Hints are meaningful for all input and output ports but hints for input control ports are expected to be particularly useful. - + More hint information is encapsulated in the LADSPA_PortRangeHintDescriptor type which is assembled by ORing individual hint types together. Hints may require further @@ -356,7 +356,7 @@ typedef struct _LADSPA_PortRangeHint { /*****************************************************************************/ -/* Plugin Handles: +/* Plugin Handles: This plugin handle indicates a particular instance of the plugin concerned. It is valid to compare this to NULL (0 for C++) but @@ -367,13 +367,13 @@ typedef void * LADSPA_Handle; /*****************************************************************************/ -/* Descriptor for a Type of Plugin: +/* Descriptor for a Type of Plugin: This structure is used to describe a plugin type. It provides a number of functions to examine the type, instantiate it, link it to buffers and workspaces and to run it. */ -typedef struct _LADSPA_Descriptor { +typedef struct _LADSPA_Descriptor { /* This numeric identifier indicates the plugin type uniquely. Plugin programmers may reserve ranges of IDs from a @@ -433,7 +433,7 @@ typedef struct _LADSPA_Descriptor { instantiation function accepts a sample rate as a parameter. The plugin descriptor from which this instantiate function was found must also be passed. This function must return NULL if - instantiation fails. + instantiation fails. Note that instance initialisation should generally occur in activate() rather than here. */ @@ -554,7 +554,7 @@ typedef struct _LADSPA_Descriptor { /* Once an instance of a plugin has been finished with it can be deleted using the following function. The instance handle passed ceases to be valid after this call. - + If activate() was called for a plugin instance then a corresponding call to deactivate() must be made before cleanup() is called. */ @@ -592,7 +592,7 @@ typedef struct _LADSPA_Descriptor { const LADSPA_Descriptor * ladspa_descriptor(unsigned long Index); /* Datatype corresponding to the ladspa_descriptor() function. */ -typedef const LADSPA_Descriptor * +typedef const LADSPA_Descriptor * (*LADSPA_Descriptor_Function)(unsigned long Index); /**********************************************************************/ diff --git a/libs/ardour/ardour/ladspa_plugin.h b/libs/ardour/ardour/ladspa_plugin.h index b610a87567..8128fccf94 100644 --- a/libs/ardour/ardour/ladspa_plugin.h +++ b/libs/ardour/ardour/ladspa_plugin.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-2006 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 @@ -27,7 +27,7 @@ #include <sigc++/signal.h> -#include "pbd/stateful.h" +#include "pbd/stateful.h" #include <jack/types.h> #include "ardour/ladspa.h" @@ -45,7 +45,7 @@ class LadspaPlugin : public ARDOUR::Plugin ~LadspaPlugin (); /* Plugin interface */ - + std::string unique_id() const; const char* label() const { return _descriptor->Label; } const char* name() const { return _descriptor->Name; } @@ -57,10 +57,10 @@ class LadspaPlugin : public ARDOUR::Plugin float get_parameter (uint32_t port) const; int get_parameter_descriptor (uint32_t which, ParameterDescriptor&) const; uint32_t nth_parameter (uint32_t port, bool& ok) const; - + std::set<Evoral::Parameter> automatable() const; - void activate () { + void activate () { if (!_was_activated && _descriptor->activate) _descriptor->activate (_handle); @@ -83,7 +83,7 @@ class LadspaPlugin : public ARDOUR::Plugin } void set_block_size (nframes_t /*nframes*/) {} - + int connect_and_run (BufferSet& bufs, ChanMapping in, ChanMapping out, nframes_t nframes, nframes_t offset); @@ -105,7 +105,7 @@ class LadspaPlugin : public ARDOUR::Plugin bool has_editor() const { return false; } int require_output_streams (uint32_t); - + /* LADSPA extras */ LADSPA_Properties properties() const { return _descriptor->Properties; } @@ -114,7 +114,7 @@ class LadspaPlugin : public ARDOUR::Plugin LADSPA_PortDescriptor port_descriptor(uint32_t i) const { return _descriptor->PortDescriptors[i]; } const LADSPA_PortRangeHint* port_range_hints() const { return _descriptor->PortRangeHints; } const char * const * port_names() const { return _descriptor->PortNames; } - + void set_gain (float gain) { _descriptor->set_run_adding_gain (_handle, gain); } void run_adding (uint32_t nsamples) { _descriptor->run_adding (_handle, nsamples); } void connect_port (uint32_t port, float *ptr) { _descriptor->connect_port (_handle, port, ptr); } @@ -136,7 +136,7 @@ class LadspaPlugin : public ARDOUR::Plugin }; class LadspaPluginInfo : public PluginInfo { - public: + public: LadspaPluginInfo () { }; ~LadspaPluginInfo () { }; diff --git a/libs/ardour/ardour/latent.h b/libs/ardour/ardour/latent.h index c5dc792f06..d1e62aaf45 100644 --- a/libs/ardour/ardour/latent.h +++ b/libs/ardour/ardour/latent.h @@ -13,8 +13,8 @@ class Latent { virtual nframes_t signal_latency() const = 0; nframes_t user_latency () const { return _user_latency; } - nframes_t effective_latency() const { - if (_user_latency) { + nframes_t effective_latency() const { + if (_user_latency) { return _user_latency; } else { return signal_latency (); diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index b008a62f18..2a583719cc 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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,8 +31,8 @@ #include <glibmm/thread.h> #include "pbd/undo.h" -#include "pbd/stateful.h" -#include "pbd/statefuldestructible.h" +#include "pbd/stateful.h" +#include "pbd/statefuldestructible.h" #include "ardour/ardour.h" @@ -53,16 +53,16 @@ class Location : public PBD::StatefulDestructible }; Location (nframes64_t sample_start, - nframes64_t sample_end, - const std::string &name, - Flags bits = Flags(0)) - + nframes64_t sample_end, + const std::string &name, + Flags bits = Flags(0)) + : _name (name), _start (sample_start), _end (sample_end), _flags (bits), _locked (false) { } - + Location () { _start = 0; _end = 0; @@ -77,7 +77,7 @@ class Location : public PBD::StatefulDestructible bool locked() const { return _locked; } void lock() { _locked = true; changed (this); } void unlock() { _locked = false; changed (this); } - + nframes64_t start() const { return _start; } nframes64_t end() const { return _end; } nframes64_t length() const { return _end - _start; } @@ -118,7 +118,7 @@ class Location : public PBD::StatefulDestructible /* this is sent only when both start&end change at the same time */ sigc::signal<void,Location*> changed; - + /* CD Track / CD-Text info */ std::map<std::string, std::string> cd_info; @@ -145,7 +145,7 @@ class Locations : public PBD::StatefulDestructible Locations (); ~Locations (); - + const LocationList& list() { return locations; } void add (Location *, bool make_current = false); diff --git a/libs/ardour/ardour/location_importer.h b/libs/ardour/ardour/location_importer.h index 37895dbc97..2b6f1ec1c2 100644 --- a/libs/ardour/ardour/location_importer.h +++ b/libs/ardour/ardour/location_importer.h @@ -56,7 +56,7 @@ class LocationImporter : public ElementImporter LocationImportHandler & handler; XMLNode xml_location; Location * location; - + void parse_xml (); }; diff --git a/libs/ardour/ardour/logcurve.h b/libs/ardour/ardour/logcurve.h index b3f3b2a90a..a5f0ce4734 100644 --- a/libs/ardour/ardour/logcurve.h +++ b/libs/ardour/ardour/logcurve.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Steve Harris & Paul Davis + Copyright (C) 2001 Steve Harris & 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 @@ -41,22 +41,22 @@ class LogCurve { bool operator!= (const LogCurve& other) const { return S != other.S || l != other.l; } - + float value (float frac) const { return (fast_log(frac + S) - a) * b; - } - + } + float value (uint32_t pos) const { return (fast_log(((float) pos/l) + S) - a) * b; - } + } float invert_value (float frac) const { return (a - fast_log(frac + S)) * b; - } - + } + float invert_value (uint32_t pos) const { return (a - fast_log(((float) pos/l) + S)) * b; - } + } void fill (float *vec, uint32_t veclen, bool invert) const { float dx = 1.0f/veclen; @@ -85,10 +85,10 @@ class LogCurve { float steepness() const { return S; } uint32_t length() const { return l; } - - void set_steepness (float steepness) { - S = steepness; - a = log(S); + + void set_steepness (float steepness) { + S = steepness; + a = log(S); b = 1.0f / log(1.0f + (1.0f / S)); } void set_length (uint32_t len) { l = len; } @@ -102,25 +102,25 @@ class LogCurve { uint32_t l; }; -class LogCurveIn : public LogCurve +class LogCurveIn : public LogCurve { public: - LogCurveIn (float steepness = 0.2, uint32_t len = 0) + LogCurveIn (float steepness = 0.2, uint32_t len = 0) : LogCurve (steepness, len) {} float value (float frac) const { return (fast_log(frac + S) - a) * b; - } - + } + float value (uint32_t pos) const { return (fast_log(((float) pos/l) + S) - a) * b; - } + } }; -class LogCurveOut : public LogCurve +class LogCurveOut : public LogCurve { public: - LogCurveOut (float steepness = 0.2, uint32_t len = 0) + LogCurveOut (float steepness = 0.2, uint32_t len = 0) : LogCurve (steepness, len) {} }; diff --git a/libs/ardour/ardour/lv2_event_buffer.h b/libs/ardour/ardour/lv2_event_buffer.h index 9d35d36d55..076ccc1dd4 100644 --- a/libs/ardour/ardour/lv2_event_buffer.h +++ b/libs/ardour/ardour/lv2_event_buffer.h @@ -1,17 +1,17 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 Paul Davis Author: Dave Robillard 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. @@ -33,9 +33,9 @@ public: inline LV2_Event_Buffer* data() { return _data; } inline const LV2_Event_Buffer* data() const { return _data; } - + inline void rewind() const { lv2_event_begin(&_iter, _data); } - + inline void reset() { _latest_frames = 0; _latest_subframes = 0; @@ -43,7 +43,7 @@ public: _data->size = 0; rewind(); } - + inline size_t event_count() const { return _data->event_count; } inline uint32_t capacity() const { return _data->capacity; } inline uint32_t size() const { return _data->size; } diff --git a/libs/ardour/ardour/lv2_plugin.h b/libs/ardour/ardour/lv2_plugin.h index e354599485..de42512cfe 100644 --- a/libs/ardour/ardour/lv2_plugin.h +++ b/libs/ardour/ardour/lv2_plugin.h @@ -28,7 +28,7 @@ #include <sigc++/signal.h> -#include "pbd/stateful.h" +#include "pbd/stateful.h" #include <jack/types.h> #include <slv2/slv2.h> @@ -48,7 +48,7 @@ class LV2Plugin : public ARDOUR::Plugin ~LV2Plugin (); /* Plugin interface */ - + std::string unique_id() const; const char* label() const { return slv2_value_as_string(_name); } const char* name() const { return slv2_value_as_string(_name); } @@ -69,12 +69,12 @@ class LV2Plugin : public ARDOUR::Plugin SLV2Port slv2_port(uint32_t i) { return slv2_plugin_get_port_by_index(_plugin, i); } const char* port_symbol(uint32_t port); - + const LV2_Feature* const* features() { return _features; } std::set<Evoral::Parameter> automatable() const; - void activate () { + void activate () { if (!_was_activated) { slv2_instance_activate(_instance); _was_activated = true; @@ -96,7 +96,7 @@ class LV2Plugin : public ARDOUR::Plugin } void set_block_size (nframes_t /*nframes*/) {} - + int connect_and_run (BufferSet& bufs, ChanMapping in, ChanMapping out, nframes_t nframes, nframes_t offset); @@ -181,7 +181,7 @@ struct LV2World { class LV2PluginInfo : public PluginInfo { -public: +public: LV2PluginInfo (void* slv2_world, void* slv2_plugin);; ~LV2PluginInfo ();; static PluginInfoList discover (void* slv2_world); diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h index e1fd97f107..be8472b170 100644 --- a/libs/ardour/ardour/meter.h +++ b/libs/ardour/ardour/meter.h @@ -1,16 +1,16 @@ /* - Copyright (C) 2006 Paul Davis - + Copyright (C) 2006 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 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. @@ -59,21 +59,21 @@ public: void reset (); void reset_max (); - + bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const; bool configure_io (ChanCount in, ChanCount out); - + /** Compute peaks */ void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes); - - float peak_power (uint32_t n) { + + float peak_power (uint32_t n) { if (n < _visible_peak_power.size()) { return _visible_peak_power[n]; } else { return minus_infinity(); } } - + float max_peak_power (uint32_t n) { if (n < _max_peak_power.size()) { return _max_peak_power[n]; @@ -81,7 +81,7 @@ public: return minus_infinity(); } } - + XMLNode& state (bool full); private: diff --git a/libs/ardour/ardour/midi_buffer.h b/libs/ardour/ardour/midi_buffer.h index d5f15fb621..b3ed093df7 100644 --- a/libs/ardour/ardour/midi_buffer.h +++ b/libs/ardour/ardour/midi_buffer.h @@ -1,17 +1,17 @@ /* - Copyright (C) 2006-2009 Paul Davis + Copyright (C) 2006-2009 Paul Davis Author: Dave Robillard - + 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. @@ -40,7 +40,7 @@ public: void silence (nframes_t nframes, nframes_t offset = 0); void read_from (const Buffer& src, nframes_t nframes, nframes_t dst_offset = 0, nframes_t src_offset = 0); void merge_from (const Buffer& src, nframes_t nframes, nframes_t dst_offset = 0, nframes_t src_offset = 0); - + void copy(const MidiBuffer& copy); bool push_back(const Evoral::MIDIEvent<TimeType>& event); @@ -52,10 +52,10 @@ public: bool merge(const MidiBuffer& a, const MidiBuffer& b); bool merge_in_place(const MidiBuffer &other); - + template<typename BufferType, typename EventType> struct iterator_base { - iterator_base<BufferType, EventType>(BufferType& b, nframes_t o) : buffer(b), offset(o) {} + iterator_base<BufferType, EventType>(BufferType& b, nframes_t o) : buffer(b), offset(o) {} inline EventType operator*() const { uint8_t* ev_start = buffer._data + offset + sizeof(TimeType); int event_size = Evoral::midi_event_size(ev_start); @@ -86,7 +86,7 @@ public: BufferType& buffer; size_t offset; }; - + typedef iterator_base< MidiBuffer, Evoral::MIDIEvent<TimeType> > iterator; typedef iterator_base< const MidiBuffer, const Evoral::MIDIEvent<TimeType> > const_iterator; @@ -99,7 +99,7 @@ public: private: friend class iterator_base< MidiBuffer, Evoral::MIDIEvent<TimeType> >; friend class iterator_base< const MidiBuffer, const Evoral::MIDIEvent<TimeType> >; - + uint8_t* _data; ///< timestamp, event, timestamp, event, ... }; diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index 730d6c0276..7035cdfd02 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -54,7 +54,7 @@ class Send; class Session; class MidiDiskstream : public Diskstream -{ +{ public: MidiDiskstream (Session &, const string& name, Diskstream::Flag f = Recordable); MidiDiskstream (Session &, const XMLNode&); @@ -62,7 +62,7 @@ class MidiDiskstream : public Diskstream float playback_buffer_load() const; float capture_buffer_load() const; - + void get_playback(MidiBuffer& dst, nframes_t start, nframes_t end); void set_record_enabled (bool yn); @@ -78,16 +78,16 @@ class MidiDiskstream : public Diskstream int set_state(const XMLNode& node); void monitor_input (bool); - + MidiRingBuffer<nframes_t>* playback_buffer () { return _playback_buf; } MidiRingBuffer<nframes_t>* capture_buffer () { return _capture_buf; } boost::shared_ptr<SMFSource> write_source () { return _write_source; } - + int set_destructive (bool yn); // doom! - + void set_note_mode (NoteMode m); - - uint16_t get_channel_mask() { + + uint16_t get_channel_mask() { uint16_t playback_mask = _playback_buf->get_channel_mask(); #ifndef NDEBUG uint16_t capture_mask = _capture_buf->get_channel_mask(); @@ -97,10 +97,10 @@ class MidiDiskstream : public Diskstream } void set_channel_mode(ChannelMode mode, uint16_t mask) { - _playback_buf->set_channel_mode(mode, mask); - _capture_buf->set_channel_mode(mode, mask); + _playback_buf->set_channel_mode(mode, mask); + _capture_buf->set_channel_mode(mode, mask); } - + ChannelMode get_channel_mode() { ChannelMode playback_mode = _playback_buf->get_channel_mode(); #ifndef NDEBUG @@ -145,7 +145,7 @@ class MidiDiskstream : public Diskstream /* The two central butler operations */ int do_flush (RunContext context, bool force = false); int do_refill (); - + int do_refill_with_alloc(); int read (nframes_t& start, nframes_t cnt, bool reversed); @@ -167,7 +167,7 @@ class MidiDiskstream : public Diskstream void get_input_sources (); void check_record_status (nframes_t transport_frame, nframes_t nframes, bool can_record); void set_align_style_from_io(); - + void engage_record_enable (); void disengage_record_enable (); @@ -176,7 +176,7 @@ class MidiDiskstream : public Diskstream MidiPort* _source_port; boost::shared_ptr<SMFSource> _write_source; nframes_t _last_flush_frame; - NoteMode _note_mode; + NoteMode _note_mode; volatile gint _frames_written_to_ringbuffer; volatile gint _frames_read_from_ringbuffer; }; diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index 460e790323..6ea4a4cd30 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -18,7 +18,7 @@ */ -#ifndef __ardour_midi_model_h__ +#ifndef __ardour_midi_model_h__ #define __ardour_midi_model_h__ #include <queue> @@ -52,7 +52,7 @@ public: typedef double TimeType; MidiModel(MidiSource* s, size_t size=0); - + NoteMode note_mode() const { return (percussive() ? Percussive : Sustained); } void set_note_mode(NoteMode mode) { set_percussive(mode == Percussive); }; @@ -66,10 +66,10 @@ public: DeltaCommand (boost::shared_ptr<MidiModel> m, const XMLNode& node); const std::string& name() const { return _name; } - + void operator()(); void undo(); - + int set_state (const XMLNode&); XMLNode& get_state (); @@ -79,12 +79,12 @@ public: private: XMLNode &marshal_note(const boost::shared_ptr< Evoral::Note<TimeType> > note); boost::shared_ptr< Evoral::Note<TimeType> > unmarshal_note(XMLNode *xml_note); - + boost::shared_ptr<MidiModel> _model; const std::string _name; - + typedef std::list< boost::shared_ptr< Evoral::Note<TimeType> > > NoteList; - + NoteList _added_notes; NoteList _removed_notes; }; @@ -110,35 +110,35 @@ public: DiffCommand (boost::shared_ptr<MidiModel> m, const XMLNode& node); const std::string& name() const { return _name; } - + void operator()(); void undo(); - + int set_state (const XMLNode&); XMLNode& get_state (); - - void change (const boost::shared_ptr<Evoral::Note<TimeType> > note, - Property prop, uint8_t new_value); - void change (const boost::shared_ptr<Evoral::Note<TimeType> > note, - Property prop, TimeType new_time); - + + void change (const boost::shared_ptr<Evoral::Note<TimeType> > note, + Property prop, uint8_t new_value); + void change (const boost::shared_ptr<Evoral::Note<TimeType> > note, + Property prop, TimeType new_time); + private: boost::shared_ptr<MidiModel> _model; const std::string _name; struct NotePropertyChange { - DiffCommand::Property property; - boost::shared_ptr<Evoral::Note<TimeType> > note; - union { - uint8_t old_value; - TimeType old_time; - }; - union { - uint8_t new_value; - TimeType new_time; - }; - }; - + DiffCommand::Property property; + boost::shared_ptr<Evoral::Note<TimeType> > note; + union { + uint8_t old_value; + TimeType old_time; + }; + union { + uint8_t new_value; + TimeType new_time; + }; + }; + typedef std::list<NotePropertyChange> ChangeList; ChangeList _changes; @@ -154,22 +154,22 @@ public: bool write_to(boost::shared_ptr<MidiSource> source); - + // MidiModel doesn't use the normal AutomationList serialisation code // since controller data is stored in the .mid XMLNode& get_state(); int set_state(const XMLNode&) { return 0; } sigc::signal<void> ContentsChanged; - + const MidiSource* midi_source() const { return _midi_source; } - void set_midi_source(MidiSource* source) { _midi_source = source; } + void set_midi_source(MidiSource* source) { _midi_source = source; } boost::shared_ptr<Evoral::Note<TimeType> > find_note (boost::shared_ptr<Evoral::Note<TimeType> >); - + private: friend class DeltaCommand; - + // We cannot use a boost::shared_ptr here to avoid a retain cycle MidiSource* _midi_source; }; diff --git a/libs/ardour/ardour/midi_operator.h b/libs/ardour/ardour/midi_operator.h index 64ceaad841..31e412bafe 100644 --- a/libs/ardour/ardour/midi_operator.h +++ b/libs/ardour/ardour/midi_operator.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 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 @@ -36,7 +36,7 @@ class MidiOperator { public: MidiOperator () {} virtual ~MidiOperator() {} - + virtual Command* operator() (boost::shared_ptr<ARDOUR::MidiModel>, std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>&) = 0; virtual std::string name() const = 0; }; diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h index 057d4f7b1d..a48c9ddfe7 100644 --- a/libs/ardour/ardour/midi_patch_manager.h +++ b/libs/ardour/ardour/midi_patch_manager.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Hans Baier + Copyright (C) 2008 Hans Baier 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 @@ -40,89 +40,88 @@ private: MidiPatchManager() {}; MidiPatchManager( const MidiPatchManager& ); MidiPatchManager& operator= (const MidiPatchManager&); - - static MidiPatchManager* _manager; - + + static MidiPatchManager* _manager; + public: typedef std::map<std::string, boost::shared_ptr<MIDINameDocument> > MidiNameDocuments; - + virtual ~MidiPatchManager() { _manager = 0; } - - static MidiPatchManager& instance() { + + static MidiPatchManager& instance() { if (_manager == 0) { _manager = new MidiPatchManager(); } - return *_manager; + return *_manager; } - + void set_session (ARDOUR::Session&); - - boost::shared_ptr<MIDINameDocument> document_by_model(std::string model_name) + + boost::shared_ptr<MIDINameDocument> document_by_model(std::string model_name) { return _documents[model_name]; } - - boost::shared_ptr<MasterDeviceNames> master_device_by_model(std::string model_name) + + boost::shared_ptr<MasterDeviceNames> master_device_by_model(std::string model_name) { return _master_devices_by_model[model_name]; } - + boost::shared_ptr<ChannelNameSet> find_channel_name_set( - std::string model, - std::string custom_device_mode, + std::string model, + std::string custom_device_mode, uint8_t channel) { boost::shared_ptr<MIDI::Name::MasterDeviceNames> master_device = master_device_by_model(model); - + if (master_device != 0 && custom_device_mode != "") { - return master_device-> - channel_name_set_by_device_mode_and_channel(custom_device_mode, channel); + return master_device->channel_name_set_by_device_mode_and_channel(custom_device_mode, channel); } else { return boost::shared_ptr<ChannelNameSet>(); - } + } } - + boost::shared_ptr<Patch> find_patch( - std::string model, - std::string custom_device_mode, - uint8_t channel, + std::string model, + std::string custom_device_mode, + uint8_t channel, PatchPrimaryKey patch_key) { - + boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel); - + if (channel_name_set) { - return channel_name_set->find_patch(patch_key); + return channel_name_set->find_patch(patch_key); } else { return boost::shared_ptr<Patch>(); } } - + boost::shared_ptr<Patch> previous_patch( - std::string model, - std::string custom_device_mode, - uint8_t channel, + std::string model, + std::string custom_device_mode, + uint8_t channel, PatchPrimaryKey patch_key) { - + boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel); - + if (channel_name_set) { - return channel_name_set->previous_patch(patch_key); + return channel_name_set->previous_patch(patch_key); } else { return boost::shared_ptr<Patch>(); } } - + boost::shared_ptr<Patch> next_patch( - std::string model, - std::string custom_device_mode, - uint8_t channel, + std::string model, + std::string custom_device_mode, + uint8_t channel, PatchPrimaryKey patch_key) { - + boost::shared_ptr<ChannelNameSet> channel_name_set = find_channel_name_set(model, custom_device_mode, channel); - + if (channel_name_set) { - return channel_name_set->next_patch(patch_key); + return channel_name_set->next_patch(patch_key); } else { return boost::shared_ptr<Patch>(); } } - + std::list<std::string> custom_device_mode_names_by_model(std::string model_name) { if (model_name != "") { return master_device_by_model(model_name)->custom_device_mode_names(); @@ -130,13 +129,13 @@ public: return std::list<std::string>(); } } - + const MasterDeviceNames::Models& all_models() const { return _all_models; } - + private: void drop_session(); void refresh(); - + ARDOUR::Session* _session; MidiNameDocuments _documents; MIDINameDocument::MasterDeviceNamesList _master_devices_by_model; diff --git a/libs/ardour/ardour/midi_playlist.h b/libs/ardour/ardour/midi_playlist.h index da8391a16b..11c1288e92 100644 --- a/libs/ardour/ardour/midi_playlist.h +++ b/libs/ardour/ardour/midi_playlist.h @@ -1,17 +1,17 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis Written by Dave Robillard, 2006 - + 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. @@ -53,7 +53,7 @@ public: int set_state (const XMLNode&); bool destroy_region (boost::shared_ptr<Region>); - + void set_note_mode (NoteMode m) { _note_mode = m; } std::set<Evoral::Parameter> contained_automation(); @@ -63,7 +63,7 @@ protected: /* playlist "callbacks" */ void finalize_split_region (boost::shared_ptr<Region> original, boost::shared_ptr<Region> left, boost::shared_ptr<Region> right); - + void check_dependents (boost::shared_ptr<Region> region, bool norefresh); void refresh_dependents (boost::shared_ptr<Region> region); void remove_dependents (boost::shared_ptr<Region> region); @@ -72,8 +72,8 @@ private: void dump () const; bool region_changed (Change, boost::shared_ptr<Region>); - - NoteMode _note_mode; + + NoteMode _note_mode; }; } /* namespace ARDOUR */ diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h index e4d6a41d05..749829b7ea 100644 --- a/libs/ardour/ardour/midi_port.h +++ b/libs/ardour/ardour/midi_port.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 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 @@ -40,7 +40,7 @@ class MidiPort : public Port { void cycle_end (nframes_t nframes); void cycle_split (); void flush_buffers (nframes_t nframes, nframes_t offset = 0); - + size_t raw_buffer_size(jack_nframes_t nframes) const; Buffer& get_buffer (nframes_t nframes, nframes_t offset = 0) { @@ -53,13 +53,13 @@ class MidiPort : public Port { friend class AudioEngine; MidiPort (const std::string& name, Flags); - + private: MidiBuffer* _buffer; bool _has_been_mixed_down; }; - + } // namespace ARDOUR #endif /* __ardour_midi_port_h__ */ diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 93a9f76f31..50fc1516df 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-2006 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 @@ -50,14 +50,14 @@ class MidiRegion : public Region ~MidiRegion(); boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const; - + /* Stub Readable interface */ virtual nframes_t read (Sample*, sframes_t /*pos*/, nframes_t /*cnt*/, int /*channel*/) const { return 0; } virtual sframes_t readable_length() const { return length(); } nframes_t read_at (MidiRingBuffer<nframes_t>& dst, sframes_t position, - nframes_t dur, + nframes_t dur, uint32_t chan_n = 0, NoteMode mode = Sustained) const; @@ -71,9 +71,9 @@ class MidiRegion : public Region int set_state (const XMLNode&); int separate_by_channel (ARDOUR::Session&, std::vector< boost::shared_ptr<Region> >&) const; - + /* automation */ - + boost::shared_ptr<Evoral::Control> control(const Evoral::Parameter& id, bool create=false) { return model()->data().control(id, create); @@ -85,7 +85,7 @@ class MidiRegion : public Region } /* export */ - + int exportme (ARDOUR::Session&, ARDOUR::ExportSpecification&); boost::shared_ptr<MidiModel> model() { return midi_source()->model(); } @@ -104,14 +104,14 @@ class MidiRegion : public Region private: nframes_t _read_at (const SourceList&, MidiRingBuffer<nframes_t>& dst, - nframes_t position, - nframes_t dur, - uint32_t chan_n = 0, - NoteMode mode = Sustained) const; + nframes_t position, + nframes_t dur, + uint32_t chan_n = 0, + NoteMode mode = Sustained) const; void recompute_at_start (); void recompute_at_end (); - + void set_position_internal (nframes_t pos, bool allow_bbt_recompute); void switch_source(boost::shared_ptr<Source> source); diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h index f879aa7534..2de611f4d6 100644 --- a/libs/ardour/ardour/midi_ring_buffer.h +++ b/libs/ardour/ardour/midi_ring_buffer.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 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 @@ -52,7 +52,7 @@ public: size_t read(MidiBuffer& dst, nframes_t start, nframes_t end, nframes_t offset=0); void dump(std::ostream& dst); - + /** Set the channel filtering mode. * @param mask If mode is FilterChannels, each bit represents a midi channel: * bit 0 = channel 0, bit 1 = channel 1 etc. the read and write methods will only @@ -67,11 +67,11 @@ public: ChannelMode get_channel_mode() const { return static_cast<ChannelMode>((g_atomic_int_get(&_channel_mask) & 0xFFFF0000) >> 16); } - + uint16_t get_channel_mask() const { return g_atomic_int_get(&_channel_mask) & 0x0000FFFF; } - + protected: inline bool is_channel_event(uint8_t event_type_byte) { // mask out channel information @@ -79,7 +79,7 @@ protected: // midi channel events range from 0x80 to 0xE0 return (0x80 <= event_type_byte) && (event_type_byte <= 0xE0); } - + private: volatile uint32_t _channel_mask; // 16 bits mode, 16 bits mask }; diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index a479b4a8a8..7056748786 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 Paul Davis Written by Dave Robillard, 2006 This program is free software; you can redistribute it and/or modify @@ -46,7 +46,7 @@ class MidiSource : virtual public Source MidiSource (Session& session, std::string name, Source::Flag flags = Source::Flag(0)); MidiSource (Session& session, const XMLNode&); virtual ~MidiSource (); - + /** Read the data in a given time range from the MIDI source. * All time stamps in parameters are in audio frames (even if the source has tempo time). * \param dst Ring buffer where read events are written @@ -69,14 +69,14 @@ class MidiSource : virtual public Source virtual void append_event_unlocked_frames(const Evoral::Event<nframes_t>& ev, sframes_t source_start) = 0; - + virtual sframes_t length (sframes_t pos) const; virtual void update_length (sframes_t pos, sframes_t cnt); virtual void mark_streaming_midi_write_started (NoteMode mode, sframes_t start_time); virtual void mark_streaming_write_started (); virtual void mark_streaming_write_completed (); - + virtual void session_saved(); std::string captured_for() const { return _captured_for; } @@ -86,13 +86,13 @@ class MidiSource : virtual public Source uint32_t write_data_count() const { return _write_data_count; } static sigc::signal<void,MidiSource*> MidiSourceCreated; - + // Signal a range of recorded data is available for reading from model() mutable sigc::signal<void,sframes_t,nframes_t> ViewDataRangeReady; - + XMLNode& get_state (); int set_state (const XMLNode&); - + bool length_mutable() const { return true; } virtual void load_model(bool lock=true, bool force_reload=false) = 0; @@ -104,14 +104,14 @@ class MidiSource : virtual public Source void invalidate(); void set_note_mode(NoteMode mode); - + boost::shared_ptr<MidiModel> model() { return _model; } void set_model(boost::shared_ptr<MidiModel> m) { _model = m; } void drop_model() { _model.reset(); } protected: virtual void flush_midi() = 0; - + virtual nframes_t read_unlocked (MidiRingBuffer<nframes_t>& dst, sframes_t position, sframes_t start, nframes_t cnt, @@ -120,16 +120,16 @@ class MidiSource : virtual public Source virtual nframes_t write_unlocked (MidiRingBuffer<nframes_t>& dst, sframes_t position, nframes_t cnt) = 0; - + std::string _captured_for; mutable uint32_t _read_data_count; ///< modified in read() mutable uint32_t _write_data_count; ///< modified in write() - + boost::shared_ptr<MidiModel> _model; bool _writing; - + mutable Evoral::Sequence<Evoral::MusicalTime>::const_iterator _model_iter; - + mutable double _length_beats; mutable sframes_t _last_read_end; sframes_t _last_write_end; diff --git a/libs/ardour/ardour/midi_state_tracker.h b/libs/ardour/ardour/midi_state_tracker.h index f9b39f9295..f5a44788db 100644 --- a/libs/ardour/ardour/midi_state_tracker.h +++ b/libs/ardour/ardour/midi_state_tracker.h @@ -1,17 +1,17 @@ /* - Copyright (C) 2008 Paul Davis + Copyright (C) 2008 Paul Davis Author: Torben Hohn - + 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. @@ -49,4 +49,4 @@ private: } // namespace ARDOUR -#endif // __ardour_midi_state_tracker_h__ +#endif // __ardour_midi_state_tracker_h__ diff --git a/libs/ardour/ardour/midi_stretch.h b/libs/ardour/ardour/midi_stretch.h index 53f73578eb..9dbfbca2bd 100644 --- a/libs/ardour/ardour/midi_stretch.h +++ b/libs/ardour/ardour/midi_stretch.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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/midi_track.h b/libs/ardour/ardour/midi_track.h index f8bca2304c..85941cd0ef 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -1,17 +1,17 @@ /* - Copyright (C) 2006 Paul Davis - Written by Dave Robillard - + Copyright (C) 2006 Paul Davis + Written by Dave Robillard + 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. @@ -38,10 +38,10 @@ public: MidiTrack (Session&, string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal); MidiTrack (Session&, const XMLNode&); ~MidiTrack (); - - int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, - int declick, bool can_record, bool rec_monitors_input); - + + int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, + int declick, bool can_record, bool rec_monitors_input); + void handle_transport_stopped (bool abort, bool did_locate, bool flush_processors); boost::shared_ptr<MidiDiskstream> midi_diskstream() const; @@ -57,27 +57,27 @@ public: void unfreeze (); boost::shared_ptr<Region> bounce (InterThreadInfo&); - boost::shared_ptr<Region> bounce_range (nframes_t start, nframes_t end, InterThreadInfo&, - bool enable_processing); + boost::shared_ptr<Region> bounce_range ( + nframes_t start, nframes_t end, InterThreadInfo&, bool enable_processing); int set_state(const XMLNode& node); void midi_panic(void); bool write_immediate_event(size_t size, const uint8_t* buf); - + /** A control that will send "immediate" events to a MIDI track when twiddled */ struct MidiControl : public AutomationControl { - MidiControl(MidiTrack* route, const Evoral::Parameter& param, + MidiControl(MidiTrack* route, const Evoral::Parameter& param, boost::shared_ptr<AutomationList> al = boost::shared_ptr<AutomationList>()) : AutomationControl (route->session(), param, al) , _route (route) {} - - void set_value (float val); - + + void set_value (float val); + MidiTrack* _route; }; - + NoteMode note_mode() const { return _note_mode; } void set_note_mode (NoteMode m); @@ -90,15 +90,15 @@ public: bool midi_thru() const { return _midi_thru; } void set_midi_thru (bool yn); - + protected: XMLNode& state (bool full); - + int _set_state (const XMLNode&, bool call_base); private: - void write_out_of_band_data (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, - nframes_t nframes); + void write_out_of_band_data ( + BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes); int set_diskstream (boost::shared_ptr<MidiDiskstream> ds); void use_new_diskstream (); @@ -114,9 +114,9 @@ private: uint8_t _default_channel; bool _midi_thru; - - int no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, - bool state_changing, bool can_record, bool rec_monitors_input); + + int no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, + bool state_changing, bool can_record, bool rec_monitors_input); void push_midi_input_to_step_edit_ringbuffer (nframes_t nframes); }; diff --git a/libs/ardour/ardour/mtdm.h b/libs/ardour/ardour/mtdm.h index 7fa9707554..4948d844f4 100644 --- a/libs/ardour/ardour/mtdm.h +++ b/libs/ardour/ardour/mtdm.h @@ -1,6 +1,6 @@ /* Copyright (C) 2003-2008 Fons Adriaensen <fons@kokkinizita.net> - + 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 @@ -25,34 +25,34 @@ #include <unistd.h> class MTDM { - public: - - MTDM (); - - int process (size_t len, float *inp, float *out); - int resolve (void); - void invert (void) { _inv ^= 1; } - int inv (void) { return _inv; } - double del (void) { return _del; } - double err (void) { return _err; } - - private: - class Freq { - public: - int p; - int f; - float a; - float xa; - float ya; - float xf; - float yf; - }; - - double _del; - double _err; - int _cnt; - int _inv; - Freq _freq [5]; +public: + + MTDM (); + + int process (size_t len, float *inp, float *out); + int resolve (void); + void invert (void) { _inv ^= 1; } + int inv (void) { return _inv; } + double del (void) { return _del; } + double err (void) { return _err; } + +private: + class Freq { + public: + int p; + int f; + float a; + float xa; + float ya; + float xf; + float yf; + }; + + double _del; + double _err; + int _cnt; + int _inv; + Freq _freq [5]; }; #endif /* __libardour_mtdm_h__ */ diff --git a/libs/ardour/ardour/mute_master.h b/libs/ardour/ardour/mute_master.h index eb64181d89..1b06b4bf7c 100644 --- a/libs/ardour/ardour/mute_master.h +++ b/libs/ardour/ardour/mute_master.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 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 @@ -37,7 +37,7 @@ class MuteMaster : public AutomationControl Listen = 0x4, Main = 0x8 }; - + MuteMaster (Session& s, const std::string& name); ~MuteMaster() {} @@ -48,7 +48,7 @@ class MuteMaster : public AutomationControl bool muted_at (MutePoint mp) const { return _mute_point & mp; } bool muted() const { return _mute_point != MutePoint (0); } - + gain_t mute_gain_at (MutePoint) const; void clear_mute (); diff --git a/libs/ardour/ardour/named_selection.h b/libs/ardour/ardour/named_selection.h index 0c13bcedc1..2dcfbd131c 100644 --- a/libs/ardour/ardour/named_selection.h +++ b/libs/ardour/ardour/named_selection.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2003 Paul Davis + Copyright (C) 2003 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 @@ -24,7 +24,7 @@ #include <list> #include <boost/shared_ptr.hpp> -#include "pbd/stateful.h" +#include "pbd/stateful.h" class XMLNode; diff --git a/libs/ardour/ardour/noise.h b/libs/ardour/ardour/noise.h index f775fcce36..96a582ef9b 100644 --- a/libs/ardour/ardour/noise.h +++ b/libs/ardour/ardour/noise.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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/onset_detector.h b/libs/ardour/ardour/onset_detector.h index 1724f216b6..dea4efe1ab 100644 --- a/libs/ardour/ardour/onset_detector.h +++ b/libs/ardour/ardour/onset_detector.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Paul Davis + Copyright (C) 2008 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 @@ -43,7 +43,7 @@ class OnsetDetector : public AudioAnalyser int run (const std::string& path, Readable*, uint32_t channel, AnalysisFeatureList& results); static void cleanup_onsets (AnalysisFeatureList&, float sr, float gap_msecs); - + protected: AnalysisFeatureList* current_results; int use_features (Vamp::Plugin::FeatureSet&, std::ostream*); diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index 474b3193c7..c211aafc8c 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2004 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 @@ -27,7 +27,7 @@ #include <iostream> #include <sigc++/signal.h> -#include "pbd/stateful.h" +#include "pbd/stateful.h" #include "pbd/controllable.h" #include "ardour/types.h" @@ -67,16 +67,16 @@ class StreamPanner : public sigc::trackable, public PBD::Stateful virtual void distribute (AudioBuffer& src, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes) = 0; virtual void distribute_automated (AudioBuffer& src, BufferSet& obufs, - nframes_t start, nframes_t end, nframes_t nframes, pan_t** buffers) = 0; + nframes_t start, nframes_t end, nframes_t nframes, pan_t** buffers) = 0; boost::shared_ptr<AutomationControl> pan_control() { return _control; } - + sigc::signal<void> Changed; /* for position */ sigc::signal<void> StateChanged; /* for mute */ int set_state (const XMLNode&); virtual XMLNode& state (bool full_state) = 0; - + Panner & get_parent() { return parent; } /* old school automation loading */ @@ -90,7 +90,7 @@ class StreamPanner : public sigc::trackable, public PBD::Stateful float x; float y; float z; - + /* these are for automation. they store the last value used by the most recent process() cycle. */ @@ -114,7 +114,7 @@ class BaseStereoPanner : public StreamPanner ~BaseStereoPanner (); /* this class just leaves the pan law itself to be defined - by the update(), distribute_automated() + by the update(), distribute_automated() methods. derived classes also need a factory method and a type name. See EqualPowerStereoPanner as an example. */ @@ -140,8 +140,8 @@ class EqualPowerStereoPanner : public BaseStereoPanner EqualPowerStereoPanner (Panner&, Evoral::Parameter param); ~EqualPowerStereoPanner (); - void distribute_automated (AudioBuffer& src, BufferSet& obufs, - nframes_t start, nframes_t end, nframes_t nframes, pan_t** buffers); + void distribute_automated (AudioBuffer& src, BufferSet& obufs, + nframes_t start, nframes_t end, nframes_t nframes, pan_t** buffers); void get_current_coefficients (pan_t*) const; void get_desired_coefficients (pan_t*) const; @@ -149,8 +149,8 @@ class EqualPowerStereoPanner : public BaseStereoPanner static StreamPanner* factory (Panner&, Evoral::Parameter param); static std::string name; - XMLNode& state (bool full_state); - XMLNode& get_state (void); + XMLNode& state (bool full_state); + XMLNode& get_state (void); int set_state (const XMLNode&); private: @@ -165,12 +165,12 @@ class Multi2dPanner : public StreamPanner void distribute (AudioBuffer& src, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes); void distribute_automated (AudioBuffer& src, BufferSet& obufs, - nframes_t start, nframes_t end, nframes_t nframes, pan_t** buffers); + nframes_t start, nframes_t end, nframes_t nframes, pan_t** buffers); static StreamPanner* factory (Panner&, Evoral::Parameter); static std::string name; - XMLNode& state (bool full_state); + XMLNode& state (bool full_state); XMLNode& get_state (void); int set_state (const XMLNode&); @@ -185,16 +185,16 @@ class Multi2dPanner : public StreamPanner class Panner : public SessionObject, public AutomatableControls { - public: +public: struct Output { - float x; - float y; - pan_t current_pan; - pan_t desired_pan; - - Output (float xp, float yp) - : x (xp), y (yp), current_pan (0.0f), desired_pan (0.f) {} - + float x; + float y; + pan_t current_pan; + pan_t desired_pan; + + Output (float xp, float yp) + : x (xp), y (yp), current_pan (0.0f), desired_pan (0.f) {} + }; //Panner (std::string name, Session&, int _num_bufs); @@ -248,7 +248,7 @@ class Panner : public SessionObject, public AutomatableControls LinkDirection link_direction() const { return _link_direction; } void set_link_direction (LinkDirection); - + bool linked() const { return _linked; } void set_linked (bool yn); @@ -260,7 +260,7 @@ class Panner : public SessionObject, public AutomatableControls sigc::signal<void> StateChanged; /* for bypass */ /* only StreamPanner should call these */ - + void set_position (float x, StreamPanner& orig); void set_position (float x, float y, StreamPanner& orig); void set_position (float x, float y, float z, StreamPanner& orig); @@ -270,31 +270,31 @@ class Panner : public SessionObject, public AutomatableControls int load (); struct PanControllable : public AutomationControl { - PanControllable (Session& s, std::string name, Panner& p, Evoral::Parameter param) + PanControllable (Session& s, std::string name, Panner& p, Evoral::Parameter param) : AutomationControl (s, param, boost::shared_ptr<AutomationList>(new AutomationList(param)), name) , panner (p) { assert(param.type() != NullAutomation); } - + AutomationList* alist() { return (AutomationList*)_list.get(); } - Panner& panner; - - void set_value (float); - float get_value (void) const; + Panner& panner; + + void set_value (float); + float get_value (void) const; }; boost::shared_ptr<AutomationControl> pan_control (int id, int chan=0) { - return automation_control(Evoral::Parameter (PanAutomation, chan, id)); + return automation_control(Evoral::Parameter (PanAutomation, chan, id)); } boost::shared_ptr<const AutomationControl> pan_control (int id, int chan=0) const { - return automation_control(Evoral::Parameter (PanAutomation, chan, id)); + return automation_control(Evoral::Parameter (PanAutomation, chan, id)); } private: /* disallow copy construction */ Panner (Panner const &); - + void distribute_no_automation(BufferSet& src, BufferSet& dest, nframes_t nframes, gain_t gain_coeff); std::vector<StreamPanner*> _streampanners; uint32_t current_outs; diff --git a/libs/ardour/ardour/peak.h b/libs/ardour/ardour/peak.h index 3d380b2b03..5be2c08f41 100644 --- a/libs/ardour/ardour/peak.h +++ b/libs/ardour/ardour/peak.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 @@ -25,12 +25,12 @@ #include "ardour/utils.h" static inline float -default_compute_peak (const ARDOUR::Sample * const buf, nframes_t nsamples, float current) +default_compute_peak (const ARDOUR::Sample * const buf, nframes_t nsamples, float current) { for (nframes_t i = 0; i < nsamples; ++i) { current = f_max (current, fabsf (buf[i])); } return current; -} +} #endif /* __ardour_peak_h__ */ diff --git a/libs/ardour/ardour/pitch.h b/libs/ardour/ardour/pitch.h index 589c370409..8c7718f685 100644 --- a/libs/ardour/ardour/pitch.h +++ b/libs/ardour/ardour/pitch.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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 @@ -22,7 +22,7 @@ #ifdef WAF_BUILD #include "libardour-config.h" -#endif +#endif #include "ardour/filter.h" diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 6778a70f53..56c755bebb 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -35,7 +35,7 @@ #include <sigc++/signal.h> #include "pbd/undo.h" -#include "pbd/stateful.h" +#include "pbd/stateful.h" #include "pbd/statefuldestructible.h" #include "evoral/types.hpp" @@ -62,7 +62,7 @@ class Playlist : public SessionObject, Playlist (boost::shared_ptr<const Playlist>, std::string name, bool hidden = false); Playlist (boost::shared_ptr<const Playlist>, nframes_t start, nframes_t cnt, std::string name, bool hidden = false); - virtual ~Playlist (); + virtual ~Playlist (); void set_region_ownership (); @@ -148,10 +148,10 @@ class Playlist : public SessionObject, uint32_t read_data_count() const { return _read_data_count; } const PBD::ID& get_orig_diskstream_id () const { return _orig_diskstream_id; } - void set_orig_diskstream_id (const PBD::ID& did) { _orig_diskstream_id = did; } + void set_orig_diskstream_id (const PBD::ID& did) { _orig_diskstream_id = did; } /* destructive editing */ - + virtual bool destroy_region (boost::shared_ptr<Region>) = 0; /* special case function used by UI selection objects, which have playlists that actually own the regions @@ -163,7 +163,7 @@ class Playlist : public SessionObject, bool explicit_relayering () const { return _explicit_relayering; } - + void set_explicit_relayering (bool e); protected: @@ -171,20 +171,20 @@ class Playlist : public SessionObject, protected: struct RegionLock { - RegionLock (Playlist *pl, bool do_block_notify = true) : playlist (pl), block_notify (do_block_notify) { - playlist->region_lock.lock(); - if (block_notify) { - playlist->delay_notifications(); - } - } - ~RegionLock() { - playlist->region_lock.unlock(); - if (block_notify) { - playlist->release_notifications (); - } - } - Playlist *playlist; - bool block_notify; + RegionLock (Playlist *pl, bool do_block_notify = true) : playlist (pl), block_notify (do_block_notify) { + playlist->region_lock.lock(); + if (block_notify) { + playlist->delay_notifications(); + } + } + ~RegionLock() { + playlist->region_lock.unlock(); + if (block_notify) { + playlist->release_notifications (); + } + } + Playlist *playlist; + bool block_notify; }; friend class RegionLock; @@ -219,8 +219,8 @@ class Playlist : public SessionObject, uint32_t _read_data_count; PBD::ID _orig_diskstream_id; uint64_t layer_op_counter; - nframes_t freeze_length; - bool auto_partition; + nframes_t freeze_length; + bool auto_partition; /** true if relayering should be done using region's current layers and their `pending explicit relayer' * flags; otherwise false if relayering should be done using the layer-model (most recently moved etc.) @@ -230,7 +230,7 @@ class Playlist : public SessionObject, void init (bool hide); - bool holding_state () const { + bool holding_state () const { return g_atomic_int_get (&block_notifications) != 0 || g_atomic_int_get (&ignore_state_changes) != 0; } @@ -265,7 +265,7 @@ class Playlist : public SessionObject, void splice_unlocked (nframes_t at, nframes64_t distance, boost::shared_ptr<Region> exclude); virtual void finalize_split_region (boost::shared_ptr<Region> /*original*/, boost::shared_ptr<Region> /*left*/, boost::shared_ptr<Region> /*right*/) {} - + virtual void check_dependents (boost::shared_ptr<Region> /*region*/, bool /*norefresh*/) {} virtual void refresh_dependents (boost::shared_ptr<Region> /*region*/) {} virtual void remove_dependents (boost::shared_ptr<Region> /*region*/) {} @@ -275,7 +275,7 @@ class Playlist : public SessionObject, boost::shared_ptr<Region> region_by_id (PBD::ID); bool add_region_internal (boost::shared_ptr<Region>, nframes_t position); - + int remove_region_internal (boost::shared_ptr<Region>); RegionList *find_regions_at (nframes_t frame); void copy_regions (RegionList&) const; @@ -283,14 +283,14 @@ class Playlist : public SessionObject, nframes_t _get_maximum_extent() const; - boost::shared_ptr<Playlist> cut_copy (boost::shared_ptr<Playlist> (Playlist::*pmf)(nframes_t, nframes_t, bool), - std::list<AudioRange>& ranges, bool result_is_hidden); + boost::shared_ptr<Playlist> cut_copy (boost::shared_ptr<Playlist> (Playlist::*pmf)(nframes_t, nframes_t, bool), + std::list<AudioRange>& ranges, bool result_is_hidden); boost::shared_ptr<Playlist> cut (nframes_t start, nframes_t cnt, bool result_is_hidden); boost::shared_ptr<Playlist> copy (nframes_t start, nframes_t cnt, bool result_is_hidden); int move_region_to_layer (layer_t, boost::shared_ptr<Region> r, int dir); void relayer (); - + void unset_freeze_parent (Playlist*); void unset_freeze_child (Playlist*); diff --git a/libs/ardour/ardour/playlist_factory.h b/libs/ardour/ardour/playlist_factory.h index 46e27d9b87..02bd68ae7a 100644 --- a/libs/ardour/ardour/playlist_factory.h +++ b/libs/ardour/ardour/playlist_factory.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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/plugin.h b/libs/ardour/ardour/plugin.h index a1fe25d31d..d80f299385 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2006 Paul Davis + Copyright (C) 2000-2006 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 @@ -24,7 +24,7 @@ #include <sigc++/signal.h> #include <glibmm/ustring.h> -#include "pbd/statefuldestructible.h" +#include "pbd/statefuldestructible.h" #include "pbd/controllable.h" #include <jack/types.h> @@ -53,13 +53,13 @@ class PluginInfo { public: PluginInfo () { } PluginInfo (const PluginInfo &o) - : name(o.name), - category (o.category), + : name(o.name), + category (o.category), creator (o.creator), - path (o.path), - n_inputs(o.n_inputs), + path (o.path), + n_inputs(o.n_inputs), n_outputs(o.n_outputs), - unique_id(o.unique_id), + unique_id(o.unique_id), index(o.index) {} virtual ~PluginInfo () { } @@ -70,7 +70,7 @@ class PluginInfo { ChanCount n_inputs; ChanCount n_outputs; ARDOUR::PluginType type; - + std::string unique_id; virtual PluginPtr load (Session& session) = 0; @@ -89,23 +89,23 @@ class Plugin : public PBD::StatefulDestructible, public Latent Plugin (ARDOUR::AudioEngine&, ARDOUR::Session&); Plugin (const Plugin&); virtual ~Plugin (); - + struct ParameterDescriptor { - /* essentially a union of LADSPA and VST info */ - - bool integer_step; - bool toggled; - bool logarithmic; - bool sr_dependent; - std::string label; - float lower; - float upper; - float step; - float smallstep; - float largestep; - bool min_unbound; - bool max_unbound; + /* essentially a union of LADSPA and VST info */ + + bool integer_step; + bool toggled; + bool logarithmic; + bool sr_dependent; + std::string label; + float lower; + float upper; + float step; + float smallstep; + float largestep; + bool min_unbound; + bool max_unbound; }; virtual std::string unique_id() const = 0; @@ -125,7 +125,7 @@ class Plugin : public PBD::StatefulDestructible, public Latent virtual int connect_and_run (BufferSet& bufs, ChanMapping in, ChanMapping out, nframes_t nframes, nframes_t offset) = 0; - + virtual std::set<Evoral::Parameter> automatable() const = 0; virtual std::string describe_parameter (Evoral::Parameter) = 0; virtual std::string state_node_name() const = 0; @@ -191,9 +191,9 @@ class Plugin : public PBD::StatefulDestructible, public Latent protected: friend class PluginInsert; friend struct PluginInsert::PluginControl; - + virtual void set_parameter (uint32_t which, float val) = 0; - + bool save_preset (std::string uri, std::string domain /* vst, ladspa etc. */); ARDOUR::AudioEngine& _engine; @@ -206,5 +206,5 @@ class Plugin : public PBD::StatefulDestructible, public Latent PluginPtr find_plugin(ARDOUR::Session&, std::string unique_id, ARDOUR::PluginType); } // namespace ARDOUR - + #endif /* __ardour_plugin_h__ */ diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h index 2908803aab..69b4ab1f8f 100644 --- a/libs/ardour/ardour/plugin_insert.h +++ b/libs/ardour/ardour/plugin_insert.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000,2007 Paul Davis + Copyright (C) 2000,2007 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 @@ -49,14 +49,14 @@ class PluginInsert : public Processor ~PluginInsert (); static const std::string port_automation_node_name; - + XMLNode& state(bool); XMLNode& get_state(void); int set_state(const XMLNode&); void run (BufferSet& in, sframes_t start_frame, sframes_t end_frame, nframes_t nframes); void silence (nframes_t nframes); - + void activate (); void deactivate (); @@ -75,22 +75,22 @@ class PluginInsert : public Processor bool is_generator() const; - struct PluginControl : public AutomationControl + struct PluginControl : public AutomationControl { - PluginControl (PluginInsert* p, const Evoral::Parameter ¶m, - boost::shared_ptr<AutomationList> list = boost::shared_ptr<AutomationList>()); - + PluginControl (PluginInsert* p, const Evoral::Parameter ¶m, + boost::shared_ptr<AutomationList> list = boost::shared_ptr<AutomationList>()); + void set_value (float val); - float get_value (void) const; - - private: - PluginInsert* _plugin; + float get_value (void) const; + + private: + PluginInsert* _plugin; bool _logarithmic; bool _toggled; }; boost::shared_ptr<Plugin> plugin(uint32_t num=0) const { - if (num < _plugins.size()) { + if (num < _plugins.size()) { return _plugins[num]; } else { return _plugins[0]; // we always have one @@ -104,7 +104,7 @@ class PluginInsert : public Processor nframes_t signal_latency() const; boost::shared_ptr<Plugin> get_impulse_analysis_plugin(); - + void collect_signal_for_analysis(nframes_t nframes); sigc::signal<void, BufferSet*, BufferSet*> AnalysisDataGathered; @@ -114,12 +114,12 @@ class PluginInsert : public Processor PluginInsert (const PluginInsert&); void parameter_changed (Evoral::Parameter, float); - + void set_parameter (Evoral::Parameter param, float val); float get_parameter (Evoral::Parameter param); float default_parameter_value (const Evoral::Parameter& param); - + typedef std::vector<boost::shared_ptr<Plugin> > Plugins; Plugins _plugins; @@ -130,7 +130,7 @@ class PluginInsert : public Processor BufferSet _signal_analysis_inputs; BufferSet _signal_analysis_outputs; - + void automation_run (BufferSet& bufs, nframes_t nframes); void connect_and_run (BufferSet& bufs, nframes_t nframes, nframes_t offset, bool with_auto, nframes_t now = 0); diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h index 90f00be8b1..c792b539a7 100644 --- a/libs/ardour/ardour/plugin_manager.h +++ b/libs/ardour/ardour/plugin_manager.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 @@ -65,22 +65,22 @@ class PluginManager : public boost::noncopyable { void add_favorite (ARDOUR::PluginType type, std::string unique_id); void remove_favorite (ARDOUR::PluginType type, std::string unique_id); bool is_a_favorite_plugin (const PluginInfoPtr&); - + private: struct FavoritePlugin { - ARDOUR::PluginType type; - std::string unique_id; - - FavoritePlugin (ARDOUR::PluginType t, std::string id) - : type (t), unique_id (id) {} - - bool operator==(const FavoritePlugin& other) const { - return other.type == type && other.unique_id == unique_id; - } - - bool operator<(const FavoritePlugin& other) const { - return other.type < type || other.unique_id < unique_id; - } + ARDOUR::PluginType type; + std::string unique_id; + + FavoritePlugin (ARDOUR::PluginType t, std::string id) + : type (t), unique_id (id) {} + + bool operator==(const FavoritePlugin& other) const { + return other.type == type && other.unique_id == unique_id; + } + + bool operator<(const FavoritePlugin& other) const { + return other.type < type || other.unique_id < unique_id; + } }; typedef std::set<FavoritePlugin> FavoritePluginList; FavoritePluginList favorites; @@ -93,7 +93,7 @@ class PluginManager : public boost::noncopyable { #ifdef HAVE_SLV2 LV2World* _lv2_world; #endif - + std::map<uint32_t, std::string> rdf_type; std::string ladspa_path; @@ -109,7 +109,7 @@ class PluginManager : public boost::noncopyable { int au_discover (); void au_refresh (); - + int lv2_discover (); void lv2_refresh (); diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index 5ac7cb90ca..75215e148d 100644 --- a/libs/ardour/ardour/port.h +++ b/libs/ardour/ardour/port.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 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 @@ -32,7 +32,7 @@ namespace ARDOUR { class AudioEngine; -class Buffer; +class Buffer; class Port : public sigc::trackable, public boost::noncopyable { @@ -101,7 +101,7 @@ public: void set_latency (nframes_t); virtual void reset (); - + /** @return the size of the raw buffer (bytes) for duration @a nframes (audio frames) */ virtual size_t raw_buffer_size(jack_nframes_t nframes) const = 0; @@ -113,13 +113,13 @@ public: virtual void flush_buffers (nframes_t, nframes_t offset = 0) { (void) offset; } - + static void set_engine (AudioEngine *); sigc::signal<void, bool> MonitorInputChanged; protected: - + Port (std::string const &, DataType, Flags); jack_port_t* _jack_port; ///< JACK port @@ -133,7 +133,7 @@ private: friend class AudioEngine; void recompute_total_latency () const; - + /* XXX */ bool _last_monitor; diff --git a/libs/ardour/ardour/port_insert.h b/libs/ardour/ardour/port_insert.h index 7447c5b3e8..18f54b0216 100644 --- a/libs/ardour/ardour/port_insert.h +++ b/libs/ardour/ardour/port_insert.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000,2007 Paul Davis + Copyright (C) 2000,2007 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 @@ -56,7 +56,7 @@ class PortInsert : public IOProcessor nframes_t signal_latency() const; bool set_name (const std::string& name); - + bool can_support_io_configuration (const ChanCount& in, ChanCount& out) const; bool configure_io (ChanCount in, ChanCount out); @@ -67,7 +67,7 @@ class PortInsert : public IOProcessor PortInsert (const PortInsert&); boost::shared_ptr<Delivery> _out; - + uint32_t bitslot; }; diff --git a/libs/ardour/ardour/port_set.h b/libs/ardour/ardour/port_set.h index 86da79df72..106f2872d1 100644 --- a/libs/ardour/ardour/port_set.h +++ b/libs/ardour/ardour/port_set.h @@ -1,16 +1,16 @@ /* - Copyright (C) 2006 Paul Davis - + Copyright (C) 2006 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 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. @@ -47,16 +47,16 @@ public: /** nth port */ Port* port(size_t index) const; - + /** nth port of type @a t, or nth port if t = NIL */ Port* port(DataType t, size_t index) const; AudioPort* nth_audio_port(size_t n) const; - + MidiPort* nth_midi_port(size_t n) const; bool contains(const Port* port) const; - + /** Remove all ports from the PortSet. Ports are not deregistered with * the engine, it's the caller's responsibility to not leak here! */ @@ -68,7 +68,7 @@ public: // ITERATORS // FIXME: possible to combine these? templates? - + class iterator { public: Port& operator*() { return *_set.port(_type, _index); } @@ -91,12 +91,12 @@ public: iterator begin(DataType type = DataType::NIL) { return iterator(*this, type, 0); } - + iterator end(DataType type = DataType::NIL) { return iterator(*this, type, (type == DataType::NIL) ? _count.n_total() : _count.get(type)); } - + class const_iterator { public: @@ -139,9 +139,9 @@ public: audio_iterator audio_begin() { return audio_iterator(*this, 0); } audio_iterator audio_end() { return audio_iterator(*this, _count.n_audio()); } -private: +private: typedef std::vector<Port*> PortVec; - + // Vector of vectors, indexed by DataType::to_index() std::vector<PortVec> _ports; diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h index 90a4ab96b4..21b7966fba 100644 --- a/libs/ardour/ardour/processor.h +++ b/libs/ardour/ardour/processor.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -24,7 +24,7 @@ #include <string> #include <exception> -#include "pbd/statefuldestructible.h" +#include "pbd/statefuldestructible.h" #include <sigc++/signal.h> @@ -55,7 +55,7 @@ class Processor : public SessionObject, public AutomatableControls, public Laten virtual ~Processor() { } virtual std::string display_name() const { return SessionObject::name(); } - + virtual bool visible() const { return true; } virtual void set_visible (bool) {} @@ -63,19 +63,19 @@ class Processor : public SessionObject, public AutomatableControls, public Laten bool get_next_ab_is_active () const { return _next_ab_is_active; } void set_next_ab_is_active (bool yn) { _next_ab_is_active = yn; } - + virtual nframes_t signal_latency() const { return 0; } - + virtual void transport_stopped (sframes_t /*frame*/) {} - + virtual void set_block_size (nframes_t /*nframes*/) {} virtual void run (BufferSet& /*bufs*/, sframes_t /*start_frame*/, sframes_t /*end_frame*/, nframes_t /*nframes*/) {} virtual void silence (nframes_t /*nframes*/) {} - + virtual void activate () { _pending_active = true; ActiveChanged(); } virtual void deactivate () { _pending_active = false; ActiveChanged(); } - + virtual bool configure_io (ChanCount in, ChanCount out); /* Derived classes should override these, or processor appears as an in-place pass-through */ @@ -92,7 +92,7 @@ class Processor : public SessionObject, public AutomatableControls, public Laten virtual XMLNode& state (bool full); XMLNode& get_state (void); int set_state (const XMLNode&); - + void *get_gui () const { return _gui; } void set_gui (void *p) { _gui = p; } diff --git a/libs/ardour/ardour/profile.h b/libs/ardour/ardour/profile.h index b016063c4d..5d4e611833 100644 --- a/libs/ardour/ardour/profile.h +++ b/libs/ardour/ardour/profile.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 @@ -26,14 +26,14 @@ namespace ARDOUR { class RuntimeProfile { - public: - enum Element { - SmallScreen, - SAE, - SinglePackage, - LastElement - }; - +public: + enum Element { + SmallScreen, + SAE, + SinglePackage, + LastElement + }; + RuntimeProfile() { bits.resize (LastElement); } ~RuntimeProfile() {} @@ -46,9 +46,9 @@ class RuntimeProfile { void set_single_package () { bits[SinglePackage] = true; } bool get_single_package () const { return bits[SinglePackage]; } - private: +private: boost::dynamic_bitset<uint64_t> bits; - + }; extern RuntimeProfile* Profile; diff --git a/libs/ardour/ardour/quantize.h b/libs/ardour/ardour/quantize.h index 8db7e4185f..b02335811c 100644 --- a/libs/ardour/ardour/quantize.h +++ b/libs/ardour/ardour/quantize.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007-2009 Paul Davis + Copyright (C) 2007-2009 Paul Davis Author: Dave Robillard This program is free software; you can redistribute it and/or modify @@ -30,24 +30,24 @@ class Session; class Quantize : public MidiOperator { public: - Quantize (ARDOUR::Session&, QuantizeType type, - bool snap_start, bool snap_end, - double start_grid, double end_grid, - float strength, float swing, float threshold); - ~Quantize (); + Quantize (ARDOUR::Session&, QuantizeType type, + bool snap_start, bool snap_end, + double start_grid, double end_grid, + float strength, float swing, float threshold); + ~Quantize (); - Command* operator() (boost::shared_ptr<ARDOUR::MidiModel>, std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>&); - std::string name() const { return std::string ("quantize"); } + Command* operator() (boost::shared_ptr<ARDOUR::MidiModel>, std::vector<Evoral::Sequence<Evoral::MusicalTime>::Notes>&); + std::string name() const { return std::string ("quantize"); } private: - ARDOUR::Session& session; - bool _snap_start; - bool _snap_end; - double _start_grid; - double _end_grid; - float _strength; - float _swing; - float _threshold; + ARDOUR::Session& session; + bool _snap_start; + bool _snap_end; + double _start_grid; + double _end_grid; + float _strength; + float _swing; + float _threshold; }; } /* namespace */ diff --git a/libs/ardour/ardour/rb_effect.h b/libs/ardour/ardour/rb_effect.h index f7ad6af9a5..e4b1c00034 100644 --- a/libs/ardour/ardour/rb_effect.h +++ b/libs/ardour/ardour/rb_effect.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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.h b/libs/ardour/ardour/rc_configuration.h index a599b94e9e..d12a9c63e7 100644 --- a/libs/ardour/ardour/rc_configuration.h +++ b/libs/ardour/ardour/rc_configuration.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Davis + Copyright (C) 1999 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 @@ -47,7 +47,7 @@ class RCConfiguration : public Configuration int load_state (); int save_state (); - /// calls Stateful::*instant_xml methods using + /// calls Stateful::*instant_xml methods using /// ARDOUR::user_config_directory for the directory argument void add_instant_xml (XMLNode&); XMLNode * instant_xml (const std::string& str); @@ -73,12 +73,12 @@ class RCConfiguration : public Configuration /* declare variables */ #undef CONFIG_VARIABLE -#undef CONFIG_VARIABLE_SPECIAL +#undef CONFIG_VARIABLE_SPECIAL #define CONFIG_VARIABLE(Type,var,name,value) ConfigVariable<Type> var; #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) ConfigVariableWithMutation<Type> var; #include "ardour/rc_configuration_vars.h" #undef CONFIG_VARIABLE -#undef CONFIG_VARIABLE_SPECIAL +#undef CONFIG_VARIABLE_SPECIAL XMLNode* _control_protocol_state; }; diff --git a/libs/ardour/ardour/recent_sessions.h b/libs/ardour/ardour/recent_sessions.h index d713c4f3f1..e6d2f83bcc 100644 --- a/libs/ardour/ardour/recent_sessions.h +++ b/libs/ardour/ardour/recent_sessions.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2004 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.h b/libs/ardour/ardour/region.h index c28e70bb5f..dab4f5df6f 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2001 Paul Davis + Copyright (C) 2000-2001 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 @@ -85,7 +85,7 @@ class Region MusicTime }; - static const Flag DefaultFlags = Flag (Opaque|DefaultFadeIn|DefaultFadeOut|FadeIn|FadeOut); + static const Flag DefaultFlags = Flag (Opaque|DefaultFadeIn|DefaultFadeOut|FadeIn|FadeOut); static Change FadeChanged; static Change SyncOffsetChanged; @@ -141,7 +141,7 @@ class Region nframes_t sync_point () const; nframes_t adjust_to_sync (nframes_t) const; - + /* first_frame() is an alias; last_frame() just hides some math */ nframes_t first_frame() const { return _position; } @@ -172,13 +172,13 @@ class Region OverlapType coverage (nframes_t start, nframes_t end) const { return ARDOUR::coverage (first_frame(), last_frame(), start, end); } - + bool equivalent (boost::shared_ptr<const Region>) const; bool size_equivalent (boost::shared_ptr<const Region>) const; bool overlap_equivalent (boost::shared_ptr<const Region>) const; bool region_list_equivalent (boost::shared_ptr<const Region>) const; bool source_equivalent (boost::shared_ptr<const Region>) const; - + /* EDITING OPERATIONS */ void set_length (nframes_t, void *src); @@ -196,7 +196,7 @@ class Region void trim_front (nframes_t new_position, void *src); void trim_end (nframes_t new_position, void *src); void trim_to (nframes_t position, nframes_t length, void *src); - + void set_layer (layer_t l); /* ONLY Playlist can call this */ void raise (); void lower (); @@ -210,7 +210,7 @@ class Region void set_opaque (bool yn); void set_locked (bool yn); void set_position_locked (bool yn); - + int apply (Filter&); virtual uint32_t read_data_count() const { return _read_data_count; } @@ -219,7 +219,7 @@ class Region virtual void set_playlist (boost::weak_ptr<ARDOUR::Playlist>); void source_deleted (boost::shared_ptr<Source>); - + boost::shared_ptr<Source> source (uint32_t n=0) const { return _sources[ (n < _sources.size()) ? n : 0 ]; } uint32_t n_channels() const { return _sources.size(); } @@ -228,24 +228,24 @@ class Region std::vector<std::string> master_source_names(); void set_master_sources (const SourceList&); - + /* automation */ - + virtual boost::shared_ptr<Evoral::Control> control(const Evoral::Parameter& id, bool create=false) = 0; virtual boost::shared_ptr<const Evoral::Control> control(const Evoral::Parameter& id) const = 0; - + /* serialization */ - + XMLNode& get_state (); virtual XMLNode& state (bool); virtual int set_state (const XMLNode&); virtual int set_live_state (const XMLNode&, Change&, bool send); virtual boost::shared_ptr<Region> get_parent() const; - + uint64_t last_layer_op() const { return _last_layer_op; } void set_last_layer_op (uint64_t when); @@ -259,7 +259,7 @@ class Region // no transients, but its OK return 0; } - + virtual int separate_by_channel (ARDOUR::Session&, std::vector< boost::shared_ptr<Region> >&) const { return 0; @@ -270,7 +270,7 @@ class Region void set_pending_explicit_relayer (bool p) { _pending_explicit_relayer = p; } - + bool pending_explicit_relayer () const { return _pending_explicit_relayer; } @@ -278,11 +278,11 @@ class Region protected: friend class RegionFactory; - Region (boost::shared_ptr<Source> src, nframes_t start, nframes_t length, + Region (boost::shared_ptr<Source> src, nframes_t start, nframes_t length, const std::string& name, DataType type, layer_t = 0, Flag flags = DefaultFlags); - Region (const SourceList& srcs, nframes_t start, nframes_t length, + Region (const SourceList& srcs, nframes_t start, nframes_t length, const std::string& name, DataType type, layer_t = 0, Flag flags = DefaultFlags); - + Region (boost::shared_ptr<const Region>, nframes_t start, nframes_t length, const std::string& name, layer_t = 0, Flag flags = DefaultFlags); Region (boost::shared_ptr<const Region>, nframes_t length, const std::string& name, layer_t = 0, Flag flags = DefaultFlags); Region (boost::shared_ptr<const Region>); @@ -304,12 +304,12 @@ class Region bool copied() const { return _flags & Copied; } void maybe_uncopy (); void first_edit (); - + bool verify_start (nframes_t); bool verify_start_and_length (nframes_t, nframes_t&); bool verify_start_mutable (nframes_t&_start); bool verify_length (nframes_t); - + virtual void recompute_at_start () = 0; virtual void recompute_at_end () = 0; @@ -342,7 +342,7 @@ class Region /** true if this region has had its layer explicitly set since the playlist last relayered */ bool _pending_explicit_relayer; - + boost::weak_ptr<ARDOUR::Playlist> _playlist; private: diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index 8da6dde25f..e702a2433f 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 @@ -37,7 +37,7 @@ class RegionFactory { in a pure Region copy, it will not be emitted. It must be emitted by derived classes, not Region - itself, to permit dynamic_cast<> to be used to + itself, to permit dynamic_cast<> to be used to infer the type of Region. */ static sigc::signal<void,boost::shared_ptr<Region> > CheckNewRegion; @@ -48,12 +48,12 @@ class RegionFactory { gcc 4.1 doesn't seem to be able to disambiguate them if they do. */ - static boost::shared_ptr<Region> create (boost::shared_ptr<Region>, nframes_t start, - nframes_t length, const std::string& name, - layer_t = 0, Region::Flag flags = Region::DefaultFlags, bool announce = true); - static boost::shared_ptr<Region> create (boost::shared_ptr<AudioRegion>, nframes_t start, - nframes_t length, const std::string& name, - layer_t = 0, Region::Flag flags = Region::DefaultFlags, bool announce = true); + static boost::shared_ptr<Region> create (boost::shared_ptr<Region>, nframes_t start, + nframes_t length, const std::string& name, + layer_t = 0, Region::Flag flags = Region::DefaultFlags, bool announce = true); + static boost::shared_ptr<Region> create (boost::shared_ptr<AudioRegion>, nframes_t start, + nframes_t length, const std::string& name, + layer_t = 0, Region::Flag flags = Region::DefaultFlags, bool announce = true); static boost::shared_ptr<Region> create (boost::shared_ptr<Region>, const SourceList&, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags, bool announce = true); static boost::shared_ptr<Region> create (boost::shared_ptr<Source>, nframes_t start, nframes_t length, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags, bool announce = true); static boost::shared_ptr<Region> create (const SourceList &, nframes_t start, nframes_t length, const std::string& name, layer_t = 0, Region::Flag flags = Region::DefaultFlags, bool announce = true); diff --git a/libs/ardour/ardour/resampled_source.h b/libs/ardour/ardour/resampled_source.h index 1f6947aeac..efa1458152 100644 --- a/libs/ardour/ardour/resampled_source.h +++ b/libs/ardour/ardour/resampled_source.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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 @@ -27,13 +27,13 @@ namespace ARDOUR { -class ResampledImportableSource : public ImportableSource +class ResampledImportableSource : public ImportableSource { public: ResampledImportableSource (boost::shared_ptr<ImportableSource>, nframes_t rate, SrcQuality); ~ResampledImportableSource (); - + nframes_t read (Sample* buffer, nframes_t nframes); float ratio() const { return src_data.src_ratio; } uint32_t channels() const { return source->channels(); } @@ -41,9 +41,9 @@ class ResampledImportableSource : public ImportableSource nframes_t samplerate() const { return source->samplerate(); } void seek (nframes_t pos) { source->seek (pos); } nframes64_t natural_position() const { return source->natural_position(); } - + static const uint32_t blocksize; - + private: boost::shared_ptr<ImportableSource> source; float* input; diff --git a/libs/ardour/ardour/return.h b/libs/ardour/ardour/return.h index 8f8a84f321..1a33795a37 100644 --- a/libs/ardour/ardour/return.h +++ b/libs/ardour/ardour/return.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 Paul Davis Author: Dave Robillard This program is free software; you can redistribute it and/or modify @@ -25,7 +25,7 @@ #include <string> -#include "pbd/stateful.h" +#include "pbd/stateful.h" #include "ardour/ardour.h" #include "ardour/audioengine.h" #include "ardour/io_processor.h" @@ -35,23 +35,23 @@ namespace ARDOUR { class Amp; class PeakMeter; -class Return : public IOProcessor +class Return : public IOProcessor { -public: +public: Return (Session&, bool internal = false); Return (Session&, const XMLNode&, bool internal = false); virtual ~Return (); - + uint32_t bit_slot() const { return _bitslot; } void run (BufferSet& bufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes); - + boost::shared_ptr<Amp> amp() const { return _amp; } boost::shared_ptr<PeakMeter> meter() const { return _meter; } bool metering() const { return _metering; } void set_metering (bool yn) { _metering = yn; } - + XMLNode& state(bool full); XMLNode& get_state(void); int set_state(const XMLNode& node); @@ -72,7 +72,7 @@ public: private: /* disallow copy construction */ Return (const Return&); - + uint32_t _bitslot; void collect_input (BufferSet& bufs, nframes_t nframes, ChanCount offset=ChanCount::ZERO); diff --git a/libs/ardour/ardour/reverse.h b/libs/ardour/ardour/reverse.h index 79f8880e56..0831e8184b 100644 --- a/libs/ardour/ardour/reverse.h +++ b/libs/ardour/ardour/reverse.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2004 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 34bf9e8d9f..1ecdb51488 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2002 Paul Davis + Copyright (C) 2000-2002 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 @@ -34,7 +34,7 @@ #include "pbd/fastlog.h" #include "pbd/xml++.h" #include "pbd/undo.h" -#include "pbd/stateful.h" +#include "pbd/stateful.h" #include "pbd/controllable.h" #include "pbd/destructible.h" @@ -97,14 +97,14 @@ class Route : public SessionObject, public AutomatableControls /* these are the core of the API of a Route. see the protected sections as well */ - virtual int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, - int declick, bool can_record, bool rec_monitors_input); + virtual int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, + int declick, bool can_record, bool rec_monitors_input); - virtual int no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, - bool state_changing, bool can_record, bool rec_monitors_input); + virtual int no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, + bool state_changing, bool can_record, bool rec_monitors_input); - virtual int silent_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, - bool can_record, bool rec_monitors_input); + virtual int silent_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, + bool can_record, bool rec_monitors_input); virtual void toggle_monitor_input (); virtual bool can_record() { return false; } @@ -117,7 +117,7 @@ class Route : public SessionObject, public AutomatableControls /* end of vfunc-based API */ void shift (nframes64_t, nframes64_t); - + void set_gain (gain_t val, void *src); void inc_gain (gain_t delta, void *src); @@ -136,7 +136,7 @@ class Route : public SessionObject, public AutomatableControls void set_listen (bool yn, void* src); bool listening () const; - + void set_phase_invert (bool yn); bool phase_invert() const; @@ -166,7 +166,7 @@ class Route : public SessionObject, public AutomatableControls method (boost::weak_ptr<Processor> (*i)); } } - + boost::shared_ptr<Processor> nth_processor (uint32_t n) { Glib::RWLock::ReaderLock lm (_processor_lock); ProcessorList::iterator i; @@ -256,11 +256,11 @@ class Route : public SessionObject, public AutomatableControls XMLNode& get_processor_state (); virtual void set_processor_state (const XMLNode&); - + int save_as_template (const std::string& path, const std::string& name); sigc::signal<void,void*> SelectedChanged; - + int listen_via (boost::shared_ptr<Route>, Placement p, bool active, bool aux); void drop_listen (boost::shared_ptr<Route>); @@ -275,7 +275,7 @@ class Route : public SessionObject, public AutomatableControls SoloControllable (std::string name, Route&); void set_value (float); float get_value (void) const; - + Route& route; }; @@ -287,8 +287,8 @@ class Route : public SessionObject, public AutomatableControls return _mute_master; } - boost::shared_ptr<MuteMaster> mute_master() const { - return _mute_master; + boost::shared_ptr<MuteMaster> mute_master() const { + return _mute_master; } /* Route doesn't own these items, but sub-objects that it does own have them @@ -301,7 +301,7 @@ class Route : public SessionObject, public AutomatableControls void automation_snapshot (nframes_t now, bool force=false); void protect_automation (); - + void set_remote_control_id (uint32_t id); uint32_t remote_control_id () const; sigc::signal<void> RemoteControlIDChanged; @@ -322,17 +322,17 @@ class Route : public SessionObject, public AutomatableControls protected: nframes_t check_initial_delay (nframes_t, nframes_t&); - + void passthru (sframes_t start_frame, sframes_t end_frame, - nframes_t nframes, int declick); + nframes_t nframes, int declick); virtual void write_out_of_band_data (BufferSet& /* bufs */, sframes_t /* start_frame */, sframes_t /* end_frame */, - nframes_t /* nframes */) {} + nframes_t /* nframes */) {} virtual void process_output_buffers (BufferSet& bufs, - sframes_t start_frame, sframes_t end_frame, - nframes_t nframes, bool with_processors, int declick); - + sframes_t start_frame, sframes_t end_frame, + nframes_t nframes, bool with_processors, int declick); + boost::shared_ptr<IO> _input; boost::shared_ptr<IO> _output; @@ -354,7 +354,7 @@ class Route : public SessionObject, public AutomatableControls bool _solo_isolated; bool _denormal_protection; - + bool _recordable : 1; bool _silent : 1; bool _declickable : 1; @@ -374,9 +374,9 @@ class Route : public SessionObject, public AutomatableControls void passthru_silence (sframes_t start_frame, sframes_t end_frame, nframes_t nframes, int declick); - + void silence (nframes_t nframes); - + sigc::connection input_signal_connection; ChanCount processor_max_streams; @@ -384,7 +384,7 @@ class Route : public SessionObject, public AutomatableControls uint32_t pans_required() const; ChanCount n_process_buffers (); - + virtual int _set_state (const XMLNode&, bool call_base); boost::shared_ptr<Amp> _amp; @@ -407,7 +407,7 @@ class Route : public SessionObject, public AutomatableControls int configure_processors (ProcessorStreams*); int configure_processors_unlocked (ProcessorStreams*); - bool add_processor_from_xml (const XMLNode&, ProcessorList::iterator iter); + bool add_processor_from_xml (const XMLNode&, ProcessorList::iterator iter); void placement_range (Placement p, ProcessorList::iterator& start, ProcessorList::iterator& end); }; diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h index 75f5af790e..194aa84582 100644 --- a/libs/ardour/ardour/route_group.h +++ b/libs/ardour/ardour/route_group.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -25,7 +25,7 @@ #include <string> #include <stdint.h> #include <sigc++/signal.h> -#include "pbd/stateful.h" +#include "pbd/stateful.h" #include "ardour/types.h" namespace ARDOUR { @@ -51,22 +51,22 @@ public: Select = 0x10, Edit = 0x20 }; - + RouteGroup (Session& s, const std::string &n, Flag f = Flag(0), Property p = Property(0)); - + const std::string& name() { return _name; } void set_name (std::string str); - + bool is_active () const { return _flags & Active; } bool is_relative () const { return _flags & Relative; } bool is_hidden () const { return _flags & Hidden; } bool empty() const {return routes.empty();} - + gain_t get_max_factor(gain_t factor); gain_t get_min_factor(gain_t factor); - + int size() { return routes.size();} - + void set_active (bool yn, void *src); void set_relative (bool yn, void *src); void set_hidden (bool yn, void *src); @@ -74,7 +74,7 @@ public: bool property (Property p) const { return ((_properties & p) == p); } - + bool active_property (Property p) const { return is_active() && property (p); } @@ -85,37 +85,37 @@ public: _properties = (Property) (_properties | p); } } - + int add (Route *); - + int remove (Route *); - + void apply (void (Route::*func)(void *), void *src) { for (std::list<Route *>::iterator i = routes.begin(); i != routes.end(); i++) { ((*i)->*func)(src); } } - + template<class T> void apply (void (Route::*func)(T, void *), T val, void *src) { for (std::list<Route *>::iterator i = routes.begin(); i != routes.end(); i++) { ((*i)->*func)(val, src); } } - + template<class T> void foreach_route (T *obj, void (T::*func)(Route&)) { for (std::list<Route *>::iterator i = routes.begin(); i != routes.end(); i++) { (obj->*func)(**i); } } - + /* to use these, #include "ardour/route_group_specialized.h" */ - + template<class T> void apply (void (Track::*func)(T, void *), T val, void *src); - + /* fills at_set with all members of the group that are AudioTracks */ - + void audio_track_group (std::set<AudioTrack*>& at_set); - + void clear () { routes.clear (); changed(); @@ -123,16 +123,16 @@ public: void make_subgroup (); void destroy_subgroup (); - + const std::list<Route*>& route_list() { return routes; } - + sigc::signal<void> changed; sigc::signal<void,void*> FlagsChanged; - + XMLNode& get_state (); - + int set_state (const XMLNode&); - + private: Session& _session; std::list<Route *> routes; @@ -140,10 +140,10 @@ private: std::string _name; Flag _flags; Property _properties; - + void remove_when_going_away (Route*); }; - + } /* namespace */ #endif /* __ardour_route_group_h__ */ diff --git a/libs/ardour/ardour/route_group_specialized.h b/libs/ardour/ardour/route_group_specialized.h index adf4dfc429..c9d06a93c9 100644 --- a/libs/ardour/ardour/route_group_specialized.h +++ b/libs/ardour/ardour/route_group_specialized.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 @@ -25,8 +25,8 @@ namespace ARDOUR { -template<class T> void -RouteGroup::apply (void (Track::*func)(T, void *), T val, void */*src*/) +template<class T> void +RouteGroup::apply (void (Track::*func)(T, void *), T val, void */*src*/) { for (std::list<Route *>::iterator i = routes.begin(); i != routes.end(); i++) { Track *at; @@ -35,7 +35,7 @@ RouteGroup::apply (void (Track::*func)(T, void *), T val, void */*src*/) } } } - + } /* namespace ARDOUR */ #endif /* __ardour_route_group_specialized_h__ */ diff --git a/libs/ardour/ardour/runtime_functions.h b/libs/ardour/ardour/runtime_functions.h index be39702a2f..147d697fca 100644 --- a/libs/ardour/ardour/runtime_functions.h +++ b/libs/ardour/ardour/runtime_functions.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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/send.h b/libs/ardour/ardour/send.h index dc57a72519..6b872df9fe 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -23,7 +23,7 @@ #include <sigc++/signal.h> #include <string> -#include "pbd/stateful.h" +#include "pbd/stateful.h" #include "ardour/ardour.h" #include "ardour/audioengine.h" @@ -36,7 +36,7 @@ class Amp; class Send : public Delivery { - public: + public: Send (Session&, boost::shared_ptr<MuteMaster>, Delivery::Role r = Delivery::Send); Send (Session&, boost::shared_ptr<MuteMaster>, const XMLNode&, Delivery::Role r = Delivery::Send); virtual ~Send (); @@ -50,7 +50,7 @@ class Send : public Delivery bool metering() const { return _metering; } void set_metering (bool yn) { _metering = yn; } - + XMLNode& state(bool full); XMLNode& get_state(void); int set_state(const XMLNode& node); @@ -78,7 +78,7 @@ class Send : public Delivery private: /* disallow copy construction */ Send (const Send&); - + uint32_t _bitslot; }; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index cdf6547674..5055ebc709 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -178,7 +178,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable std::list<AudioRange> audio_range; std::list<MusicRange> music_range; - + boost::shared_ptr<Region> region; Event(Type t, Action a, nframes_t when, nframes_t where, double spd, bool yn = false) @@ -223,15 +223,15 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable /* creating from an XML file */ Session (AudioEngine&, - const std::string& fullpath, - const std::string& snapshot_name, - std::string mix_template = ""); + const std::string& fullpath, + const std::string& snapshot_name, + std::string mix_template = ""); /* creating a new Session */ Session (AudioEngine&, - std::string fullpath, - std::string snapshot_name, + std::string fullpath, + std::string snapshot_name, AutoConnectOption input_auto_connect, AutoConnectOption output_auto_connect, uint32_t control_out_channels, @@ -248,7 +248,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable std::string raid_path () const; void set_snap_name (); - + bool writable() const { return _writable; } void set_dirty (); void set_clean (); @@ -319,9 +319,9 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable } struct RoutePublicOrderSorter { - bool operator() (boost::shared_ptr<Route>, boost::shared_ptr<Route> b); + bool operator() (boost::shared_ptr<Route>, boost::shared_ptr<Route> b); }; - + void sync_order_keys (std::string const &); template<class T> void foreach_route (T *obj, void (T::*func)(Route&)); @@ -419,7 +419,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable double frames_per_smpte_frame() const { return _frames_per_smpte_frame; } nframes_t smpte_frames_per_hour() const { return _smpte_frames_per_hour; } - MIDI::byte get_mtc_smpte_bits() const { + MIDI::byte get_mtc_smpte_bits() const { return mtc_smpte_bits; /* encoding of SMTPE type for MTC */ } @@ -506,7 +506,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable std::list<boost::shared_ptr<AudioTrack> > new_audio_track ( int input_channels, int output_channels, TrackMode mode = Normal, RouteGroup* route_group = 0, uint32_t how_many = 1 ); - + RouteList new_audio_route (int input_channels, int output_channels, RouteGroup* route_group, uint32_t how_many); std::list<boost::shared_ptr<MidiTrack> > new_midi_track ( @@ -582,7 +582,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable /// signals the current transport position in frames, bbt and smpte time (in that order) sigc::signal<void, const nframes_t&, const BBT_Time&, const SMPTE::Time&> tick; - + /* region info */ void add_regions (std::vector<boost::shared_ptr<Region> >&); @@ -628,7 +628,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable boost::shared_ptr<ExportHandler> get_export_handler (); boost::shared_ptr<ExportStatus> get_export_status (); - int start_audio_export (nframes_t position, bool realtime); + int start_audio_export (nframes_t position, bool realtime); sigc::signal<int, nframes_t> ProcessExport; sigc::signal<void> ExportReadFinished; @@ -717,8 +717,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable /* flattening stuff */ boost::shared_ptr<Region> write_one_track (AudioTrack&, nframes_t start, nframes_t end, - bool overwrite, std::vector<boost::shared_ptr<Source> >&, InterThreadInfo& wot, - bool enable_processing = true); + bool overwrite, std::vector<boost::shared_ptr<Source> >&, InterThreadInfo& wot, + bool enable_processing = true); int freeze (InterThreadInfo&); /* session-wide solo/mute/rec-enable */ @@ -846,22 +846,21 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable class GlobalRouteStateCommand : public Command { - public: + public: GlobalRouteStateCommand (Session&, void*); GlobalRouteStateCommand (Session&, const XMLNode& node); int set_state (const XMLNode&); XMLNode& get_state (); - protected: + protected: GlobalRouteBooleanState before, after; Session& sess; void* src; - }; class GlobalSoloStateCommand : public GlobalRouteStateCommand { - public: + public: GlobalSoloStateCommand (Session &, void *src); GlobalSoloStateCommand (Session&, const XMLNode&); void operator()(); //redo @@ -872,7 +871,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable class GlobalMuteStateCommand : public GlobalRouteStateCommand { - public: + public: GlobalMuteStateCommand(Session &, void *src); GlobalMuteStateCommand (Session&, const XMLNode&); void operator()(); // redo @@ -883,7 +882,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable class GlobalRecordEnableStateCommand : public GlobalRouteStateCommand { - public: + public: GlobalRecordEnableStateCommand(Session &, void *src); GlobalRecordEnableStateCommand (Session&, const XMLNode&); void operator()(); // redo @@ -894,7 +893,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable class GlobalMeteringStateCommand : public Command { - public: + public: GlobalMeteringStateCommand(Session &, void *src); GlobalMeteringStateCommand (Session&, const XMLNode&); void operator()(); @@ -903,7 +902,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable int set_state (const XMLNode&); void mark(); - protected: + protected: Session& sess; void* src; GlobalRouteMeterState before; @@ -939,7 +938,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable gain_t* gain_automation_buffer () const { return _gain_automation_buffer; } pan_t** pan_automation_buffer () const { return _pan_automation_buffer; } - + void ensure_buffer_set (BufferSet& buffers, const ChanCount& howmany); /* VST support */ @@ -967,7 +966,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable bool exporting () const { return _exporting; } - + protected: friend class AudioEngine; void set_block_size (nframes_t nframes); @@ -1019,13 +1018,13 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable Location* start_location; Slave* _slave; bool _silent; - + // varispeed playback volatile double _transport_speed; double _last_transport_speed; double _target_transport_speed; CubicInterpolation interpolation; - + bool auto_play_legal; nframes_t _last_slave_transport_frame; nframes_t maximum_output_latency; @@ -1085,10 +1084,10 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable void reset_slave_state (); bool follow_slave (nframes_t); void calculate_moving_average_of_slave_delta(int dir, nframes_t this_delta); - void track_slave_state(float slave_speed, nframes_t slave_transport_frame, - nframes_t this_delta, bool starting); + void track_slave_state(float slave_speed, nframes_t slave_transport_frame, + nframes_t this_delta, bool starting); void follow_slave_silently(nframes_t nframes, float slave_speed); - + void set_slave_source (SlaveSource); SlaveSource post_export_slave; @@ -1096,14 +1095,14 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable bool _exporting; bool _exporting_realtime; - + boost::shared_ptr<ExportHandler> export_handler; boost::shared_ptr<ExportStatus> export_status; int pre_export (); int stop_audio_export (); void finalize_audio_export (); - + sigc::connection export_freewheel_connection; void prepare_diskstreams (); @@ -1135,8 +1134,8 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable } bool maybe_stop (nframes_t limit) { - if ( (_transport_speed > 0.0f && _transport_frame >= limit) - || (_transport_speed < 0.0f && _transport_frame == 0) ) { + if ( (_transport_speed > 0.0f && _transport_frame >= limit) + || (_transport_speed < 0.0f && _transport_frame == 0) ) { stop_transport (); return true; } @@ -1644,7 +1643,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable pool.release (ptr); } - private: + private: static Pool pool; }; @@ -1730,7 +1729,7 @@ class Session : public PBD::StatefulDestructible, public boost::noncopyable void sync_order_keys (); static bool _disable_all_loaded_plugins; - + SessionMetadata * _metadata; mutable bool have_looped; ///< Used in ::audible_frame(*) diff --git a/libs/ardour/ardour/session_configuration.h b/libs/ardour/ardour/session_configuration.h index 57e78d2af0..fc7af8c450 100644 --- a/libs/ardour/ardour/session_configuration.h +++ b/libs/ardour/ardour/session_configuration.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 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 @@ -54,16 +54,16 @@ public: /* declare variables */ #undef CONFIG_VARIABLE -#undef CONFIG_VARIABLE_SPECIAL +#undef CONFIG_VARIABLE_SPECIAL #define CONFIG_VARIABLE(Type,var,name,value) ConfigVariable<Type> var; #define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) ConfigVariableWithMutation<Type> var; #include "ardour/session_configuration_vars.h" #undef CONFIG_VARIABLE -#undef CONFIG_VARIABLE_SPECIAL +#undef CONFIG_VARIABLE_SPECIAL int foo; }; } - + #endif diff --git a/libs/ardour/ardour/session_directory.h b/libs/ardour/ardour/session_directory.h index 9a3f4d4d77..ae6aa256cb 100644 --- a/libs/ardour/ardour/session_directory.h +++ b/libs/ardour/ardour/session_directory.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Tim Mayberry + Copyright (C) 2007 Tim Mayberry 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 @@ -41,7 +41,7 @@ public: const PBD::sys::path root_path() const { return m_root_path; } /** - * @return the absolute path to the directory in which + * @return the absolute path to the directory in which * the session stores audio files. * * If the session is an older session with an existing @@ -50,16 +50,16 @@ public: * of root_path()/interchange/session_name/audiofiles */ const PBD::sys::path sound_path () const; - + /** - * @return the absolute path to the directory in which + * @return the absolute path to the directory in which * the session stores MIDI files, ie * root_path()/interchange/session_name/midifiles */ const PBD::sys::path midi_path () const; - + /** - * @return the absolute path to the directory in which + * @return the absolute path to the directory in which * the session stores MIDNAM patch files, ie * root_path()/interchange/session_name/patchfiles */ @@ -77,7 +77,7 @@ public: * session. */ const PBD::sys::path dead_sound_path () const; - + /** * @return The absolute path to the directory that midi * files are moved to when they are no longer part of the @@ -92,7 +92,7 @@ public: const PBD::sys::path export_path () const; /** - * @return true if session directory and all the required + * @return true if session directory and all the required * subdirectories exist. */ bool is_valid () const; diff --git a/libs/ardour/ardour/session_metadata.h b/libs/ardour/ardour/session_metadata.h index 71dd59904c..cfa1fb6f29 100644 --- a/libs/ardour/ardour/session_metadata.h +++ b/libs/ardour/ardour/session_metadata.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Paul Davis + Copyright (C) 2008 Paul Davis Author: Sakari Bergen This program is free software; you can redistribute it and/or modify it @@ -40,7 +40,7 @@ class SessionMetadata : public PBD::StatefulDestructible public: SessionMetadata (); ~SessionMetadata (); - + /*** Accessing ***/ Glib::ustring comment () const; Glib::ustring copyright () const; @@ -50,7 +50,7 @@ class SessionMetadata : public PBD::StatefulDestructible Glib::ustring grouping () const; Glib::ustring title () const; Glib::ustring subtitle () const; - + Glib::ustring artist () const; Glib::ustring album_artist () const; Glib::ustring lyricist () const; @@ -62,7 +62,7 @@ class SessionMetadata : public PBD::StatefulDestructible Glib::ustring producer () const; Glib::ustring dj_mixer () const; Glib::ustring mixer () const; - + Glib::ustring album () const; Glib::ustring compilation () const; Glib::ustring disc_subtitle () const; @@ -70,19 +70,19 @@ class SessionMetadata : public PBD::StatefulDestructible uint32_t total_discs () const; uint32_t track_number () const; uint32_t total_tracks () const; - + Glib::ustring genre () const; - + /*** Editing ***/ void set_comment (const Glib::ustring &); void set_copyright (const Glib::ustring &); void set_isrc (const Glib::ustring &); void set_year (uint32_t); - + void set_grouping (const Glib::ustring &); void set_title (const Glib::ustring &); void set_subtitle (const Glib::ustring &); - + void set_artist (const Glib::ustring &); void set_album_artist (const Glib::ustring &); void set_lyricist (const Glib::ustring &); @@ -94,7 +94,7 @@ class SessionMetadata : public PBD::StatefulDestructible void set_producer (const Glib::ustring &); void set_dj_mixer (const Glib::ustring &); void set_mixer (const Glib::ustring &); - + void set_album (const Glib::ustring &); void set_compilation (const Glib::ustring &); void set_disc_subtitle (const Glib::ustring &); @@ -102,24 +102,24 @@ class SessionMetadata : public PBD::StatefulDestructible void set_total_discs (uint32_t); void set_track_number (uint32_t); void set_total_tracks (uint32_t); - + void set_genre (const Glib::ustring &); - + /*** Serialization ***/ XMLNode & get_state (); int set_state (const XMLNode &); private: - + typedef std::pair<Glib::ustring, Glib::ustring> Property; typedef std::map<Glib::ustring, Glib::ustring> PropertyMap; PropertyMap map; XMLNode * get_xml (const Glib::ustring & name); - + Glib::ustring get_value (const Glib::ustring & name) const; uint32_t get_uint_value (const Glib::ustring & name) const; - + void set_value (const Glib::ustring & name, const Glib::ustring & value); void set_value (const Glib::ustring & name, uint32_t value); }; diff --git a/libs/ardour/ardour/session_object.h b/libs/ardour/ardour/session_object.h index 7a05ab16b0..07c33c9701 100644 --- a/libs/ardour/ardour/session_object.h +++ b/libs/ardour/ardour/session_object.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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 @@ -21,7 +21,7 @@ #define __ardour_session_object_h__ #include <string> -#include "pbd/statefuldestructible.h" +#include "pbd/statefuldestructible.h" namespace ARDOUR { @@ -40,10 +40,10 @@ public: : _session(session) , _name(name) {} - + Session& session() const { return _session; } const std::string& name() const { return _name; } - + virtual bool set_name (const std::string& str) { if (_name != str) { _name = str; @@ -51,7 +51,7 @@ public: } return true; } - + sigc::signal<void> NameChanged; protected: diff --git a/libs/ardour/ardour/session_playlist.h b/libs/ardour/ardour/session_playlist.h index 0641d442a8..f924fe4bbc 100644 --- a/libs/ardour/ardour/session_playlist.h +++ b/libs/ardour/ardour/session_playlist.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 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 @@ -25,8 +25,8 @@ namespace ARDOUR { -template<class T> void -Session::foreach_playlist (T *obj, void (T::*func)(boost::shared_ptr<Playlist>)) +template<class T> void +Session::foreach_playlist (T *obj, void (T::*func)(boost::shared_ptr<Playlist>)) { Glib::Mutex::Lock lm (playlist_lock); for (PlaylistList::iterator i = playlists.begin(); i != playlists.end(); i++) { diff --git a/libs/ardour/ardour/session_region.h b/libs/ardour/ardour/session_region.h index c4a6f64889..a9c9713035 100644 --- a/libs/ardour/ardour/session_region.h +++ b/libs/ardour/ardour/session_region.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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_route.h b/libs/ardour/ardour/session_route.h index c7e911abb5..cfaa13cdc8 100644 --- a/libs/ardour/ardour/session_route.h +++ b/libs/ardour/ardour/session_route.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -29,7 +29,7 @@ namespace ARDOUR { -template<class T> void +template<class T> void Session::foreach_route (T *obj, void (T::*func)(Route&)) { boost::shared_ptr<RouteList> r = routes.reader(); @@ -43,7 +43,7 @@ Session::foreach_route (T *obj, void (T::*func)(Route&)) } } -template<class T> void +template<class T> void Session::foreach_route (T *obj, void (T::*func)(boost::shared_ptr<Route>)) { boost::shared_ptr<RouteList> r = routes.reader(); @@ -57,7 +57,7 @@ Session::foreach_route (T *obj, void (T::*func)(boost::shared_ptr<Route>)) } } -template<class T, class A> void +template<class T, class A> void Session::foreach_route (T *obj, void (T::*func)(Route&, A), A arg1) { boost::shared_ptr<RouteList> r = routes.reader(); diff --git a/libs/ardour/ardour/session_selection.h b/libs/ardour/ardour/session_selection.h index b92cb475a0..52c7ab0e0e 100644 --- a/libs/ardour/ardour/session_selection.h +++ b/libs/ardour/ardour/session_selection.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2002 Paul Davis + Copyright (C) 2002 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 @@ -25,8 +25,8 @@ namespace ARDOUR { -template<class T> void -Session::foreach_named_selection (T& obj, void (T::*func)(NamedSelection&)) +template<class T> void +Session::foreach_named_selection (T& obj, void (T::*func)(NamedSelection&)) { Glib::Mutex::Lock lm (named_selection_lock); for (NamedSelectionList::iterator i = named_selections.begin(); i != named_selections.end(); i++) { diff --git a/libs/ardour/ardour/session_state_utils.h b/libs/ardour/ardour/session_state_utils.h index a41456b8f7..de58d3eff0 100644 --- a/libs/ardour/ardour/session_state_utils.h +++ b/libs/ardour/ardour/session_state_utils.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Tim Mayberry + Copyright (C) 2007 Tim Mayberry 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 @@ -29,7 +29,7 @@ namespace ARDOUR { /** * Attempt to create a backup copy of a file. * - * A copy of the file is created in the same directory using + * A copy of the file is created in the same directory using * the same filename with the backup suffix appended. * * @return true if successful, false otherwise. @@ -37,21 +37,21 @@ namespace ARDOUR { bool create_backup_file (const PBD::sys::path & file_path); /** - * Get the absolute paths to all state files in the directory + * Get the absolute paths to all state files in the directory * at path directory_path. * * @param directory_path The absolute path to a directory. * @param result vector to contain resulting state files. */ void get_state_files_in_directory (const PBD::sys::path & directory_path, - std::vector<PBD::sys::path>& result); + std::vector<PBD::sys::path>& result); /** * Given a vector of paths to files, return a vector containing * the filenames without any extension. * * @param file_paths a vector containing the file paths - * @return a vector containing a list of file names without any + * @return a vector containing a list of file names without any * filename extension. */ std::vector<std::string> get_file_names_no_extension (const std::vector<PBD::sys::path> & file_paths); diff --git a/libs/ardour/ardour/silentfilesource.h b/libs/ardour/ardour/silentfilesource.h index dcf7964ac6..ec7f1c4d0b 100644 --- a/libs/ardour/ardour/silentfilesource.h +++ b/libs/ardour/ardour/silentfilesource.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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 @@ -17,7 +17,7 @@ */ -#ifndef __ardour_silentfilesource_h__ +#ifndef __ardour_silentfilesource_h__ #define __ardour_silentfilesource_h__ #include <cstring> @@ -32,9 +32,9 @@ public: float sample_rate () const { return _sample_rate; } void set_length (nframes_t len) { _length = len; } - + bool destructive() const { return false; } - bool can_be_analysed() const { return false; } + bool can_be_analysed() const { return false; } protected: friend class SourceFactory; @@ -56,12 +56,12 @@ protected: void set_header_timeline_position () {} - int read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t /*start*/, nframes_t /*cnt*/, - double /*samples_per_unit*/, nframes_t /*fpp*/) const { + int read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, sframes_t /*start*/, nframes_t /*cnt*/, + double /*samples_per_unit*/, nframes_t /*fpp*/) const { memset (peaks, 0, sizeof (PeakData) * npeaks); return 0; } - + float _sample_rate; }; diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 5987151307..64e350ae9c 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -38,10 +38,10 @@ namespace MIDI { namespace ARDOUR { /** * @class Slave - * + * * @brief The Slave interface can be used to sync ARDOURs tempo to an external source * like MTC, MIDI Clock, etc. - * + * * The name of the interface may be a bit misleading: A subclass of Slave actually * acts as a time master for ARDOUR, that means ARDOUR will try to follow the * speed and transport position of the implementation of Slave. @@ -57,7 +57,7 @@ class Slave { * This is the most important function to implement: * Each process cycle, Session::follow_slave will call this method. * and after the method call they should - * + * * Session::follow_slave will then try to follow the given * <emph>position</emph> using a delay locked loop (DLL), * starting with the first given transport speed. @@ -65,92 +65,92 @@ class Slave { * ARDOUR will always follow the position and disregard the speed. * Although, a correct speed is important so that ARDOUR * can sync to the master time source quickly. - * - * For background information on delay locked loops, + * + * For background information on delay locked loops, * see http://www.kokkinizita.net/papers/usingdll.pdf - * + * * The method has the following precondition: * <ul> - * <li> - * Slave::ok() should return true, otherwise playback will stop + * <li> + * Slave::ok() should return true, otherwise playback will stop * immediately and the method will not be called - * </li> + * </li> * <li> * when the references speed and position are passed into the Slave * they are uninitialized * </li> * </ul> - * + * * After the method call the following postconditions should be met: * <ul> - * <li> + * <li> * The first position value on transport start should be 0, - * otherwise ARDOUR will try to locate to the new position + * otherwise ARDOUR will try to locate to the new position * rather than move to it * </li> - * <li> - * the references speed and position should be assigned + * <li> + * the references speed and position should be assigned * to the Slaves current requested transport speed * and transport position. * </li> * <li> - * Slave::resolution() should be greater than the maximum distance of + * Slave::resolution() should be greater than the maximum distance of * ARDOURs transport position to the slaves requested transport position. * </li> - * <li>Slave::locked() should return true, otherwise Session::no_roll will be called</li> - * <li>Slave::starting() should be false, otherwise the transport will not move until it becomes true</li> * + * <li>Slave::locked() should return true, otherwise Session::no_roll will be called</li> + * <li>Slave::starting() should be false, otherwise the transport will not move until it becomes true</li> * * </ul> - * + * * @param speed - The transport speed requested * @param position - The transport position requested * @return - The return value is currently ignored (see Session::follow_slave) */ virtual bool speed_and_position (double& speed, nframes_t& position) = 0; - + /** - * reports to ARDOUR whether the Slave is currently synced to its external + * reports to ARDOUR whether the Slave is currently synced to its external * time source. - * + * * @return - when returning false, the transport will stop rolling */ virtual bool locked() const = 0; - + /** * reports to ARDOUR whether the slave is in a sane state - * - * @return - when returning false, the transport will be stopped and the slave + * + * @return - when returning false, the transport will be stopped and the slave * disconnected from ARDOUR. */ virtual bool ok() const = 0; - + /** * reports to ARDOUR whether the slave is in the process of starting * to roll - * + * * @return - when returning false, transport will not move until this method returns true */ virtual bool starting() const { return false; } - + /** * @return - the timing resolution of the Slave - If the distance of ARDOURs transport * to the slave becomes greater than the resolution, sound will stop */ virtual nframes_t resolution() const = 0; - + /** * @return - when returning true, ARDOUR will wait for one second before transport * starts rolling */ virtual bool requires_seekahead () const = 0; - + /** - * @return - when returning true, ARDOUR will use transport speed 1.0 no matter what + * @return - when returning true, ARDOUR will use transport speed 1.0 no matter what * the slave returns */ virtual bool is_always_synced() const { return false; } - + /** - * @return - whether ARDOUR should use the slave speed without any adjustments + * @return - whether ARDOUR should use the slave speed without any adjustments */ virtual bool give_slave_full_control_over_transport_speed() const { return false; } }; @@ -195,11 +195,11 @@ struct SafeTime { nframes_t timestamp; int guard2; - SafeTime() { - guard1 = 0; - guard2 = 0; - timestamp = 0; - } + SafeTime() { + guard1 = 0; + guard2 = 0; + timestamp = 0; + } }; class MTC_Slave : public Slave, public sigc::trackable { @@ -264,7 +264,7 @@ class MIDIClock_Slave : public Slave, public sigc::trackable { bool give_slave_full_control_over_transport_speed() const { return true; } void set_bandwidth (double a_bandwith) { bandwidth = a_bandwith; } - + private: ISlaveSessionProxy* session; MIDI::Port* port; @@ -272,41 +272,41 @@ class MIDIClock_Slave : public Slave, public sigc::trackable { /// pulses per quarter note for one MIDI clock frame (default 24) int ppqn; - + /// the duration of one ppqn in frame time double one_ppqn_in_frames; /// the timestamp of the first MIDI clock message nframes_t first_timestamp; - + /// the time stamp and should-be transport position of the last inbound MIDI clock message nframes_t last_timestamp; double should_be_position; - + /// the number of midi clock messages received (zero-based) /// since start long midi_clock_count; - + //the delay locked loop (DLL), see www.kokkinizita.net/papers/usingdll.pdf - + /// time at the beginning of the MIDI clock frame double t0; - + /// calculated end of the MIDI clock frame double t1; - + /// loop error = real value - expected value double e; - + /// second order loop error double e2; - + /// DLL filter bandwidth double bandwidth; - + /// DLL filter coefficients double b, c, omega; - + void reset (); void start (MIDI::Parser& parser, nframes_t timestamp); void contineu (MIDI::Parser& parser, nframes_t timestamp); @@ -322,7 +322,7 @@ class MIDIClock_Slave : public Slave, public sigc::trackable { /// whether transport should be rolling bool _started; - + /// is true if the MIDI Start message has just been received until /// the first MIDI Clock Event bool _starting; diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index 025f770fc3..993a340a70 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -18,7 +18,7 @@ */ -#ifndef __ardour_smf_source_h__ +#ifndef __ardour_smf_source_h__ #define __ardour_smf_source_h__ #include <cstdio> @@ -44,13 +44,13 @@ public: SMFSource (Session& session, const XMLNode&, bool must_exist = false); virtual ~SMFSource (); - + bool safe_file_extension (const Glib::ustring& path) const { return safe_midi_file_extension(path); } bool set_name (const std::string& newname) { return (set_source_name(newname, false) == 0); } - + void append_event_unlocked_beats (const Evoral::Event<Evoral::MusicalTime>& ev); void append_event_unlocked_frames (const Evoral::Event<nframes_t>& ev, sframes_t source_start); @@ -64,7 +64,7 @@ public: void destroy_model (); void flush_midi (); - + static void set_header_position_offset (nframes_t offset, bool negative); static bool safe_midi_file_extension (const Glib::ustring& path); diff --git a/libs/ardour/ardour/smpte.h b/libs/ardour/ardour/smpte.h index d0901c372e..fa18a1eec4 100644 --- a/libs/ardour/ardour/smpte.h +++ b/libs/ardour/ardour/smpte.h @@ -1,4 +1,4 @@ -/* Copyright (C) 2006 Paul Davis +/* Copyright (C) 2006 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 the diff --git a/libs/ardour/ardour/sndfile_helpers.h b/libs/ardour/ardour/sndfile_helpers.h index 54190dcae3..ed84820b8d 100644 --- a/libs/ardour/ardour/sndfile_helpers.h +++ b/libs/ardour/ardour/sndfile_helpers.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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/sndfileimportable.h b/libs/ardour/ardour/sndfileimportable.h index 42ce83c0ee..95c6d80ebb 100644 --- a/libs/ardour/ardour/sndfileimportable.h +++ b/libs/ardour/ardour/sndfileimportable.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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 d3c6cdb85a..7983b2e340 100644 --- a/libs/ardour/ardour/sndfilesource.h +++ b/libs/ardour/ardour/sndfilesource.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 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 @@ -17,7 +17,7 @@ */ -#ifndef __sndfile_source_h__ +#ifndef __sndfile_source_h__ #define __sndfile_source_h__ #include <sndfile.h> @@ -34,9 +34,9 @@ class SndFileSource : public AudioFileSource { /* Constructor to be called for new in-session files */ SndFileSource (Session&, const Glib::ustring& path, bool embedded, - SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate, + SampleFormat samp_format, HeaderFormat hdr_format, nframes_t rate, Flag flags = SndFileSource::default_writable_flags); - + /** Constructor to be called for existing in-session files */ SndFileSource (Session&, const XMLNode&); diff --git a/libs/ardour/ardour/soundseq.h b/libs/ardour/ardour/soundseq.h index c7157428ee..ff8e96ad8f 100644 --- a/libs/ardour/ardour/soundseq.h +++ b/libs/ardour/ardour/soundseq.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2001 Paul Davis + Copyright (C) 2001 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/source.h b/libs/ardour/ardour/source.h index a61af84ac8..ae581f760d 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -25,7 +25,7 @@ #include <boost/utility.hpp> #include <sigc++/signal.h> -#include "pbd/statefuldestructible.h" +#include "pbd/statefuldestructible.h" #include "ardour/ardour.h" #include "ardour/session_object.h" @@ -53,39 +53,39 @@ class Source : public SessionObject, public boost::noncopyable Source (Session&, DataType type, const std::string& name, Flag flags=Flag(0)); Source (Session&, const XMLNode&); - + virtual ~Source (); - + DataType type() { return _type; } time_t timestamp() const { return _timestamp; } void stamp (time_t when) { _timestamp = when; } - + virtual sframes_t length (sframes_t pos) const = 0; virtual void update_length (sframes_t pos, sframes_t cnt) = 0; - + virtual const Glib::ustring& path() const = 0; virtual nframes64_t natural_position() const { return 0; } void mark_for_remove(); - + virtual void mark_streaming_write_started () {} virtual void mark_streaming_write_completed () = 0; virtual void session_saved() {} - + XMLNode& get_state (); int set_state (const XMLNode&); - + bool destructive() const { return (_flags & Destructive); } bool writable () const { return (_flags & Writable); } virtual bool set_destructive (bool /*yn*/) { return false; } virtual bool length_mutable() const { return false; } - + void use () { _in_use++; } void disuse () { if (_in_use) { _in_use--; } } - + void add_playlist (boost::shared_ptr<ARDOUR::Playlist>); void remove_playlist (boost::weak_ptr<ARDOUR::Playlist>); @@ -95,21 +95,21 @@ class Source : public SessionObject, public boost::noncopyable sigc::signal<void,boost::shared_ptr<Source> > Switched; bool has_been_analysed() const; - virtual bool can_be_analysed() const { return false; } + virtual bool can_be_analysed() const { return false; } virtual void set_been_analysed (bool yn); virtual bool check_for_analysis_data_on_disk(); sigc::signal<void> AnalysisChanged; - + AnalysisFeatureList transients; std::string get_transients_path() const; int load_transients (const std::string&); - + sframes_t timeline_position() const { return _timeline_position; } virtual void set_timeline_position (sframes_t pos); - + void set_allow_remove_if_empty (bool yn); - + Glib::Mutex& mutex() { return _lock; } Flag flags() const { return _flags; } @@ -122,7 +122,7 @@ class Source : public SessionObject, public boost::noncopyable mutable Glib::Mutex _lock; mutable Glib::Mutex _analysis_lock; Glib::Mutex _playlist_lock; - + typedef std::map<boost::shared_ptr<ARDOUR::Playlist>, uint32_t > PlaylistMap; PlaylistMap _playlists; diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h index c5d5a410e9..8d53a3c865 100644 --- a/libs/ardour/ardour/source_factory.h +++ b/libs/ardour/ardour/source_factory.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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/spline.h b/libs/ardour/ardour/spline.h index de1ece6edb..28af6d4c92 100644 --- a/libs/ardour/ardour/spline.h +++ b/libs/ardour/ardour/spline.h @@ -45,38 +45,38 @@ void spline_fill (Spline *, float x0, float x1, float *vec, uint32_t veclen); float spline_get_max_x (Spline *); float spline_get_min_x (Spline *); -struct _spline +struct _spline { - float *deriv2; - float *x; - float *y; - float max_x; - float min_x; - SplinePoint *points; - uint32_t npoints; - uint32_t space; + float *deriv2; + float *x; + float *y; + float max_x; + float min_x; + SplinePoint *points; + uint32_t npoints; + uint32_t space; #ifdef __cplusplus - void set (uint32_t n, SplinePoint *points) { - spline_set (this, n, points); - } - - void add (uint32_t n, SplinePoint *points) { - spline_add (this, n, points); - } - - void solve () { - spline_solve (this); - } - - float eval (float val) { - return spline_eval (this, val); - } - - void fill (float x0, float x1, float *vec, uint32_t veclen) { - spline_fill (this, x0, x1, vec, veclen); - } + void set (uint32_t n, SplinePoint *points) { + spline_set (this, n, points); + } + + void add (uint32_t n, SplinePoint *points) { + spline_add (this, n, points); + } + + void solve () { + spline_solve (this); + } + + float eval (float val) { + return spline_eval (this, val); + } + + void fill (float x0, float x1, float *vec, uint32_t veclen) { + spline_fill (this, x0, x1, vec, veclen); + } #endif /* __cplusplus */ diff --git a/libs/ardour/ardour/stretch.h b/libs/ardour/ardour/stretch.h index b878d4794e..56a2555531 100644 --- a/libs/ardour/ardour/stretch.h +++ b/libs/ardour/ardour/stretch.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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 @@ -22,7 +22,7 @@ #ifdef WAF_BUILD #include "libardour-config.h" -#endif +#endif #include "ardour/filter.h" diff --git a/libs/ardour/ardour/strip_silence.h b/libs/ardour/ardour/strip_silence.h index dab3ddd3d5..217f6b3d8a 100644 --- a/libs/ardour/ardour/strip_silence.h +++ b/libs/ardour/ardour/strip_silence.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2009 Paul Davis + Copyright (C) 2009 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 @@ -21,12 +21,12 @@ namespace ARDOUR { -/// A filter to strip silence from regions +/// A filter to strip silence from regions class StripSilence : public Filter { public: StripSilence (Session &, double, nframes_t, nframes_t); - + int run (boost::shared_ptr<ARDOUR::Region>); private: diff --git a/libs/ardour/ardour/tape_file_matcher.h b/libs/ardour/ardour/tape_file_matcher.h index ff6e23dc79..6c8392f46f 100644 --- a/libs/ardour/ardour/tape_file_matcher.h +++ b/libs/ardour/ardour/tape_file_matcher.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Tim Mayberry + Copyright (C) 2007 Tim Mayberry 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/template_utils.h b/libs/ardour/ardour/template_utils.h index f40ed1c552..fefb4a7c47 100644 --- a/libs/ardour/ardour/template_utils.h +++ b/libs/ardour/ardour/template_utils.h @@ -15,8 +15,8 @@ namespace ARDOUR { PBD::sys::path user_route_template_directory (); struct TemplateInfo { - std::string name; - std::string path; + std::string name; + std::string path; }; void find_route_templates (std::vector<TemplateInfo>& template_names); diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index 49e370c7b4..69b7198408 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000 Paul Davis + Copyright (C) 2000 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 @@ -27,8 +27,8 @@ #include <glibmm/thread.h> #include "pbd/undo.h" -#include "pbd/stateful.h" -#include "pbd/statefuldestructible.h" +#include "pbd/stateful.h" +#include "pbd/statefuldestructible.h" #include <sigc++/signal.h> @@ -41,7 +41,7 @@ class Meter; class Tempo { public: Tempo (double bpm, double type=4.0) // defaulting to quarter note - : _beats_per_minute (bpm), _note_type(type) {} + : _beats_per_minute (bpm), _note_type(type) {} double beats_per_minute () const { return _beats_per_minute;} double note_type () const { return _note_type;} @@ -56,12 +56,12 @@ class Meter { public: static const double ticks_per_beat; - Meter (double bpb, double bt) + Meter (double bpb, double bt) : _beats_per_bar (bpb), _note_type (bt) {} double beats_per_bar () const { return _beats_per_bar; } double note_divisor() const { return _note_type; } - + double frames_per_bar (const Tempo&, nframes_t sr) const; protected: @@ -154,22 +154,22 @@ class TempoMap : public PBD::StatefulDestructible }; struct BBTPoint { - BBTPointType type; - nframes_t frame; - const Meter* meter; - const Tempo* tempo; - uint32_t bar; - uint32_t beat; - - BBTPoint (const Meter& m, const Tempo& t, nframes_t f, - BBTPointType ty, uint32_t b, uint32_t e) - : type (ty), frame (f), meter (&m), tempo (&t), bar (b), beat (e) {} + BBTPointType type; + nframes_t frame; + const Meter* meter; + const Tempo* tempo; + uint32_t bar; + uint32_t beat; + + BBTPoint (const Meter& m, const Tempo& t, nframes_t f, + BBTPointType ty, uint32_t b, uint32_t e) + : type (ty), frame (f), meter (&m), tempo (&t), bar (b), beat (e) {} }; typedef std::vector<BBTPoint> BBTPointList; - + template<class T> void apply_with_metrics (T& obj, void (T::*method)(const Metrics&)) { - Glib::RWLock::ReaderLock lm (lock); + Glib::RWLock::ReaderLock lm (lock); (obj.*method)(*metrics); } @@ -197,7 +197,7 @@ class TempoMap : public PBD::StatefulDestructible void move_tempo (TempoSection&, const BBT_Time& to); void move_meter (MeterSection&, const BBT_Time& to); - + void remove_tempo(const TempoSection&); void remove_meter(const MeterSection&); @@ -223,17 +223,17 @@ class TempoMap : public PBD::StatefulDestructible class Metric { public: Metric (const Meter& m, const Tempo& t) : _meter (&m), _tempo (&t), _frame (0) {} - + void set_tempo (const Tempo& t) { _tempo = &t; } void set_meter (const Meter& m) { _meter = &m; } void set_frame (nframes_t f) { _frame = f; } void set_start (const BBT_Time& t) { _start = t; } - + const Meter& meter() const { return *_meter; } const Tempo& tempo() const { return *_tempo; } nframes_t frame() const { return _frame; } const BBT_Time& start() const { return _start; } - + private: const Meter* _meter; const Tempo* _tempo; @@ -265,7 +265,7 @@ class TempoMap : public PBD::StatefulDestructible bool last_bbt_valid; BBT_Time last_bbt; mutable Glib::RWLock lock; - + void timestamp_metrics (bool use_bbt); nframes_t round_to_type (nframes_t fr, int dir, BBTPointType); diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h index 8e3ddd5547..f87bca665d 100644 --- a/libs/ardour/ardour/ticker.h +++ b/libs/ardour/ardour/ticker.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Hans Baier + Copyright (C) 2008 Hans Baier 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 @@ -36,12 +36,12 @@ class Ticker : public sigc::trackable public: Ticker() : _session(0) {}; virtual ~Ticker() {}; - + virtual void tick( - const nframes_t& transport_frames, - const BBT_Time& transport_bbt, + const nframes_t& transport_frames, + const BBT_Time& transport_bbt, const SMPTE::Time& transport_smpte) = 0; - + virtual void set_session(Session& s); virtual void going_away() { _session = 0; } @@ -56,45 +56,45 @@ private: MidiClockTicker() : _midi_port(0), _ppqn(24), _last_tick(0.0) {}; MidiClockTicker( const MidiClockTicker& ); MidiClockTicker& operator= (const MidiClockTicker&); - + public: virtual ~MidiClockTicker() {}; - + static MidiClockTicker& instance() { static MidiClockTicker _instance; return _instance; } - + void tick( - const nframes_t& transport_frames, - const BBT_Time& transport_bbt, + const nframes_t& transport_frames, + const BBT_Time& transport_bbt, const SMPTE::Time& transport_smpte); - + void set_session(Session& s); void going_away() { _midi_port = 0; Ticker::going_away(); } /// slot for the signal session::MIDIClock_PortChanged void update_midi_clock_port(); - + /// slot for the signal session::TransportStateChange void transport_state_changed(); - + /// slot for the signal session::PositionChanged void position_changed(nframes_t position); /// slot for the signal session::TransportLooped void transport_looped(); - + /// pulses per quarter note (default 24) void set_ppqn(int ppqn) { _ppqn = ppqn; } -private: +private: MIDI::Port* _midi_port; int _ppqn; double _last_tick; double one_ppqn_in_frames(nframes_t transport_position); - + void send_midi_clock_event(nframes_t offset); void send_start_event(nframes_t offset); void send_continue_event(nframes_t offset); diff --git a/libs/ardour/ardour/timestamps.h b/libs/ardour/ardour/timestamps.h index a0aeeae13d..f4380a648d 100644 --- a/libs/ardour/ardour/timestamps.h +++ b/libs/ardour/ardour/timestamps.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2000-2007 Paul Davis + Copyright (C) 2000-2007 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/track.h b/libs/ardour/ardour/track.h index cb2d05caa6..1b191a1d3e 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2006 Paul Davis + Copyright (C) 2006 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 @@ -37,23 +37,23 @@ class Track : public Route Track (Session&, std::string name, Route::Flag f = Route::Flag (0), TrackMode m = Normal, DataType default_type = DataType::AUDIO); virtual ~Track (); - + bool set_name (const std::string& str); TrackMode mode () const { return _mode; } virtual int set_mode (TrackMode /*m*/) { return false; } virtual bool can_use_mode (TrackMode /*m*/, bool& /*bounce_required*/) { return false; } sigc::signal<void> TrackModeChanged; - - virtual int no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, - bool state_changing, bool can_record, bool rec_monitors_input); - - int silent_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, + + virtual int no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, + bool state_changing, bool can_record, bool rec_monitors_input); + + int silent_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, bool can_record, bool rec_monitors_input); - virtual int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, - int declick, bool can_record, bool rec_monitors_input) = 0; - + virtual int roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, + int declick, bool can_record, bool rec_monitors_input) = 0; + void toggle_monitor_input (); bool can_record(); @@ -73,7 +73,7 @@ class Track : public Route }; FreezeState freeze_state() const; - + virtual void freeze (InterThreadInfo&) = 0; virtual void unfreeze () = 0; @@ -89,9 +89,9 @@ class Track : public Route bool record_enabled() const; void set_record_enable (bool yn, void *src); - + void set_meter_point (MeterPoint, void* src); - + sigc::signal<void> DiskstreamChanged; sigc::signal<void> FreezeChange; @@ -106,37 +106,37 @@ class Track : public Route //private: (FIXME) struct FreezeRecordProcessorInfo { - FreezeRecordProcessorInfo(XMLNode& st, boost::shared_ptr<Processor> proc) - : state (st), processor (proc) {} + FreezeRecordProcessorInfo(XMLNode& st, boost::shared_ptr<Processor> proc) + : state (st), processor (proc) {} - XMLNode state; - boost::shared_ptr<Processor> processor; - PBD::ID id; + XMLNode state; + boost::shared_ptr<Processor> processor; + PBD::ID id; }; struct FreezeRecord { - FreezeRecord() - : have_mementos(false) - {} - - ~FreezeRecord(); - - boost::shared_ptr<Playlist> playlist; - std::vector<FreezeRecordProcessorInfo*> processor_info; - bool have_mementos; - FreezeState state; - gain_t gain; - AutoState gain_automation_state; - AutoState pan_automation_state; + FreezeRecord() + : have_mementos(false) + {} + + ~FreezeRecord(); + + boost::shared_ptr<Playlist> playlist; + std::vector<FreezeRecordProcessorInfo*> processor_info; + bool have_mementos; + FreezeState state; + gain_t gain; + AutoState gain_automation_state; + AutoState pan_automation_state; }; struct RecEnableControllable : public PBD::Controllable { - RecEnableControllable (Track&); - - void set_value (float); - float get_value (void) const; + RecEnableControllable (Track&); - Track& track; + void set_value (float); + float get_value (void) const; + + Track& track; }; virtual void set_state_part_two () = 0; @@ -146,7 +146,7 @@ class Track : public Route sigc::connection recenable_connection; sigc::connection ic_connection; bool _destructive; - + boost::shared_ptr<RecEnableControllable> _rec_enable_control; }; diff --git a/libs/ardour/ardour/transient_detector.h b/libs/ardour/ardour/transient_detector.h index 2f4fc4c4f7..eb75f71c85 100644 --- a/libs/ardour/ardour/transient_detector.h +++ b/libs/ardour/ardour/transient_detector.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2008 Paul Davis + Copyright (C) 2008 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 @@ -41,11 +41,11 @@ class TransientDetector : public AudioAnalyser float get_threshold () const; float get_sensitivity () const; - + int run (const std::string& path, Readable*, uint32_t channel, AnalysisFeatureList& results); static void cleanup_transients (AnalysisFeatureList&, float sr, float gap_msecs); - + protected: AnalysisFeatureList* current_results; int use_features (Vamp::Plugin::FeatureSet&, std::ostream*); diff --git a/libs/ardour/ardour/types.h b/libs/ardour/ardour/types.h index 1a30cfd769..38a0e6d625 100644 --- a/libs/ardour/ardour/types.h +++ b/libs/ardour/ardour/types.h @@ -149,7 +149,7 @@ namespace ARDOUR { FilterChannels, ///< Ignore events on certain channels ForceChannel ///< Force all events to a certain channel }; - + enum ColorMode { MeterColors = 0, ChannelColors, @@ -157,30 +157,30 @@ namespace ARDOUR { }; struct BBT_Time { - uint32_t bars; - uint32_t beats; - uint32_t ticks; + uint32_t bars; + uint32_t beats; + uint32_t ticks; - BBT_Time() { - bars = 1; - beats = 1; - ticks = 0; - } + BBT_Time() { + bars = 1; + beats = 1; + ticks = 0; + } - /* we can't define arithmetic operators for BBT_Time, because - the results depend on a TempoMap, but we can define - a useful check on the less-than condition. - */ + /* we can't define arithmetic operators for BBT_Time, because + the results depend on a TempoMap, but we can define + a useful check on the less-than condition. + */ - bool operator< (const BBT_Time& other) const { - return bars < other.bars || - (bars == other.bars && beats < other.beats) || - (bars == other.bars && beats == other.beats && ticks < other.ticks); - } + bool operator< (const BBT_Time& other) const { + return bars < other.bars || + (bars == other.bars && beats < other.beats) || + (bars == other.bars && beats == other.beats && ticks < other.ticks); + } - bool operator== (const BBT_Time& other) const { - return bars == other.bars && beats == other.beats && ticks == other.ticks; - } + bool operator== (const BBT_Time& other) const { + return bars == other.bars && beats == other.beats && ticks == other.ticks; + } }; enum SmpteFormat { @@ -197,63 +197,63 @@ namespace ARDOUR { }; struct AnyTime { - enum Type { - SMPTE, - BBT, - Frames, - Seconds - }; + enum Type { + SMPTE, + BBT, + Frames, + Seconds + }; - Type type; + Type type; - SMPTE::Time smpte; - BBT_Time bbt; + SMPTE::Time smpte; + BBT_Time bbt; - union { - nframes_t frames; - double seconds; - }; + union { + nframes_t frames; + double seconds; + }; - AnyTime() { type = Frames; frames = 0; } + AnyTime() { type = Frames; frames = 0; } }; struct AudioRange { - nframes_t start; - nframes_t end; - uint32_t id; + nframes_t start; + nframes_t end; + uint32_t id; - AudioRange (nframes_t s, nframes_t e, uint32_t i) : start (s), end (e) , id (i) {} + AudioRange (nframes_t s, nframes_t e, uint32_t i) : start (s), end (e) , id (i) {} - nframes_t length() { return end - start + 1; } + nframes_t length() { return end - start + 1; } - bool operator== (const AudioRange& other) const { - return start == other.start && end == other.end && id == other.id; - } + bool operator== (const AudioRange& other) const { + return start == other.start && end == other.end && id == other.id; + } - bool equal (const AudioRange& other) const { - return start == other.start && end == other.end; - } + bool equal (const AudioRange& other) const { + return start == other.start && end == other.end; + } - OverlapType coverage (nframes_t s, nframes_t e) const { - return ARDOUR::coverage (start, end, s, e); - } + OverlapType coverage (nframes_t s, nframes_t e) const { + return ARDOUR::coverage (start, end, s, e); + } }; struct MusicRange { - BBT_Time start; - BBT_Time end; - uint32_t id; + BBT_Time start; + BBT_Time end; + uint32_t id; - MusicRange (BBT_Time& s, BBT_Time& e, uint32_t i) - : start (s), end (e), id (i) {} + MusicRange (BBT_Time& s, BBT_Time& e, uint32_t i) + : start (s), end (e), id (i) {} - bool operator== (const MusicRange& other) const { - return start == other.start && end == other.end && id == other.id; - } + bool operator== (const MusicRange& other) const { + return start == other.start && end == other.end && id == other.id; + } - bool equal (const MusicRange& other) const { - return start == other.start && end == other.end; - } + bool equal (const MusicRange& other) const { + return start == other.start && end == other.end; + } }; /* @@ -285,9 +285,9 @@ namespace ARDOUR { }; enum RegionPoint { - Start, - End, - SyncPoint + Start, + End, + SyncPoint }; enum Change { @@ -342,10 +342,10 @@ namespace ARDOUR { }; struct InterThreadInfo { - volatile bool done; - volatile bool cancel; - volatile float progress; - pthread_t thread; + volatile bool done; + volatile bool cancel; + volatile float progress; + pthread_t thread; }; enum SampleFormat { @@ -371,10 +371,10 @@ namespace ARDOUR { }; struct PeakData { - typedef Sample PeakDatum; + typedef Sample PeakDatum; - PeakDatum min; - PeakDatum max; + PeakDatum min; + PeakDatum max; }; enum PluginType { @@ -383,7 +383,7 @@ namespace ARDOUR { LV2, VST }; - + enum RunContext { ButlerContext = 0, TransportContext, @@ -403,7 +403,7 @@ namespace ARDOUR { }; enum ShuttleUnits { - Percentage, + Percentage, Semitones }; @@ -418,15 +418,16 @@ namespace ARDOUR { }; struct TimeFXRequest : public InterThreadInfo { - TimeFXRequest() : time_fraction(0), pitch_fraction(0), + TimeFXRequest() + : time_fraction(0), pitch_fraction(0), quick_seek(false), antialias(false), opts(0) {} - float time_fraction; - float pitch_fraction; - /* SoundTouch */ - bool quick_seek; - bool antialias; - /* RubberBand */ - int opts; // really RubberBandStretcher::Options + float time_fraction; + float pitch_fraction; + /* SoundTouch */ + bool quick_seek; + bool antialias; + /* RubberBand */ + int opts; // really RubberBandStretcher::Options }; typedef std::list<nframes64_t> AnalysisFeatureList; diff --git a/libs/ardour/ardour/uri_map.h b/libs/ardour/ardour/uri_map.h index 78e5393271..c62ec6bfc4 100644 --- a/libs/ardour/ardour/uri_map.h +++ b/libs/ardour/ardour/uri_map.h @@ -26,7 +26,7 @@ #include <boost/utility.hpp> #include <slv2/slv2.h> #include "lv2ext/lv2_uri_map.h" - + namespace ARDOUR { @@ -35,7 +35,7 @@ namespace ARDOUR { class URIMap : public boost::noncopyable { public: URIMap(); - + LV2_Feature* feature() { return &uri_map_feature; } uint32_t uri_to_id(const char* map, @@ -43,11 +43,11 @@ public: private: typedef std::map<std::string, uint32_t> Map; - + static uint32_t uri_map_uri_to_id(LV2_URI_Map_Callback_Data callback_data, const char* map, const char* uri); - + LV2_Feature uri_map_feature; LV2_URI_Map_Feature uri_map_feature_data; Map uri_map; diff --git a/libs/ardour/ardour/user_bundle.h b/libs/ardour/ardour/user_bundle.h index 6d197450c3..fa37392fc0 100644 --- a/libs/ardour/ardour/user_bundle.h +++ b/libs/ardour/ardour/user_bundle.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2007 Paul Davis + Copyright (C) 2007 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 @@ -36,11 +36,11 @@ class UserBundle : public Bundle, public PBD::Stateful { UserBundle (XMLNode const &, bool); XMLNode& get_state (); - + private: int set_state (XMLNode const &); }; } - + #endif diff --git a/libs/ardour/ardour/utils.h b/libs/ardour/ardour/utils.h index dc6c1b8479..e41c5f64ee 100644 --- a/libs/ardour/ardour/utils.h +++ b/libs/ardour/ardour/utils.h @@ -1,5 +1,5 @@ /* - Copyright (C) 1999 Paul Davis + Copyright (C) 1999 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 @@ -47,7 +47,7 @@ static inline float f_max(float x, float a) { x += fabsf (x); x *= 0.5f; x += a; - + return (x); } diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h index 1cb7e376e4..2d9875df57 100644 --- a/libs/ardour/ardour/vst_plugin.h +++ b/libs/ardour/ardour/vst_plugin.h @@ -1,5 +1,5 @@ /* - Copyright (C) 2004 Paul Davis + Copyright (C) 2004 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 @@ -28,7 +28,7 @@ #include <dlfcn.h> #include <sigc++/signal.h> -#include "pbd/stateful.h" +#include "pbd/stateful.h" #include <jack/types.h> #include "ardour/plugin.h" @@ -50,7 +50,7 @@ class VSTPlugin : public ARDOUR::Plugin ~VSTPlugin (); /* Plugin interface */ - + std::string unique_id() const; const char * label() const; const char * name() const; @@ -104,7 +104,7 @@ class VSTPluginInfo : public PluginInfo public: VSTPluginInfo () {} ~VSTPluginInfo () {} - + PluginPtr load (Session& session); }; |