pulling trunk

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

diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h
index 37167e6a9af5bc6067eca07fda398d94b33a7ad0..5d11c9ef095e6be2599dd40abd88cca875205c63 100644 (file)
--- a/libs/ardour/ardour/sndfilesource.h
+++ b/libs/ardour/ardour/sndfilesource.h
@@ -33,9 +33,9 @@ class SndFileSource : public ExternalSource {
        SndFileSource (const XMLNode&);
        ~SndFileSource ();
 
-    jack_nframes_t length() const { return _info.frames; } 
-
+       jack_nframes_t length() const { return _info.frames; } 
        jack_nframes_t read (Sample *dst, jack_nframes_t start, jack_nframes_t cnt, char * workbuf) const;
+       float sample_rate () const;
 
   private:
        SNDFILE *sf;
@@ -43,7 +43,7 @@ class SndFileSource : public ExternalSource {
 
        mutable float *tmpbuf;
        mutable jack_nframes_t tmpbufsize;
-       mutable PBD::Lock _tmpbuf_lock;
+       mutable Glib::Mutex _tmpbuf_lock;
 
        void init (const string &str, bool build_peak);
 };