Readable is not as generic as its name implies ;)

git-svn-id: svn://localhost/ardour2/branches/3.0@4634 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2009-02-19 01:56:58 +00:00
parent 067faeca62
commit 8f572c3d3f
3 changed files with 4 additions and 8 deletions

View file

@ -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);

View file

@ -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);

View file

@ -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 {