X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fexport_timespan.h;h=592f36b1a99e1d9b02281d6243b08854f2889351;hb=844b7d0f684eaf01a8d553f935027f496a09c3ad;hp=6e410cbfae41b3c0d87110052e11dadb5fe2ec2d;hpb=e0aaed6d65f160c328cb8b56d7c6552ee15d65e2;p=ardour.git

diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h
index 6e410cbfae..592f36b1a9 100644
--- a/libs/ardour/ardour/export_timespan.h
+++ b/libs/ardour/ardour/export_timespan.h
@@ -23,56 +23,36 @@
 
 #include <map>
 #include <list>
-
-#include <glibmm/ustring.h>
+#include <string>
 
 #include "ardour/export_status.h"
 #include "ardour/export_channel.h"
 #include "ardour/ardour.h"
 
-using Glib::ustring;
-
 namespace ARDOUR
 {
 
 class ExportChannel;
 class ExportTempFile;
 
-class ExportTimespan : public sigc::trackable
+class ExportTimespan
 {
   private:
-	typedef boost::shared_ptr<ExportTempFile> TempFilePtr;
-	typedef std::pair<ExportChannelPtr, TempFilePtr> ChannelFilePair;
-	typedef std::map<ExportChannelPtr, TempFilePtr> TempFileMap;
 	typedef boost::shared_ptr<ExportStatus> ExportStatusPtr;
 
   private:
 	friend class ExportElementFactory;
 	ExportTimespan (ExportStatusPtr status, nframes_t frame_rate);
-	
+
   public:
 	~ExportTimespan ();
-	
-	ustring name () const { return _name; }
-	void set_name (ustring name) { _name = name; }
-	
-	ustring range_id () const { return _range_id; }
-	void set_range_id (ustring range_id) { _range_id = range_id; }
-	
-	/// Registers a channel to be read when export starts rolling
-	void register_channel (ExportChannelPtr channel);
-	
-	/// "Rewinds" the tempfiles to start reading the beginnings again
-	void rewind ();
-	
-	/// Reads data from the tempfile belonging to channel into data
-	nframes_t get_data (float * data, nframes_t frames, ExportChannelPtr channel);
-	
-	/// Reads data from each channel and writes to tempfile
-	int process (nframes_t frames);
-	
-	sigc::connection  process_connection;
-	
+
+	std::string name () const { return _name; }
+	void set_name (std::string name) { _name = name; }
+
+	std::string range_id () const { return _range_id; }
+	void set_range_id (std::string range_id) { _range_id = range_id; }
+
 	void set_range (nframes_t start, nframes_t end);
 	nframes_t get_length () const { return end_frame - start_frame; }
 	nframes_t get_start () const { return start_frame; }
@@ -87,10 +67,8 @@ class ExportTimespan : public sigc::trackable
 	nframes_t      position;
 	nframes_t      frame_rate;
 
-	TempFileMap    filemap;
-	
-	ustring       _name;
-	ustring       _range_id;
+	std::string _name;
+	std::string _range_id;
 
 };