From 7468fdb9ca9892cec9b298690bf0edf3655d6453 Mon Sep 17 00:00:00 2001 From: Sakari Bergen Date: Sat, 11 Jun 2011 14:14:24 +0000 Subject: Typedef all globally used export smart pointer types in one file. Some of them need to be ordered in STL containers, and thus need a special comparable wrapper for boost::shared_ptr, defined in comparable_shared_ptr.h. This also alleviates the typedef hell present earlier in some export classes :) Making the timespan pointer comparable should fix bug #4093 git-svn-id: svn://localhost/ardour2/branches/3.0@9702 d708f5d6-7413-0410-9779-e7cbd77b26cf --- libs/ardour/ardour/export_channel.h | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) (limited to 'libs/ardour/ardour/export_channel.h') diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index cbb894c66a..1a71f14c3c 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -26,11 +26,11 @@ #include #include #include -#include #include "pbd/signals.h" #include "ardour/buffer_set.h" +#include "ardour/export_pointers.h" namespace ARDOUR { @@ -62,17 +62,6 @@ class ExportChannel : public boost::less_than_comparable virtual bool operator< (ExportChannel const & other) const = 0; }; -/// Safe pointer for storing ExportChannels in ordered STL containers -class ExportChannelPtr : public boost::shared_ptr - , public boost::less_than_comparable -{ - public: - ExportChannelPtr () {} - template explicit ExportChannelPtr (Y * ptr) : boost::shared_ptr (ptr) {} - - bool operator< (ExportChannelPtr const & other) const { return **this < *other; } -}; - /// Basic export channel that reads from AudioPorts class PortExportChannel : public ExportChannel { @@ -99,6 +88,7 @@ class PortExportChannel : public ExportChannel framecnt_t buffer_size; }; + /// Handles RegionExportChannels and does actual reading from region class RegionExportChannelFactory { -- cgit v1.2.3