diff options
| author | David Robillard <d@drobilla.net> | 2008-05-21 18:07:31 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2008-05-21 18:07:31 +0000 |
| commit | 96384d65a67648fcbf617d2cea1fdd47b907c112 (patch) | |
| tree | c9580da1bd5956b1ce37308ee0470eb5f4bbaf05 /libs/ardour/ardour | |
| parent | 23c6936f433bfd07437b157eda4f36210819f2cf (diff) | |
More petty clean ups of MIDI stuff.
Use more complete header I had laying around for MIDI controller names / depollute Automatable.
git-svn-id: svn://localhost/ardour2/branches/3.0@3378 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
| -rw-r--r-- | libs/ardour/ardour/automatable.h | 1 | ||||
| -rw-r--r-- | libs/ardour/ardour/midi_ring_buffer.h | 3 | ||||
| -rw-r--r-- | libs/ardour/ardour/smf_reader.h | 2 |
3 files changed, 1 insertions, 5 deletions
diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h index 5efa4f7b8d..a2c1d98ae7 100644 --- a/libs/ardour/ardour/automatable.h +++ b/libs/ardour/ardour/automatable.h @@ -66,7 +66,6 @@ public: virtual bool find_next_event(nframes_t start, nframes_t end, ControlEvent& ev) const; virtual string describe_parameter(Parameter param); - static string get_name_for_cc_number (uint32_t cc_number); virtual float default_parameter_value(Parameter param) { return 1.0f; } virtual void clear_automation(); diff --git a/libs/ardour/ardour/midi_ring_buffer.h b/libs/ardour/ardour/midi_ring_buffer.h index 76cefd57a1..2a1d771792 100644 --- a/libs/ardour/ardour/midi_ring_buffer.h +++ b/libs/ardour/ardour/midi_ring_buffer.h @@ -172,7 +172,7 @@ MidiRingBufferBase<T>::read(size_t size, T* dst) : _size - priv_read_ptr; memcpy(dst, &_buf[priv_read_ptr], read_size); - + g_atomic_int_set(&_read_ptr, (priv_read_ptr + read_size) % _size); return read_size; @@ -213,7 +213,6 @@ MidiRingBufferBase<T>::skip(size_t size) } - template<typename T> inline void MidiRingBufferBase<T>::write(size_t size, const T* src) diff --git a/libs/ardour/ardour/smf_reader.h b/libs/ardour/ardour/smf_reader.h index a96ef6bf7f..e41dcc3bc4 100644 --- a/libs/ardour/ardour/smf_reader.h +++ b/libs/ardour/ardour/smf_reader.h @@ -53,7 +53,6 @@ public: const std::string& filename() const { return _filename; }; - //TimeUnit unit() const { return _unit; } uint16_t type() const { return _type; } uint16_t ppqn() const { return _ppqn; } uint16_t num_tracks() const { return _num_tracks; } @@ -74,7 +73,6 @@ protected: std::string _filename; FILE* _fd; - //TimeUnit _unit; uint16_t _type; uint16_t _ppqn; uint16_t _num_tracks; |