diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-17 18:24:23 +0000 |
commit | f6fdd8dcbf41f864e9f0cc32dabe81fe3533ddfe (patch) | |
tree | 5214c580b9e6c17a499fa587660dbf949e892bf2 /libs/ardour/ardour/export_channel.h | |
parent | da762129f19c28aff64f833b6ec09fba946faef6 (diff) |
switch to using boost::signals2 instead of sigc++, at least for libardour. not finished yet, but compiles, loads sessions, records and can close a session without a crash
git-svn-id: svn://localhost/ardour2/branches/3.0@6372 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/export_channel.h')
-rw-r--r-- | libs/ardour/ardour/export_channel.h | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index fdb466a06e..4a2f74b775 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -21,13 +21,13 @@ #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 "ardour/audioregion.h" +#include "ardour/buffer_set.h" namespace ARDOUR { @@ -89,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 { @@ -106,7 +106,7 @@ class RegionExportChannelFactory : public sigc::trackable 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; @@ -122,6 +122,8 @@ class RegionExportChannelFactory : public sigc::trackable Sample * mixdown_buffer; Sample * gain_buffer; + + boost::signals2::scoped_connection export_connection; }; /// Export channel that reads from region channel |