Revert afedd2 and associated commits (method to generate initial tag file)

[ardour.git] / libs / ardour / ardour / audio_playlist_source.h

diff --git a/libs/ardour/ardour/audio_playlist_source.h b/libs/ardour/ardour/audio_playlist_source.h
index 6a586fc30df35be835d5796d1591bc51c1adc4a5..4a1f5953dced8f003a0f60e81e85d59527e950b1 100644 (file)
--- a/libs/ardour/ardour/audio_playlist_source.h
+++ b/libs/ardour/ardour/audio_playlist_source.h
@@ -37,12 +37,12 @@ public:
        virtual ~AudioPlaylistSource ();
 
        bool empty() const;
-       std::string peak_path (std::string audio_path);
+       std::string construct_peak_filepath (const std::string& audio_path, const bool in_session = false, const bool old_peak_name = false) const;
        uint32_t   n_channels() const;
        bool clamped_at_unity () const { return false; }
 
-       framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const;
-       framecnt_t write_unlocked (Sample *src, framecnt_t cnt);
+       samplecnt_t read_unlocked (Sample *dst, samplepos_t start, samplecnt_t cnt) const;
+       samplecnt_t write_unlocked (Sample *src, samplecnt_t cnt);
 
        float sample_rate () const;
        int setup_peakfile ();
@@ -57,7 +57,7 @@ protected:
        friend class SourceFactory;
 
        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);
+                            sampleoffset_t begin, samplecnt_t len, Source::Flag flags);
        AudioPlaylistSource (Session&, const XMLNode&);