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 b1062c43a9e300e70166e6cf1c3597b0e1a29f71..d11b8296948436341048a4477af9cbcb7681eb1b 100644 (file)
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -40,33 +40,29 @@
 
 using std::list;
 using std::vector;
-using Glib::ustring;
 
 namespace ARDOUR {
 
-const nframes_t frames_per_peak = 256;
-
- class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR::AudioSource>
+class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR::AudioSource>
 {
   public:
-       AudioSource (Session&, ustring name);
+       AudioSource (Session&, Glib::ustring name);
        AudioSource (Session&, const XMLNode&);
        virtual ~AudioSource ();
 
-       /* one could argue that this should belong to Source, but other data types
-          generally do not come with a model of "offset along an audio timeline"
-          so its here in AudioSource for now.
-       */
+       nframes64_t readable_length() const { return _length; }
+       uint32_t    n_channels() const { return 1; }
 
-       virtual nframes_t natural_position() const { return 0; }
-       
-       /* returns the number of items in this `audio_source' */
+       virtual nframes_t available_peaks (double zoom) const;
 
-       virtual nframes_t length() const {
-               return _length;
-       }
+       /* stopgap until nframes_t becomes nframes64_t. this function is needed by the Readable interface */
 
-       virtual nframes_t available_peaks (double zoom) const;
+       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);
@@ -78,13 +74,14 @@ const nframes_t frames_per_peak = 256;
 
        virtual bool can_truncate_peaks() const { return true; }
 
-       void set_captured_for (ustring str) { _captured_for = str; }
-       ustring captured_for() const { return _captured_for; }
+       void set_captured_for (Glib::ustring str) { _captured_for = str; }
+       Glib::ustring captured_for() const { return _captured_for; }
 
        uint32_t read_data_count() const { return _read_data_count; }
        uint32_t write_data_count() const { return _write_data_count; }
 
-       virtual int read_peaks (PeakData *peaks, nframes_t npeaks, nframes_t start, nframes_t cnt, double samples_per_unit) const;
+       int read_peaks (PeakData *peaks, nframes_t npeaks, nframes_t start, nframes_t cnt, double samples_per_visual_peak) const;
+
        int  build_peaks ();
        bool peaks_ready (sigc::slot<void>, sigc::connection&) const;
 
@@ -94,7 +91,7 @@ const nframes_t frames_per_peak = 256;
        XMLNode& get_state ();
        int set_state (const XMLNode&);
 
-       int rename_peakfile (ustring newpath);
+       int rename_peakfile (Glib::ustring newpath);
        void touch_peakfile ();
 
        static void set_build_missing_peakfiles (bool yn) {
@@ -105,38 +102,48 @@ const nframes_t frames_per_peak = 256;
                _build_peakfiles = yn;
        }
 
+       static bool get_build_peakfiles () {
+               return _build_peakfiles;
+       }
+
        virtual int setup_peakfile () { return 0; }
 
        int prepare_for_peakfile_writes ();
-       void done_with_peakfile_writes ();
+       void done_with_peakfile_writes (bool done = true);
 
   protected:
        static bool _build_missing_peakfiles;
        static bool _build_peakfiles;
 
-       bool                _peaks_built;
-       mutable Glib::Mutex _lock;
-       nframes_t           _length;
-       ustring               peakpath;
-       ustring              _captured_for;
+       bool                 _peaks_built;
+       mutable Glib::Mutex  _lock;
+       mutable Glib::Mutex  _peaks_ready_lock;
+       Glib::ustring         peakpath;
+       Glib::ustring        _captured_for;
 
        mutable uint32_t _read_data_count;  // modified in read()
        mutable uint32_t _write_data_count; // modified in write()
 
-       int initialize_peakfile (bool newfile, ustring path);
+       int initialize_peakfile (bool newfile, Glib::ustring path);
        int build_peaks_from_scratch ();
-       int compute_and_write_peaks (Sample* buf, nframes_t first_frame, nframes_t cnt, bool force);
+       int compute_and_write_peaks (Sample* buf, nframes_t first_frame, nframes_t cnt, bool force, bool intermediate_peaks_ready_signal);
        void truncate_peakfile();
 
        mutable off_t _peak_byte_max; // modified in compute_and_write_peak()
 
        virtual nframes_t read_unlocked (Sample *dst, nframes_t start, nframes_t cnt) const = 0;
        virtual nframes_t write_unlocked (Sample *dst, nframes_t cnt) = 0;
-       virtual ustring peak_path(ustring audio_path) = 0;
-       virtual ustring old_peak_path(ustring audio_path) = 0;
+       virtual Glib::ustring peak_path(Glib::ustring audio_path) = 0;
+       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;
+
+       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);  
+
   private:
        int peakfile;
        nframes_t peak_leftover_cnt;
@@ -144,7 +151,7 @@ const nframes_t frames_per_peak = 256;
        Sample* peak_leftovers;
        nframes_t peak_leftover_frame;
 
-       bool file_changed (ustring path);
+       bool file_changed (Glib::ustring path);
 };
 
 }