fix up file renaming code a little bit

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

diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h
index d7c363860ce0cfbba598f51716819eadbb06ac94..51ecabee25c8156e74d3cc2530c0f80d5199c3c4 100644 (file)
--- a/libs/ardour/ardour/export_channel.h
+++ b/libs/ardour/ardour/export_channel.h
@@ -21,13 +21,14 @@
 #ifndef __ardour_export_channel_h__
 #define __ardour_export_channel_h__
 
-#include <ardour/audioregion.h>
-#include <ardour/buffer_set.h>
-
 #include <set>
 
+#include <boost/signals2.hpp>
 #include <boost/shared_ptr.hpp>
-#include <sigc++/signal.h>
+#include <boost/operators.hpp>
+
+#include "ardour/audioregion.h"
+#include "ardour/buffer_set.h"
 
 namespace ARDOUR {
 
@@ -36,7 +37,7 @@ class AudioTrack;
 class AudioPort;
 
 /// Export channel base class interface for different source types
-class ExportChannel
+class ExportChannel : public boost::less_than_comparable<ExportChannel>
 {
   public:
 
@@ -44,19 +45,20 @@ class ExportChannel
 
        virtual void read (Sample * data, nframes_t frames) const = 0;
        virtual bool empty () const = 0;
-       
+
        /// Adds state to node passed
        virtual void get_state (XMLNode * node) const = 0;
-       
+
        /// Sets state from node passed
        virtual void set_state (XMLNode * node, Session & session) = 0;
-       
+
        // Operator< must be defined for usage in e.g. std::map or std::set to disallow duplicates when necessary
        virtual bool operator< (ExportChannel const & other) const = 0;
 };
 
 /// Safe pointer for storing ExportChannels in ordered STL containers
 class ExportChannelPtr : public boost::shared_ptr<ExportChannel>
+                       , public boost::less_than_comparable<ExportChannel>
 {
   public:
        ExportChannelPtr () {}
@@ -72,13 +74,13 @@ class PortExportChannel : public ExportChannel
        typedef std::set<AudioPort *> PortSet;
 
        PortExportChannel () {}
-       
+
        void read (Sample * data, nframes_t frames) const;
        bool empty () const { return ports.empty(); }
-       
+
        void get_state (XMLNode * node) const;
        void set_state (XMLNode * node, Session & session);
-       
+
        bool operator< (ExportChannel const & other) const;
 
        void add_port (AudioPort * port) { ports.insert (port); }
@@ -89,7 +91,7 @@ class PortExportChannel : public ExportChannel
 };
 
 /// Handles RegionExportChannels and does actual reading from region
-class RegionExportChannelFactory : public sigc::trackable
+class RegionExportChannelFactory 
 {
   public:
        enum Type {
@@ -97,16 +99,16 @@ class RegionExportChannelFactory : public sigc::trackable
                Fades,
                Processed
        };
-       
+
        RegionExportChannelFactory (Session * session, AudioRegion const & region, AudioTrack & track, Type type);
        ~RegionExportChannelFactory ();
 
        ExportChannelPtr create (uint32_t channel);
        void read (uint32_t channel, Sample * data, nframes_t frames_to_read);
-       
+
   private:
 
-       int new_cycle_started () { buffers_up_to_date = false; return 0; }
+       int new_cycle_started (nframes_t) { buffers_up_to_date = false; return 0; }
        void update_buffers (nframes_t frames);
 
        AudioRegion const & region;
@@ -119,9 +121,11 @@ class RegionExportChannelFactory : public sigc::trackable
        bool buffers_up_to_date;
        nframes_t region_start;
        nframes_t position;
-       
+
        Sample * mixdown_buffer;
        Sample * gain_buffer;
+
+       PBD::ScopedConnection export_connection;
 };
 
 /// Export channel that reads from region channel
@@ -131,19 +135,19 @@ class RegionExportChannel : public ExportChannel
 
   public:
        void read (Sample * data, nframes_t frames_to_read) const { factory.read (channel, data, frames_to_read); }
-       void get_state (XMLNode * node) const {};
-       void set_state (XMLNode * node, Session & session) {};
+       void get_state (XMLNode * /*node*/) const {};
+       void set_state (XMLNode * /*node*/, Session & /*session*/) {};
        bool empty () const { return false; }
        // Region export should never have duplicate channels, so there need not be any semantics here
        bool operator< (ExportChannel const & other) const { return this < &other; }
 
   private:
 
-       RegionExportChannel (RegionExportChannelFactory & factory, uint32_t channel) :
-         factory (factory),
-         channel (channel)
+       RegionExportChannel (RegionExportChannelFactory & factory, uint32_t channel)
+               : factory (factory)
+               , channel (channel)
        {}
-       
+
        RegionExportChannelFactory & factory;
        uint32_t channel;
 };