switch to using boost::signals2 instead of sigc++, at least for libardour. not finish...

[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 d9e39c88505717053b4c944c69758101a88217a1..4a2f74b775843c6fef975257166b12d9714aa69d 100644 (file)
--- a/libs/ardour/ardour/export_channel.h
+++ b/libs/ardour/ardour/export_channel.h
@@ -21,32 +21,36 @@
 #ifndef __ardour_export_channel_h__
 #define __ardour_export_channel_h__
 
-#include <ardour/audioregion.h>
-#include <ardour/audio_track.h>
-#include <ardour/buffer_set.h>
-
 #include <set>
 
+#include <boost/signals2.hpp>
 #include <boost/shared_ptr.hpp>
-#include <sigc++/signal.h>
+
+#include "ardour/audioregion.h"
+#include "ardour/buffer_set.h"
 
 namespace ARDOUR {
 
 class Session;
+class AudioTrack;
+class AudioPort;
 
 /// Export channel base class interface for different source types
 class ExportChannel
 {
   public:
+
+       virtual ~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;
 };
@@ -68,14 +72,14 @@ class PortExportChannel : public ExportChannel
        typedef std::set<AudioPort *> PortSet;
 
        PortExportChannel () {}
-       
-       virtual void read (Sample * data, nframes_t frames) const;
-       virtual bool empty () const { return ports.empty(); }
-       
-       virtual void get_state (XMLNode * node) const;
-       virtual void set_state (XMLNode * node, Session & session);
-       
-       virtual bool operator< (ExportChannel const & other) const;
+
+       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); }
        PortSet const & get_ports () { return ports; }
@@ -85,7 +89,7 @@ class PortExportChannel : public ExportChannel
 };
 
 /// Handles RegionExportChannels and does actual reading from region
-class RegionExportChannelFactory : public sigc::trackable
+class RegionExportChannelFactory 
 {
   public:
        enum Type {
@@ -93,16 +97,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;
@@ -115,9 +119,11 @@ class RegionExportChannelFactory : public sigc::trackable
        bool buffers_up_to_date;
        nframes_t region_start;
        nframes_t position;
-       
+
        Sample * mixdown_buffer;
        Sample * gain_buffer;
+
+       boost::signals2::scoped_connection export_connection;
 };
 
 /// Export channel that reads from region channel
@@ -126,20 +132,20 @@ class RegionExportChannel : public ExportChannel
        friend class RegionExportChannelFactory;
 
   public:
-       virtual void read (Sample * data, nframes_t frames_to_read) const { factory.read (channel, data, frames_to_read); }
-       virtual void get_state (XMLNode * node) const {};
-       virtual void set_state (XMLNode * node, Session & session) {};
-       virtual bool empty () const { return false; }
+       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*/) {};
+       bool empty () const { return false; }
        // Region export should never have duplicate channels, so there need not be any semantics here
-       virtual bool operator< (ExportChannel const & other) const { return this < &other; }
+       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;
 };