diff options
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/legatize.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_cursor.h | 8 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_model.h | 4 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_source.h | 10 | ||||
| -rw-r--r-- | libs/ardour/ardour/note_fixer.h | 6 | ||||
| -rw-r--r-- | libs/ardour/ardour/smf_source.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/transform.h | 2 | ||||
| -rw-r--r-- | libs/ardour/ardour/transpose.h | 2 |
8 files changed, 21 insertions, 15 deletions
diff --git a/libs/ardour/ardour/legatize.h b/libs/ardour/ardour/legatize.h index 74c4d112df..bf0eee869f 100644 --- a/libs/ardour/ardour/legatize.h +++ b/libs/ardour/ardour/legatize.h @@ -42,7 +42,7 @@ public: typedef Evoral::Sequence<Temporal::Beats>::Notes Notes; Command* operator()(boost::shared_ptr<ARDOUR::MidiModel> model, - Temporal::Beats position, + Temporal::Beats position, std::vector<Notes>& seqs); std::string name () const { return (_shrink_only ? std::string ("remove overlap") : std::string ("legatize")); } diff --git a/libs/ardour/ardour/midi_cursor.h b/libs/ardour/ardour/midi_cursor.h index 6504874990..6491341447 100644 --- a/libs/ardour/ardour/midi_cursor.h +++ b/libs/ardour/ardour/midi_cursor.h @@ -24,10 +24,14 @@ #include <boost/utility.hpp> -#include "ardour/types.h" + + +#include "pbd/signals.h" + #include "temporal/beats.h" #include "evoral/Sequence.hpp" -#include "pbd/signals.h" + +#include "ardour/types.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index 81e60ecf93..e74bc26c36 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -265,8 +265,8 @@ public: bool write_section_to(boost::shared_ptr<MidiSource> source, const Glib::Threads::Mutex::Lock& source_lock, - Temporal::Beats begin = Temporal::Beats(), - Temporal::Beats end = std::numeric_limits<Temporal::Beats>::max(), + Temporal::Beats begin = Temporal::Beats(), + Temporal::Beats end = std::numeric_limits<Temporal::Beats>::max(), bool offset_events = false); // MidiModel doesn't use the normal AutomationList serialisation code diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 0bede7fe52..82e90cec67 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -62,8 +62,8 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha */ int write_to (const Lock& lock, boost::shared_ptr<MidiSource> newsrc, - Temporal::Beats begin = Temporal::Beats(), - Temporal::Beats end = std::numeric_limits<Temporal::Beats>::max()); + Temporal::Beats begin = Temporal::Beats(), + Temporal::Beats end = std::numeric_limits<Temporal::Beats>::max()); /** Export the midi data in the given time range to another MidiSource * \param newsrc MidiSource to which data will be written. Should be a @@ -75,8 +75,8 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha */ int export_write_to (const Lock& lock, boost::shared_ptr<MidiSource> newsrc, - Temporal::Beats begin, - Temporal::Beats end); + Temporal::Beats begin, + Temporal::Beats end); /** Read the data in a given time range from the MIDI source. * All time stamps in parameters are in audio samples (even if the source has tempo time). @@ -156,7 +156,7 @@ class LIBARDOUR_API MidiSource : virtual public Source, public boost::enable_sha virtual void mark_midi_streaming_write_completed ( const Lock& lock, Evoral::Sequence<Temporal::Beats>::StuckNoteOption stuck_option, - Temporal::Beats when = Temporal::Beats()); + Temporal::Beats when = Temporal::Beats()); virtual void session_saved(); diff --git a/libs/ardour/ardour/note_fixer.h b/libs/ardour/ardour/note_fixer.h index 320c92bc71..69abc39df4 100644 --- a/libs/ardour/ardour/note_fixer.h +++ b/libs/ardour/ardour/note_fixer.h @@ -24,11 +24,13 @@ #include <boost/utility.hpp> -#include "ardour/midi_model.h" -#include "ardour/types.h" #include "temporal/beats.h" + #include "evoral/Note.hpp" +#include "ardour/midi_model.h" +#include "ardour/types.h" + namespace Evoral { template<typename Time> class EventSink; } namespace ARDOUR { diff --git a/libs/ardour/ardour/smf_source.h b/libs/ardour/ardour/smf_source.h index 68dd74e1c4..88c02beed5 100644 --- a/libs/ardour/ardour/smf_source.h +++ b/libs/ardour/ardour/smf_source.h @@ -78,7 +78,7 @@ public: private: bool _open; - Temporal::Beats _last_ev_time_beats; + Temporal::Beats _last_ev_time_beats; samplepos_t _last_ev_time_samples; /** end time (start + duration) of last call to read_unlocked */ mutable samplepos_t _smf_last_read_end; diff --git a/libs/ardour/ardour/transform.h b/libs/ardour/ardour/transform.h index 89c135ab0a..7d1f9acd70 100644 --- a/libs/ardour/ardour/transform.h +++ b/libs/ardour/ardour/transform.h @@ -132,7 +132,7 @@ public: Transform(const Program& prog); Command* operator()(boost::shared_ptr<ARDOUR::MidiModel> model, - Temporal::Beats position, + Temporal::Beats position, std::vector<Notes>& seqs); std::string name() const { return std::string ("transform"); } diff --git a/libs/ardour/ardour/transpose.h b/libs/ardour/ardour/transpose.h index ad44e28de7..d87265c62d 100644 --- a/libs/ardour/ardour/transpose.h +++ b/libs/ardour/ardour/transpose.h @@ -34,7 +34,7 @@ public: Transpose (int semitones); Command* operator() (boost::shared_ptr<ARDOUR::MidiModel> model, - Temporal::Beats position, + Temporal::Beats position, std::vector<Notes>& seqs); std::string name () const { return std::string ("transpose"); } |