diff options
author | David Robillard <d@drobilla.net> | 2014-11-30 19:57:15 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-11-30 23:56:19 -0500 |
commit | 2588b1cac9a50353c65c671ee2a5efe569b96c36 (patch) | |
tree | c69d1421ca20bc0e66fff841064fc99c99c71a80 /libs | |
parent | 1693e57e0ee37c6cd74f2feadb3af6249ac6c29d (diff) |
Trim the include tree.
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/ardour/auditioner.h | 17 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_diskstream.h | 6 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_model.h | 1 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_port.h | 8 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_scene_changer.h | 2 | ||||
-rw-r--r-- | libs/ardour/ardour/scene_changer.h | 1 | ||||
-rw-r--r-- | libs/ardour/auditioner.cc | 19 | ||||
-rw-r--r-- | libs/ardour/midi_diskstream.cc | 6 | ||||
-rw-r--r-- | libs/ardour/midi_port.cc | 11 | ||||
-rw-r--r-- | libs/ardour/midi_scene_changer.cc | 1 |
10 files changed, 48 insertions, 24 deletions
diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index 452f7eb246..48d889344a 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -25,17 +25,16 @@ #include <glibmm/threads.h> #include "ardour/ardour.h" -#include "ardour/audio_track.h" -#include "ardour/midi_region.h" - -#include "ardour/audio_diskstream.h" -#include "ardour/midi_diskstream.h" +#include "ardour/track.h" namespace ARDOUR { class Session; +class AudioDiskstream; class AudioRegion; class AudioPlaylist; +class MidiDiskstream; +class MidiRegion; class LIBARDOUR_API Auditioner : public Track { @@ -103,12 +102,8 @@ class LIBARDOUR_API Auditioner : public Track boost::shared_ptr<Diskstream> diskstream_factory (XMLNode const &) { return boost::shared_ptr<Diskstream> (); } - boost::shared_ptr<AudioDiskstream> audio_diskstream() const - { return boost::dynamic_pointer_cast<AudioDiskstream> (_diskstream); } - - boost::shared_ptr<MidiDiskstream> midi_diskstream() const - { return boost::dynamic_pointer_cast<MidiDiskstream> (_diskstream); } - + boost::shared_ptr<AudioDiskstream> audio_diskstream() const; + boost::shared_ptr<MidiDiskstream> midi_diskstream() const; private: boost::shared_ptr<AudioRegion> the_region; diff --git a/libs/ardour/ardour/midi_diskstream.h b/libs/ardour/ardour/midi_diskstream.h index e8cc370289..fea758d622 100644 --- a/libs/ardour/ardour/midi_diskstream.h +++ b/libs/ardour/ardour/midi_diskstream.h @@ -37,7 +37,6 @@ #include "ardour/ardour.h" #include "ardour/diskstream.h" #include "ardour/midi_buffer.h" -#include "ardour/midi_playlist.h" #include "ardour/utils.h" struct tm; @@ -46,6 +45,7 @@ namespace ARDOUR { class IO; class MidiEngine; +class MidiPlaylist; class MidiPort; class MidiRingbuffer; class MidiSource; @@ -53,6 +53,8 @@ class SMFSource; class Send; class Session; +template<typename T> class MidiRingBuffer; + class LIBARDOUR_API MidiDiskstream : public Diskstream { public: @@ -70,7 +72,7 @@ class LIBARDOUR_API MidiDiskstream : public Diskstream void reset_tracker (); - boost::shared_ptr<MidiPlaylist> midi_playlist () { return boost::dynamic_pointer_cast<MidiPlaylist>(_playlist); } + boost::shared_ptr<MidiPlaylist> midi_playlist (); int use_playlist (boost::shared_ptr<Playlist>); int use_new_playlist (); diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index b5dc173464..4d12839625 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -29,7 +29,6 @@ #include "pbd/command.h" #include "ardour/libardour_visibility.h" #include "ardour/types.h" -#include "ardour/midi_buffer.h" #include "ardour/automatable_sequence.h" #include "ardour/libardour_visibility.h" #include "ardour/types.h" diff --git a/libs/ardour/ardour/midi_port.h b/libs/ardour/ardour/midi_port.h index debe29877a..f98fa803ae 100644 --- a/libs/ardour/ardour/midi_port.h +++ b/libs/ardour/ardour/midi_port.h @@ -24,10 +24,10 @@ #include "midi++/parser.h" #include "ardour/port.h" -#include "ardour/midi_buffer.h" namespace ARDOUR { +class MidiBuffer; class MidiEngine; class LIBARDOUR_API MidiPort : public Port { @@ -51,9 +51,7 @@ class LIBARDOUR_API MidiPort : public Port { bool input_active() const { return _input_active; } void set_input_active (bool yn); - Buffer& get_buffer (pframes_t nframes) { - return get_midi_buffer (nframes); - } + Buffer& get_buffer (pframes_t nframes); MidiBuffer& get_midi_buffer (pframes_t nframes); @@ -85,7 +83,7 @@ class LIBARDOUR_API MidiPort : public Port { MIDI::Parser _self_parser; - void resolve_notes (void* buffer, MidiBuffer::TimeType when); + void resolve_notes (void* buffer, framepos_t when); }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/midi_scene_changer.h b/libs/ardour/ardour/midi_scene_changer.h index 81a5eb07f0..e336eb8754 100644 --- a/libs/ardour/ardour/midi_scene_changer.h +++ b/libs/ardour/ardour/midi_scene_changer.h @@ -27,6 +27,8 @@ namespace ARDOUR { +class MIDISceneChange; + class MIDISceneChanger : public SceneChanger { public: diff --git a/libs/ardour/ardour/scene_changer.h b/libs/ardour/ardour/scene_changer.h index e171a23094..d606dd13db 100644 --- a/libs/ardour/ardour/scene_changer.h +++ b/libs/ardour/ardour/scene_changer.h @@ -25,7 +25,6 @@ #include "pbd/signals.h" #include "ardour/location.h" -#include "ardour/midi_scene_change.h" #include "ardour/session_handle.h" #include "ardour/types.h" diff --git a/libs/ardour/auditioner.cc b/libs/ardour/auditioner.cc index e9d5eda02a..96304b0b3b 100644 --- a/libs/ardour/auditioner.cc +++ b/libs/ardour/auditioner.cc @@ -22,13 +22,16 @@ #include "pbd/error.h" #include "ardour/amp.h" -#include "ardour/audioregion.h" +#include "ardour/audio_diskstream.h" +#include "ardour/audio_port.h" #include "ardour/audioengine.h" #include "ardour/audioplaylist.h" +#include "ardour/audioregion.h" #include "ardour/auditioner.h" -#include "ardour/audio_port.h" #include "ardour/data_type.h" #include "ardour/delivery.h" +#include "ardour/midi_diskstream.h" +#include "ardour/midi_region.h" #include "ardour/plugin.h" #include "ardour/plugin_insert.h" #include "ardour/region_factory.h" @@ -604,3 +607,15 @@ Auditioner::monitoring_state () const { return MonitoringDisk; } + +boost::shared_ptr<AudioDiskstream> +Auditioner::audio_diskstream() const +{ + return boost::dynamic_pointer_cast<AudioDiskstream> (_diskstream); +} + +boost::shared_ptr<MidiDiskstream> +Auditioner::midi_diskstream() const +{ + return boost::dynamic_pointer_cast<MidiDiskstream> (_diskstream); +} diff --git a/libs/ardour/midi_diskstream.cc b/libs/ardour/midi_diskstream.cc index 648c67886d..9bc01b9bd4 100644 --- a/libs/ardour/midi_diskstream.cc +++ b/libs/ardour/midi_diskstream.cc @@ -1487,3 +1487,9 @@ MidiDiskstream::reset_tracker () mp->clear_note_trackers (); } } + +boost::shared_ptr<MidiPlaylist> +MidiDiskstream::midi_playlist () +{ + return boost::dynamic_pointer_cast<MidiPlaylist>(_playlist); +} diff --git a/libs/ardour/midi_port.cc b/libs/ardour/midi_port.cc index b34ebb5187..8dcf4d42fc 100644 --- a/libs/ardour/midi_port.cc +++ b/libs/ardour/midi_port.cc @@ -22,10 +22,11 @@ #include "pbd/compose.h" #include "pbd/debug.h" -#include "ardour/midi_port.h" -#include "ardour/data_type.h" #include "ardour/audioengine.h" +#include "ardour/data_type.h" #include "ardour/debug.h" +#include "ardour/midi_buffer.h" +#include "ardour/midi_port.h" using namespace std; using namespace ARDOUR; @@ -80,6 +81,12 @@ MidiPort::cycle_start (pframes_t nframes) } } +Buffer& +MidiPort::get_buffer (pframes_t nframes) +{ + return get_midi_buffer (nframes); +} + MidiBuffer & MidiPort::get_midi_buffer (pframes_t nframes) { diff --git a/libs/ardour/midi_scene_changer.cc b/libs/ardour/midi_scene_changer.cc index 285a370402..c5ea29784b 100644 --- a/libs/ardour/midi_scene_changer.cc +++ b/libs/ardour/midi_scene_changer.cc @@ -24,6 +24,7 @@ #include "ardour/async_midi_port.h" #include "ardour/event_type_map.h" +#include "ardour/midi_buffer.h" #include "ardour/midi_port.h" #include "ardour/midi_scene_change.h" #include "ardour/midi_scene_changer.h" |