diff options
author | David Robillard <d@drobilla.net> | 2010-12-20 22:51:17 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2010-12-20 22:51:17 +0000 |
commit | f6ed36a457aace0c4f0c542014d8a3fc65c7a852 (patch) | |
tree | 5213d42a3f6258e631ba744449b2706eec088711 /libs/ardour/ardour | |
parent | 7e3404e2a0174d5b7b208695e57f230a174c1379 (diff) |
Fix more broken whitespace.
git-svn-id: svn://localhost/ardour2/branches/3.0@8314 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/beats_frames_converter.h | 10 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_region.h | 44 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_source.h | 3 |
3 files changed, 29 insertions, 28 deletions
diff --git a/libs/ardour/ardour/beats_frames_converter.h b/libs/ardour/ardour/beats_frames_converter.h index 286c4aaa6a..46d6f03501 100644 --- a/libs/ardour/ardour/beats_frames_converter.h +++ b/libs/ardour/ardour/beats_frames_converter.h @@ -35,12 +35,12 @@ class TempoMap; */ class BeatsFramesConverter : public Evoral::TimeConverter<double,framepos_t> { public: - BeatsFramesConverter (const TempoMap& tempo_map, framepos_t origin) - : Evoral::TimeConverter<double, framepos_t> (origin) - , _tempo_map(tempo_map) - {} + BeatsFramesConverter (const TempoMap& tempo_map, framepos_t origin) + : Evoral::TimeConverter<double, framepos_t> (origin) + , _tempo_map(tempo_map) + {} - framepos_t to (double beats) const; + framepos_t to (double beats) const; double from (framepos_t frames) const; private: diff --git a/libs/ardour/ardour/midi_region.h b/libs/ardour/ardour/midi_region.h index 650c7c9b2e..f5886698d5 100644 --- a/libs/ardour/ardour/midi_region.h +++ b/libs/ardour/ardour/midi_region.h @@ -62,7 +62,7 @@ class MidiRegion : public Region ~MidiRegion(); - boost::shared_ptr<MidiRegion> clone (); + boost::shared_ptr<MidiRegion> clone (); boost::shared_ptr<MidiSource> midi_source (uint32_t n=0) const; @@ -71,17 +71,17 @@ class MidiRegion : public Region virtual framecnt_t readable_length() const { return length(); } framecnt_t read_at (Evoral::EventSink<framepos_t>& dst, - framepos_t position, - framecnt_t dur, - uint32_t chan_n = 0, - NoteMode mode = Sustained, - MidiStateTracker* tracker = 0) const; + framepos_t position, + framecnt_t dur, + uint32_t chan_n = 0, + NoteMode mode = Sustained, + MidiStateTracker* tracker = 0) const; framepos_t master_read_at (MidiRingBuffer<framepos_t>& dst, - framepos_t position, - framecnt_t dur, - uint32_t chan_n = 0, - NoteMode mode = Sustained) const; + framepos_t position, + framecnt_t dur, + uint32_t chan_n = 0, + NoteMode mode = Sustained) const; XMLNode& state (); int set_state (const XMLNode&, int version); @@ -117,38 +117,38 @@ class MidiRegion : public Region private: friend class RegionFactory; - PBD::Property<Evoral::MusicalTime> _length_beats; + PBD::Property<Evoral::MusicalTime> _length_beats; MidiRegion (const SourceList&); MidiRegion (boost::shared_ptr<const MidiRegion>, frameoffset_t offset = 0, bool offset_relative = true); framecnt_t _read_at (const SourceList&, Evoral::EventSink<framepos_t>& dst, - framepos_t position, - framecnt_t dur, - uint32_t chan_n = 0, - NoteMode mode = Sustained, - MidiStateTracker* tracker = 0) const; + framepos_t position, + framecnt_t dur, + uint32_t chan_n = 0, + NoteMode mode = Sustained, + MidiStateTracker* tracker = 0) const; void register_properties (); - void post_set (const PBD::PropertyChange&); + void post_set (const PBD::PropertyChange&); void recompute_at_start (); void recompute_at_end (); void set_position_internal (framepos_t pos, bool allow_bbt_recompute); - void set_length_internal (framecnt_t len); - void update_length_beats (); + void set_length_internal (framecnt_t len); + void update_length_beats (); void model_changed (); void model_automation_state_changed (Evoral::Parameter const &); - void model_contents_changed (); + void model_contents_changed (); std::set<Evoral::Parameter> _filtered_parameters; ///< parameters that we ask our source not to return when reading PBD::ScopedConnection _model_connection; PBD::ScopedConnection _source_connection; - PBD::ScopedConnection _model_contents_connection; + PBD::ScopedConnection _model_contents_connection; - double _last_length_beats; + double _last_length_beats; }; } /* namespace ARDOUR */ diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 33a0c3c1fa..f13b71e0f1 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -96,6 +96,7 @@ class MidiSource : virtual public Source, public boost::enable_shared_from_this< int set_state (const XMLNode&, int version); bool length_mutable() const { return true; } + double length_beats() const { return _length_beats; } virtual void load_model(bool lock=true, bool force_reload=false) = 0; virtual void destroy_model() = 0; @@ -150,7 +151,7 @@ class MidiSource : virtual public Source, public boost::enable_shared_from_this< mutable Evoral::Sequence<Evoral::MusicalTime>::const_iterator _model_iter; mutable bool _model_iter_valid; - mutable double _length_beats; + mutable double _length_beats; mutable framepos_t _last_read_end; framepos_t _last_write_end; |