diff options
author | David Robillard <d@drobilla.net> | 2009-02-19 01:56:58 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2009-02-19 01:56:58 +0000 |
commit | 8f572c3d3f79a86e6b86ccb71f9bee772e6fe738 (patch) | |
tree | 7f397cfa1d0dc0e1d009f96e1d3699d7481999c1 /libs/ardour/ardour | |
parent | 067faeca624577faa20718eb1bc4ef40fb768c2a (diff) |
Readable is not as generic as its name implies ;)
git-svn-id: svn://localhost/ardour2/branches/3.0@4634 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r-- | libs/ardour/ardour/audiosource.h | 4 | ||||
-rw-r--r-- | libs/ardour/ardour/midi_source.h | 6 | ||||
-rw-r--r-- | libs/ardour/ardour/source.h | 2 |
3 files changed, 4 insertions, 8 deletions
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index eff21b898c..740d9bc7c4 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -43,7 +43,9 @@ using std::vector; namespace ARDOUR { -class AudioSource : virtual public Source, public boost::enable_shared_from_this<ARDOUR::AudioSource> +class AudioSource : virtual public Source, + public ARDOUR::Readable, + public boost::enable_shared_from_this<ARDOUR::AudioSource> { public: AudioSource (Session&, Glib::ustring name); diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index b17f78b912..774b3ab372 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -47,12 +47,6 @@ class MidiSource : virtual public Source MidiSource (Session& session, const XMLNode&); virtual ~MidiSource (); - /* Stub Readable interface */ - virtual nframes64_t read (Sample*, nframes64_t pos, nframes64_t cnt, int channel) const { return 0; } - virtual nframes64_t readable_length() const { return length(); } - virtual uint32_t n_channels () const { return 1; } - - // FIXME: integrate this with the Readable::read interface somehow virtual nframes_t midi_read (MidiRingBuffer<nframes_t>& dst, nframes_t start, nframes_t cnt, nframes_t stamp_offset, nframes_t negative_stamp_offset) const; virtual nframes_t midi_write (MidiRingBuffer<nframes_t>& src, nframes_t cnt); diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index d89c33c749..a388c8db3a 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -38,7 +38,7 @@ namespace ARDOUR { class Session; class Playlist; -class Source : public SessionObject, public ARDOUR::Readable, public boost::noncopyable +class Source : public SessionObject, public boost::noncopyable { public: enum Flag { |