summaryrefslogtreecommitdiff
path: root/libs/ardour/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour/ardour')
-rw-r--r--libs/ardour/ardour/audio_playlist_source.h3
-rw-r--r--libs/ardour/ardour/midi_playlist_source.h3
-rw-r--r--libs/ardour/ardour/playlist_source.h1
3 files changed, 3 insertions, 4 deletions
diff --git a/libs/ardour/ardour/audio_playlist_source.h b/libs/ardour/ardour/audio_playlist_source.h
index 273651b7d1..42359414e9 100644
--- a/libs/ardour/ardour/audio_playlist_source.h
+++ b/libs/ardour/ardour/audio_playlist_source.h
@@ -32,7 +32,7 @@ namespace ARDOUR {
class AudioPlaylist;
-class AudioPlaylistSource : public AudioSource, public PlaylistSource {
+class AudioPlaylistSource : public PlaylistSource, public AudioSource {
public:
virtual ~AudioPlaylistSource ();
@@ -59,6 +59,7 @@ class AudioPlaylistSource : public AudioSource, public PlaylistSource {
AudioPlaylistSource (Session&, const PBD::ID& orig, const std::string& name, boost::shared_ptr<AudioPlaylist>, uint32_t chn,
frameoffset_t begin, framecnt_t len, Source::Flag flags);
AudioPlaylistSource (Session&, const XMLNode&);
+
private:
uint32_t _playlist_channel;
diff --git a/libs/ardour/ardour/midi_playlist_source.h b/libs/ardour/ardour/midi_playlist_source.h
index 85f7a960ad..1042b61369 100644
--- a/libs/ardour/ardour/midi_playlist_source.h
+++ b/libs/ardour/ardour/midi_playlist_source.h
@@ -50,8 +50,6 @@ class MidiPlaylistSource : public MidiSource, public PlaylistSource {
void load_model(bool lock=true, bool force_reload=false);
void destroy_model();
- static void ensure_buffers_for_level (uint32_t);
-
protected:
friend class SourceFactory;
@@ -70,6 +68,7 @@ class MidiPlaylistSource : public MidiSource, public PlaylistSource {
framepos_t write_unlocked (MidiRingBuffer<framepos_t>& dst,
framepos_t position,
framecnt_t cnt);
+
private:
int set_state (const XMLNode&, int version, bool with_descendants);
framecnt_t _length;
diff --git a/libs/ardour/ardour/playlist_source.h b/libs/ardour/ardour/playlist_source.h
index b41569cbdd..b4ff2fa413 100644
--- a/libs/ardour/ardour/playlist_source.h
+++ b/libs/ardour/ardour/playlist_source.h
@@ -50,7 +50,6 @@ class PlaylistSource : virtual public Source {
PlaylistSource (Session&, const XMLNode&);
void add_state (XMLNode&);
-
};
} /* namespace */