X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsource_factory.h;h=69aa641657e976e34766e9a582a7de31c05f3952;hb=022818b4a796f52c0a91eea42e65aec0bc7bed43;hp=c979a575cfc055e44084252b46c4f7efdafbfefd;hpb=666e0870554705f4fb466fc6b188fe9b4000ca49;p=ardour.git

diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h
index c979a575cf..69aa641657 100644
--- a/libs/ardour/ardour/source_factory.h
+++ b/libs/ardour/ardour/source_factory.h
@@ -26,27 +26,37 @@
 #include <boost/shared_ptr.hpp>
 
 #include <ardour/source.h>
-#include <ardour/audiofilesource.h>
 
 class XMLNode;
 
 namespace ARDOUR {
 
 class Session;
+class AudioSource;
 
 class SourceFactory {
   public:
+	static void init ();
+
 	static sigc::signal<void,boost::shared_ptr<Source> > SourceCreated;
 
-	static boost::shared_ptr<Source> create (Session&, const XMLNode& node);
-	static boost::shared_ptr<Source> createSilent (Session&, const XMLNode& node, nframes_t nframes, float sample_rate);
+	static boost::shared_ptr<Source> create (Session&, const XMLNode& node, bool async = false);
+	static boost::shared_ptr<Source> createSilent (Session&, const XMLNode& node,
+			nframes_t nframes, float sample_rate);
+
+	static boost::shared_ptr<Source> createReadable (DataType type, Session&,
+			const std::string& path, bool embedded,
+			int chn, Source::Flag flags, bool announce = true, bool async = false);
+
+	static boost::shared_ptr<Source> createWritable (DataType type, Session&,
+			const std::string& path, bool embedded,
+			bool destructive, nframes_t rate, bool announce = true, bool async = false);
 
-	// MIDI sources will have to be hacked in here somehow
-	static boost::shared_ptr<Source> createReadable (Session&, std::string path, int chn, AudioFileSource::Flag flags, bool announce = true);
-	static boost::shared_ptr<Source> createWritable (Session&, std::string name, bool destructive, nframes_t rate, bool announce = true);
+	static Glib::Cond*                               PeaksToBuild;
+	static Glib::StaticMutex                         peak_building_lock;
+	static std::list< boost::weak_ptr<AudioSource> > files_with_peaks;
 
-  private:
-	static int setup_peakfile (boost::shared_ptr<Source>);
+	static int setup_peakfile (boost::shared_ptr<Source>, bool async);
 };
 
 }