X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fsource_factory.h;h=614fdce7b19deeda12d905cb8122af47a307c2e6;hb=c96ec968c7bb4b1d7c358f522a49b0685c022920;hp=c979a575cfc055e44084252b46c4f7efdafbfefd;hpb=87726495c30f90554b5204b5385d17274a8fe93e;p=ardour.git

diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h
index c979a575cf..614fdce7b1 100644
--- a/libs/ardour/ardour/source_factory.h
+++ b/libs/ardour/ardour/source_factory.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    Copyright (C) 2000-2007 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
@@ -22,31 +22,53 @@
 
 #include <string>
 #include <stdint.h>
-#include <sigc++/sigc++.h>
 #include <boost/shared_ptr.hpp>
 
-#include <ardour/source.h>
-#include <ardour/audiofilesource.h>
+#include <glibmm/threads.h>
+
+#include "ardour/source.h"
 
 class XMLNode;
 
 namespace ARDOUR {
 
 class Session;
+class AudioSource;
+class Playlist;
 
-class SourceFactory {
+class LIBARDOUR_API SourceFactory {
   public:
-	static sigc::signal<void,boost::shared_ptr<Source> > SourceCreated;
+	static void init ();
+
+	static PBD::Signal1<void,boost::shared_ptr<Source> > SourceCreated;
+
+	static boost::shared_ptr<Source> create (Session&, const XMLNode& node, bool async = false);
+	static boost::shared_ptr<Source> createSilent (Session&, const XMLNode& node,
+	                                               framecnt_t nframes, float sample_rate);
+
+	static boost::shared_ptr<Source> createExternal
+		(DataType type, Session&,
+		 const std::string& path, 
+		 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 destructive, framecnt_t rate, bool announce = true, bool async = false);
+
+
+	static boost::shared_ptr<Source> createForRecovery
+		(DataType type, Session&, const std::string& path, int chn);
 
-	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> createFromPlaylist
+		(DataType type, Session& s, boost::shared_ptr<Playlist> p, const PBD::ID& orig, const std::string& name,
+		 uint32_t chn, frameoffset_t start, framecnt_t len, bool copy, bool defer_peaks);
 
-	// 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::Threads::Cond                       PeaksToBuild;
+        static Glib::Threads::Mutex                      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);
 };
 
 }