X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Faudiosource.h;h=08c879d92646ee8a60492f26ed845cbfe8a67503;hb=90172686b92b53cc5ab1d60c0e6daecb65d17d3d;hp=d11b8296948436341048a4477af9cbcb7681eb1b;hpb=859e9106e72a7908fa093d946111d148223225a0;p=ardour.git

diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index d11b829694..08c879d926 100644
--- 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,78 +20,70 @@
 #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>
 
 #include <time.h>
 
 #include <glibmm/thread.h>
-#include <glibmm/ustring.h>
-
-#include <sigc++/signal.h>
+#include <boost/function.hpp>
 
-#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 "ardour/readable.h"
+#include "pbd/file_manager.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);
+	AudioSource (Session&, std::string name);
 	AudioSource (Session&, const XMLNode&);
 	virtual ~AudioSource ();
 
-	nframes64_t readable_length() const { return _length; }
-	uint32_t    n_channels() const { return 1; }
+	framecnt_t readable_length() const { return _length; }
+	uint32_t   n_channels()      const { return 1; }
 
-	virtual nframes_t available_peaks (double zoom) const;
+        bool       empty() const;
+	framecnt_t length (framepos_t pos) const;
+	void      update_length (framepos_t pos, framecnt_t cnt);
 
-	/* stopgap until nframes_t becomes nframes64_t. this function is needed by the Readable interface */
+	virtual framecnt_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);
+	virtual framecnt_t read (Sample *dst, framepos_t start, framecnt_t cnt, int channel=0) const;
+	virtual framecnt_t write (Sample *src, framecnt_t cnt);
 
 	virtual float sample_rate () const = 0;
 
-	virtual void mark_for_remove() = 0;
-	virtual void mark_streaming_write_completed () {}
+	virtual void mark_streaming_write_completed ();
 
 	virtual bool can_truncate_peaks() const { return true; }
 
-	void set_captured_for (Glib::ustring str) { _captured_for = str; }
-	Glib::ustring captured_for() const { return _captured_for; }
+	void set_captured_for (std::string str) { _captured_for = str; }
+	std::string 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; }
+	void dec_read_data_count(nframes_t);
 
- 	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, framecnt_t npeaks,
+			framepos_t start, framecnt_t cnt, double samples_per_visual_peak) const;
 
- 	int  build_peaks ();
-	bool peaks_ready (sigc::slot<void>, sigc::connection&) const;
+	int  build_peaks ();
+	bool peaks_ready (boost::function<void()> callWhenReady, PBD::ScopedConnection** connection_created_if_not_ready, PBD::EventLoop* event_loop) const;
+
+	mutable PBD::Signal0<void>  PeaksReady;
+	mutable PBD::Signal2<void,framepos_t,framepos_t>  PeakRangeReady;
 
-	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);
+	int rename_peakfile (std::string newpath);
 	void touch_peakfile ();
 
 	static void set_build_missing_peakfiles (bool yn) {
@@ -111,47 +103,58 @@ class AudioSource : public Source, public boost::enable_shared_from_this<ARDOUR:
 	int prepare_for_peakfile_writes ();
 	void done_with_peakfile_writes (bool done = true);
 
+	/** @return true if the each source sample s must be clamped to -1 < s < 1 */
+	virtual bool clamped_at_unity () const = 0;
+
   protected:
 	static bool _build_missing_peakfiles;
 	static bool _build_peakfiles;
 
-	bool                 _peaks_built;
-	mutable Glib::Mutex  _lock;
-	mutable Glib::Mutex  _peaks_ready_lock;
-	Glib::ustring         peakpath;
-	Glib::ustring        _captured_for;
+	framecnt_t           _length;
+	std::string         peakpath;
+	std::string        _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, Glib::ustring path);
+	int initialize_peakfile (bool newfile, std::string 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, framecnt_t first_frame, framecnt_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 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;
+	virtual framecnt_t read_unlocked (Sample *dst, framepos_t start, framecnt_t cnt) const = 0;
+	virtual framecnt_t write_unlocked (Sample *dst, framecnt_t cnt) = 0;
+	virtual std::string peak_path(std::string audio_path) = 0;
+	virtual std::string find_broken_peakfile (std::string missing_peak_path,
+                                                  std::string audio_path) = 0;
 
-	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);	
+	virtual int read_peaks_with_fpp (PeakData *peaks,
+					 framecnt_t npeaks, framepos_t start, framecnt_t cnt,
+					 double samples_per_visual_peak, framecnt_t fpp) const;
+	
+	int compute_and_write_peaks (Sample* buf, framecnt_t first_frame, framecnt_t cnt,
+				     bool force, bool intermediate_peaks_ready_signal, 
+				     framecnt_t frames_per_peak);
 
   private:
-	int peakfile;
-	nframes_t peak_leftover_cnt;
-	nframes_t peak_leftover_size;
-	Sample* peak_leftovers;
-	nframes_t peak_leftover_frame;
-
-	bool file_changed (Glib::ustring path);
+	bool _peaks_built;
+	/** This mutex is used to protect both the _peaks_built
+	 *  variable and also the emission (and handling) of the
+	 *  PeaksReady signal.  Holding the lock when emitting
+	 *  PeaksReady means that _peaks_built cannot be changed
+	 *  during the handling of the signal.
+	 */
+	mutable Glib::Mutex _peaks_ready_lock;
+	
+	PBD::FdFileDescriptor* _peakfile_descriptor;
+	int        _peakfile_fd;
+	framecnt_t peak_leftover_cnt;
+	framecnt_t peak_leftover_size;
+	Sample*    peak_leftovers;
+	framepos_t peak_leftover_frame;
 };
 
 }