Reformat.

[ardour.git] / libs / ardour / ardour / export_timespan.h

diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h
index 8c1ce107303925fff518a3c9f70d61e3ea596c94..592f36b1a99e1d9b02281d6243b08854f2889351 100644 (file)
--- a/libs/ardour/ardour/export_timespan.h
+++ b/libs/ardour/ardour/export_timespan.h
@@ -23,8 +23,7 @@
 
 #include <map>
 #include <list>
-
-#include <glibmm/ustring.h>
+#include <string>
 
 #include "ardour/export_status.h"
 #include "ardour/export_channel.h"
@@ -36,41 +35,24 @@ 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 ();
-       
-       Glib::ustring name () const { return _name; }
-       void set_name (Glib::ustring name) { _name = name; }
-       
-       Glib::ustring range_id () const { return _range_id; }
-       void set_range_id (Glib::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; }
@@ -85,10 +67,8 @@ class ExportTimespan : public sigc::trackable
        nframes_t      position;
        nframes_t      frame_rate;
 
-       TempFileMap    filemap;
-       
-       Glib::ustring _name;
-       Glib::ustring _range_id;
+       std::string _name;
+       std::string _range_id;
 
 };