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

diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h
index 249757f9b4..08c879d926 100644
--- a/libs/ardour/ardour/audiosource.h
+++ b/libs/ardour/ardour/audiosource.h
@@ -26,7 +26,6 @@
 #include <time.h>
 
 #include <glibmm/thread.h>
-#include <glibmm/ustring.h>
 #include <boost/function.hpp>
 
 #include "ardour/source.h"
@@ -43,7 +42,7 @@ class AudioSource : virtual public Source,
 		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 ();
 
@@ -61,12 +60,12 @@ class AudioSource : virtual public Source,
 
 	virtual float sample_rate () const = 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; }
@@ -84,7 +83,7 @@ class AudioSource : virtual public Source,
 	XMLNode& get_state ();
 	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) {
@@ -112,17 +111,15 @@ class AudioSource : virtual public Source,
 	static bool _build_peakfiles;
 
 	framecnt_t           _length;
-	bool                 _peaks_built;
-	mutable Glib::Mutex  _peaks_ready_lock;
-	Glib::ustring         peakpath;
-	Glib::ustring        _captured_for;
+	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, framepos_t first_frame, framecnt_t cnt,
+	int compute_and_write_peaks (Sample* buf, framecnt_t first_frame, framecnt_t cnt,
 	bool force, bool intermediate_peaks_ready_signal);
 	void truncate_peakfile();
 
@@ -130,19 +127,28 @@ class AudioSource : virtual public Source,
 
 	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 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;
+	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;
 
 	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, framepos_t first_frame, framecnt_t cnt,
+	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:
+	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;