Improved ExportProfileManager error handling, and added some missing (?) initialization

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

diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index 93708a5b07b5dc2561ad4c38e7cfce477b4a5770..d11b8296948436341048a4477af9cbcb7681eb1b 100644 (file)
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -50,10 +50,20 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
        AudioSource (Session&, const XMLNode&);
        virtual ~AudioSource ();
 
-       /* returns the number of items in this `audio_source' */
+       nframes64_t readable_length() const { return _length; }
+       uint32_t    n_channels() const { return 1; }
 
        virtual nframes_t available_peaks (double zoom) const;
 
+       /* stopgap until nframes_t becomes nframes64_t. this function is needed by the Readable interface */
+
+       virtual nframes64_t read (Sample *dst, nframes64_t start, nframes64_t cnt, int channel) const {
+               /* XXX currently ignores channel, assuming that source is always mono, which
+                  historically has been true.
+               */
+               return read (dst, (nframes_t) start, (nframes_t) cnt);
+       }
+
        virtual nframes_t read (Sample *dst, nframes_t start, nframes_t cnt) const;
        virtual nframes_t write (Sample *src, nframes_t cnt);
 
@@ -132,7 +142,7 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
                                         double samples_per_visual_peak, nframes_t fpp) const;
 
        int compute_and_write_peaks (Sample* buf, nframes_t first_frame, nframes_t cnt, bool force, 
-                                    bool intermediate_peaks_ready_signal, nframes_t frames_per_peak);
+                                    bool intermediate_peaks_ready_signal, nframes_t frames_per_peak);  
 
   private:
        int peakfile;