diff options
| author | David Robillard <d@drobilla.net> | 2009-02-17 02:11:49 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2009-02-17 02:11:49 +0000 |
| commit | 022818b4a796f52c0a91eea42e65aec0bc7bed43 (patch) | |
| tree | f82bde33d44c7b3e16af7e837536665e17fe0189 /libs/ardour/ardour/audiosource.h | |
| parent | 4565b73a3993b0cb5ccb9170e276180f2b5c1372 (diff) | |
Fix the horrible mess that was anything related to sources and paths.
Most significant changes:
- Factor out FileSource from AudioFileSource, use for SMFSource too
- Explicitly pass embedded rather than mysterious name mangling or whatever
- Destroy a ton of duplicated or very-nearly-duplicated code
- Clean up and document all that weird source stuff in session.cc
git-svn-id: svn://localhost/ardour2/branches/3.0@4609 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/audiosource.h')
| -rw-r--r-- | libs/ardour/ardour/audiosource.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index 43273301b1..eff21b898c 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -43,7 +43,7 @@ using std::vector; namespace ARDOUR { -class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR::AudioSource> +class AudioSource : virtual public Source, public boost::enable_shared_from_this<ARDOUR::AudioSource> { public: AudioSource (Session&, Glib::ustring name); @@ -68,7 +68,6 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR: virtual float sample_rate () const = 0; - virtual void mark_for_remove() = 0; virtual void mark_streaming_write_completed () {} virtual bool can_truncate_peaks() const { return true; } @@ -116,7 +115,6 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR: static bool _build_peakfiles; bool _peaks_built; - mutable Glib::Mutex _lock; mutable Glib::Mutex _peaks_ready_lock; Glib::ustring peakpath; Glib::ustring _captured_for; @@ -138,8 +136,6 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR: virtual Glib::ustring find_broken_peakfile (Glib::ustring missing_peak_path, Glib::ustring audio_path) = 0; - void update_length (nframes_t pos, nframes_t cnt); - virtual int read_peaks_with_fpp (PeakData *peaks, nframes_t npeaks, nframes_t start, nframes_t cnt, double samples_per_visual_peak, nframes_t fpp) const; |