Fix the horrible mess that was anything related to sources and paths.

[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 e19013e822d72ded54fc1417bb020b441d5d0135..38f449a1a50cb368e887f1ee96af5a4951f9a398 100644 (file)
--- a/libs/ardour/ardour/export_timespan.h
+++ b/libs/ardour/ardour/export_timespan.h
@@ -27,6 +27,7 @@
 #include <glibmm/ustring.h>
 
 #include <ardour/export_status.h>
+#include <ardour/export_channel.h>
 #include <ardour/ardour.h>
 
 using Glib::ustring;
@@ -41,8 +42,8 @@ class ExportTimespan : public sigc::trackable
 {
   private:
        typedef boost::shared_ptr<ExportTempFile> TempFilePtr;
-       typedef std::pair<ExportChannel const, TempFilePtr> ChannelFilePair;
-       typedef std::map<ExportChannel const, TempFilePtr> TempFileMap;
+       typedef std::pair<ExportChannelPtr, TempFilePtr> ChannelFilePair;
+       typedef std::map<ExportChannelPtr, TempFilePtr> TempFileMap;
        typedef boost::shared_ptr<ExportStatus> ExportStatusPtr;
 
   private:
@@ -59,13 +60,13 @@ class ExportTimespan : public sigc::trackable
        void set_range_id (ustring range_id) { _range_id = range_id; }
        
        /// Registers a channel to be read when export starts rolling
-       void register_channel (ExportChannel const & channel);
+       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, ExportChannel const & channel);
+       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);