Fix uninitialised variable and remove bind of shared_ptr to a slot.

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

diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index d11b8296948436341048a4477af9cbcb7681eb1b..328a23ac19a8ca19eb077e66a302523945aeef67 100644 (file)
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000 Paul Davis 
+    Copyright (C) 2000 Paul Davis
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -20,9 +20,6 @@
 #ifndef __ardour_audio_source_h__
 #define __ardour_audio_source_h__
 
-#include <list>
-#include <vector>
-
 #include <boost/shared_ptr.hpp>
 #include <boost/enable_shared_from_this.hpp>
 
@@ -33,17 +30,16 @@
 
 #include <sigc++/signal.h>
 
-#include <ardour/source.h>
-#include <ardour/ardour.h>
-#include <pbd/stateful.h> 
-#include <pbd/xml++.h>
-
-using std::list;
-using std::vector;
+#include "ardour/source.h"
+#include "ardour/ardour.h"
+#include "pbd/stateful.h"
+#include "pbd/xml++.h"
 
 namespace ARDOUR {
 
-class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR::AudioSource>
+class AudioSource : virtual public Source,
+               public ARDOUR::Readable,
+               public boost::enable_shared_from_this<ARDOUR::AudioSource>
 {
   public:
        AudioSource (Session&, Glib::ustring name);
@@ -51,25 +47,18 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
        virtual ~AudioSource ();
 
        nframes64_t readable_length() const { return _length; }
-       uint32_t    n_channels() const { return 1; }
-
-       virtual nframes_t available_peaks (double zoom) const;
+       uint32_t    n_channels()      const { return 1; }
 
-       /* stopgap until nframes_t becomes nframes64_t. this function is needed by the Readable interface */
+       sframes_t length (sframes_t pos) const;
+       void      update_length (sframes_t pos, sframes_t cnt);
 
-       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 available_peaks (double zoom) const;
 
-       virtual nframes_t read (Sample *dst, nframes_t start, nframes_t cnt) const;
+       virtual nframes_t read (Sample *dst, sframes_t start, nframes_t cnt, int channel=0) const;
        virtual nframes_t write (Sample *src, nframes_t cnt);
 
        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; }
@@ -80,16 +69,17 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
        uint32_t read_data_count() const { return _read_data_count; }
        uint32_t write_data_count() const { return _write_data_count; }
 
-       int read_peaks (PeakData *peaks, nframes_t npeaks, nframes_t start, nframes_t cnt, double samples_per_visual_peak) const;
+       int read_peaks (PeakData *peaks, nframes_t npeaks,
+                       sframes_t start, nframes_t cnt, double samples_per_visual_peak) const;
 
-       int  build_peaks ();
+       int  build_peaks ();
        bool peaks_ready (sigc::slot<void>, sigc::connection&) const;
 
        mutable sigc::signal<void>  PeaksReady;
        mutable sigc::signal<void,nframes_t,nframes_t>  PeakRangeReady;
-       
+
        XMLNode& get_state ();
-       int set_state (const XMLNode&);
+       int set_state (const XMLNode&, int version);
 
        int rename_peakfile (Glib::ustring newpath);
        void touch_peakfile ();
@@ -115,8 +105,8 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
        static bool _build_missing_peakfiles;
        static bool _build_peakfiles;
 
+       sframes_t            _length;
        bool                 _peaks_built;
-       mutable Glib::Mutex  _lock;
        mutable Glib::Mutex  _peaks_ready_lock;
        Glib::ustring         peakpath;
        Glib::ustring        _captured_for;
@@ -126,32 +116,31 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
 
        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, bool intermediate_peaks_ready_signal);
+       int compute_and_write_peaks (Sample* buf, sframes_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 read_unlocked (Sample *dst, sframes_t start, nframes_t cnt) const = 0;
        virtual nframes_t write_unlocked (Sample *dst, nframes_t cnt) = 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 Glib::ustring find_broken_peakfile (Glib::ustring missing_peak_path,
+                                                   Glib::ustring audio_path) = 0;
 
-       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;
+       virtual int read_peaks_with_fpp (PeakData *peaks,
+       nframes_t npeaks, sframes_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);  
+       int compute_and_write_peaks (Sample* buf, sframes_t first_frame, nframes_t cnt,
+       bool force, bool intermediate_peaks_ready_signal, nframes_t frames_per_peak);
 
   private:
-       int peakfile;
+       int       peakfile;
        nframes_t peak_leftover_cnt;
        nframes_t peak_leftover_size;
-       Sample* peak_leftovers;
+       Sample*   peak_leftovers;
        nframes_t peak_leftover_frame;
-
-       bool file_changed (Glib::ustring path);
 };
 
 }