diff options
Diffstat (limited to 'libs/ardour/ardour')
60 files changed, 216 insertions, 221 deletions
diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 1333b58d6f..aaae8ba1c9 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -26,7 +26,7 @@ #include <limits.h> #include <signal.h> -#include <boost/signals2.hpp> +#include "pbd/signals.h" #include "pbd/error.h" #include "pbd/failed_constructor.h" @@ -46,7 +46,7 @@ namespace ARDOUR { class AudioEngine; static const nframes_t max_frames = JACK_MAX_FRAMES; - extern boost::signals2::signal<void(std::string)> BootMessage; + extern PBD::Signal1<void,std::string> BootMessage; int init (bool with_vst, bool try_optimization); void init_post_engine (); diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index ac367ddd64..b22ca9790f 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -30,7 +30,7 @@ #include <glibmm/thread.h> #include "pbd/rcu.h" -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "ardour/ardour.h" #include <jack/jack.h> @@ -187,32 +187,32 @@ class AudioEngine : public SessionHandlePtr _ the regular process() call to session->process() is not made. */ - boost::signals2::signal<int(nframes_t)> Freewheel; + PBD::Signal1<int,nframes_t> Freewheel; - boost::signals2::signal<void()> Xrun; + PBD::Signal0<void> Xrun; /* this signal is if JACK notifies us of a graph order event */ - boost::signals2::signal<void()> GraphReordered; + PBD::Signal0<void> GraphReordered; /* this signal is emitted if the sample rate changes */ - boost::signals2::signal<void(nframes_t)> SampleRateChanged; + PBD::Signal1<void,nframes_t> SampleRateChanged; /* this signal is sent if JACK ever disconnects us */ - boost::signals2::signal<void()> Halted; + PBD::Signal0<void> Halted; /* these two are emitted when the engine itself is started and stopped */ - boost::signals2::signal<void()> Running; - boost::signals2::signal<void()> Stopped; + PBD::Signal0<void> Running; + PBD::Signal0<void> Stopped; /* this signal is emitted if a JACK port is registered or unregistered */ - boost::signals2::signal<void()> PortRegisteredOrUnregistered; + PBD::Signal0<void> PortRegisteredOrUnregistered; std::string make_port_name_relative (std::string); std::string make_port_name_non_relative (std::string); diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h index 3312bc889d..f0710843f8 100644 --- a/libs/ardour/ardour/audiofilesource.h +++ b/libs/ardour/ardour/audiofilesource.h @@ -84,7 +84,7 @@ public: static void set_bwf_serial_number (int); static void set_header_position_offset (nframes_t offset ); - static boost::signals2::signal<void()> HeaderPositionOffsetChanged; + static PBD::Signal0<void> HeaderPositionOffsetChanged; protected: /** Constructor to be called for existing external-to-session files */ diff --git a/libs/ardour/ardour/audioplaylist.h b/libs/ardour/ardour/audioplaylist.h index 927ccfbe11..9dd133cbc0 100644 --- a/libs/ardour/ardour/audioplaylist.h +++ b/libs/ardour/ardour/audioplaylist.h @@ -52,7 +52,7 @@ class AudioPlaylist : public ARDOUR::Playlist int set_state (const XMLNode&, int version); - boost::signals2::signal<void(boost::shared_ptr<Crossfade>)> NewCrossfade; + PBD::Signal1<void,boost::shared_ptr<Crossfade> > NewCrossfade; void foreach_crossfade (boost::function<void (boost::shared_ptr<Crossfade>)>); void crossfades_at (nframes_t frame, Crossfades&); diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index dfa103f2e3..4f46451907 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -72,10 +72,10 @@ class AudioSource : virtual public Source, sframes_t start, nframes_t cnt, double samples_per_visual_peak) const; int build_peaks (); - bool peaks_ready (boost::function<void()> callWhenReady, boost::signals2::connection& connection_established_if_not_ready) const; + bool peaks_ready (boost::function<void()> callWhenReady, PBD::Connection& connection_created_if_not_ready) const; - mutable boost::signals2::signal<void()> PeaksReady; - mutable boost::signals2::signal<void(nframes_t,nframes_t)> PeakRangeReady; + mutable PBD::Signal0<void> PeaksReady; + mutable PBD::Signal2<void,nframes_t,nframes_t> PeakRangeReady; XMLNode& get_state (); int set_state (const XMLNode&, int version); diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index c75abda0b7..1778771c5f 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -56,11 +56,11 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL void set_automation_state (AutoState); AutoState automation_state() const { return _state; } - boost::signals2::signal<void()> automation_state_changed; + PBD::Signal0<void> automation_state_changed; void set_automation_style (AutoStyle m); AutoStyle automation_style() const { return _style; } - boost::signals2::signal<void()> automation_style_changed; + PBD::Signal0<void> automation_style_changed; bool automation_playback() const { return (_state & Play) || ((_state & Touch) && !_touching); @@ -69,10 +69,10 @@ class AutomationList : public PBD::StatefulDestructible, public Evoral::ControlL return (_state & Write) || ((_state & Touch) && _touching); } - boost::signals2::signal<void()> StateChanged; + PBD::Signal0<void> StateChanged; - static boost::signals2::signal<void(AutomationList*)> AutomationListCreated; - mutable boost::signals2::signal<void()> Dirty; + static PBD::Signal1<void,AutomationList*> AutomationListCreated; + mutable PBD::Signal0<void> Dirty; void start_touch (); void stop_touch (); diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h index 662c3799a5..cc2ee19155 100644 --- a/libs/ardour/ardour/bundle.h +++ b/libs/ardour/ardour/bundle.h @@ -25,7 +25,7 @@ #include <glibmm/thread.h> #include <boost/shared_ptr.hpp> -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "ardour/data_type.h" @@ -120,7 +120,7 @@ class Bundle : public PBD::ScopedConnectionList DirectionChanged = 0x10 ///< the direction (whether ports are inputs or outputs) has changed }; - boost::signals2::signal<void(Change)> Changed; + PBD::Signal1<void,Change> Changed; protected: diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h index 1c82309d87..14a43e160c 100644 --- a/libs/ardour/ardour/configuration.h +++ b/libs/ardour/ardour/configuration.h @@ -21,7 +21,7 @@ #define __ardour_configuration_h__ #include <boost/function.hpp> -#include <boost/signals2.hpp> +#include "pbd/signals.h" #include "pbd/stateful.h" #include "ardour/configuration_variable.h" @@ -41,7 +41,7 @@ class Configuration : public PBD::Stateful virtual XMLNode & get_variables () = 0; virtual void set_variables (XMLNode const &) = 0; - boost::signals2::signal<void(std::string)> ParameterChanged; + PBD::Signal1<void,std::string> ParameterChanged; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/crossfade.h b/libs/ardour/ardour/crossfade.h index 1a492b742b..5e25bbe00d 100644 --- a/libs/ardour/ardour/crossfade.h +++ b/libs/ardour/ardour/crossfade.h @@ -105,8 +105,8 @@ class Crossfade : public ARDOUR::AudioRegion nframes_t overlap_length() const; - boost::signals2::signal<void(boost::shared_ptr<Region>)> Invalidated; - boost::signals2::signal<void(Change)> StateChanged; + PBD::Signal1<void,boost::shared_ptr<Region> > Invalidated; + PBD::Signal1<void,Change> StateChanged; bool covers (nframes_t frame) const { return _position <= frame && frame < _position + _length; diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index 7a5931c5fb..a7ccd96a2d 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -85,9 +85,9 @@ public: BufferSet& output_buffers() { return *_output_buffers; } - boost::signals2::signal<void()> MuteChange; + PBD::Signal0<void> MuteChange; - static boost::signals2::signal<void(nframes_t)> CycleStart; + static PBD::Signal1<void,nframes_t> CycleStart; XMLNode& state (bool full); int set_state (const XMLNode&, int version); @@ -120,10 +120,10 @@ public: boost::shared_ptr<Panner> _panner; static bool panners_legal; - static boost::signals2::signal<int()> PannersLegal; + static PBD::Signal0<int> PannersLegal; int panners_became_legal (); - boost::signals2::scoped_connection panner_legal_c; + PBD::ScopedConnection panner_legal_c; void output_changed (IOChange, void*); gain_t target_gain (); diff --git a/libs/ardour/ardour/diskstream.h b/libs/ardour/ardour/diskstream.h index a9664daa32..85e3071021 100644 --- a/libs/ardour/ardour/diskstream.h +++ b/libs/ardour/ardour/diskstream.h @@ -49,7 +49,7 @@ class Region; class Route; class Session; -class Diskstream : public SessionObject, public boost::noncopyable +class Diskstream : public SessionObject { public: enum Flag { @@ -143,15 +143,15 @@ class Diskstream : public SessionObject, public boost::noncopyable void move_processor_automation (boost::weak_ptr<Processor>, std::list< Evoral::RangeMove<nframes_t> > const &); - boost::signals2::signal<void()> RecordEnableChanged; - boost::signals2::signal<void()> SpeedChanged; - boost::signals2::signal<void()> ReverseChanged; - boost::signals2::signal<void()> PlaylistChanged; - boost::signals2::signal<void()> AlignmentStyleChanged; - boost::signals2::signal<void(Location *)> LoopSet; + PBD::Signal0<void> RecordEnableChanged; + PBD::Signal0<void> SpeedChanged; + PBD::Signal0<void> ReverseChanged; + PBD::Signal0<void> PlaylistChanged; + PBD::Signal0<void> AlignmentStyleChanged; + PBD::Signal1<void,Location *> LoopSet; - static boost::signals2::signal<void()> DiskOverrun; - static boost::signals2::signal<void()> DiskUnderrun; + static PBD::Signal0<void> DiskOverrun; + static PBD::Signal0<void> DiskUnderrun; protected: friend class Session; @@ -306,7 +306,7 @@ class Diskstream : public SessionObject, public boost::noncopyable PBD::ScopedConnectionList playlist_connections; - boost::signals2::scoped_connection ic_connection; + PBD::ScopedConnection ic_connection; Flag _flags; diff --git a/libs/ardour/ardour/element_importer.h b/libs/ardour/ardour/element_importer.h index d728a4b989..8ffa3b90ba 100644 --- a/libs/ardour/ardour/element_importer.h +++ b/libs/ardour/ardour/element_importer.h @@ -24,7 +24,7 @@ #include <string> #include <utility> -#include <boost/signals2.hpp> +#include "pbd/signals.h" #include "ardour/types.h" class XMLTree; @@ -72,10 +72,10 @@ class ElementImporter bool broken () { return _broken; } /// Signal that requests for anew name - static boost::signals2::signal <std::pair<bool, std::string> (std::string, std::string)> Rename; + static PBD::Signal2<std::pair<bool, std::string>,std::string, std::string> Rename; /// Signal for ok/cancel prompting - static boost::signals2::signal <bool(std::string)> Prompt; + static PBD::Signal1<bool,std::string> Prompt; protected: diff --git a/libs/ardour/ardour/export.h b/libs/ardour/ardour/export.h index 055168118d..ee533d4c6d 100644 --- a/libs/ardour/ardour/export.h +++ b/libs/ardour/ardour/export.h @@ -84,7 +84,7 @@ namespace ARDOUR SRC_STATE* src_state; nframes_t pos; - boost::signals2::scoped_connection freewheel_connection; + PBD::ScopedConnection freewheel_connection; /* shared between UI thread and audio thread */ diff --git a/libs/ardour/ardour/export_channel.h b/libs/ardour/ardour/export_channel.h index 4a2f74b775..73e3406869 100644 --- a/libs/ardour/ardour/export_channel.h +++ b/libs/ardour/ardour/export_channel.h @@ -123,7 +123,7 @@ class RegionExportChannelFactory Sample * mixdown_buffer; Sample * gain_buffer; - boost::signals2::scoped_connection export_connection; + PBD::ScopedConnection export_connection; }; /// Export channel that reads from region channel diff --git a/libs/ardour/ardour/export_channel_configuration.h b/libs/ardour/ardour/export_channel_configuration.h index b8d7fa6bf1..9ca49f452d 100644 --- a/libs/ardour/ardour/export_channel_configuration.h +++ b/libs/ardour/ardour/export_channel_configuration.h @@ -95,7 +95,7 @@ class ExportChannelConfiguration /// Writes all files for this channel config @return true if a new thread was spawned bool write_files (boost::shared_ptr<ExportProcessor> new_processor); - boost::signals2::signal<void()> FilesWritten; + PBD::Signal0<void> FilesWritten; // Tells the handler the necessary information for it to handle tempfiles void register_with_timespan (TimespanPtr timespan); diff --git a/libs/ardour/ardour/export_format_base.h b/libs/ardour/ardour/export_format_base.h index ceb11a2cc9..dceb943e62 100644 --- a/libs/ardour/ardour/export_format_base.h +++ b/libs/ardour/ardour/export_format_base.h @@ -115,8 +115,8 @@ class ExportFormatBase { : _selected (false), _compatible (true) { } ~SelectableCompatible () {} - boost::signals2::signal<void(bool)> SelectChanged; - boost::signals2::signal<void(bool)> CompatibleChanged; + PBD::Signal1<void,bool> SelectChanged; + PBD::Signal1<void,bool> CompatibleChanged; bool selected () const { return _selected; } bool compatible () const { return _compatible; } diff --git a/libs/ardour/ardour/export_format_manager.h b/libs/ardour/ardour/export_format_manager.h index 52463350fe..0d1a0310d9 100644 --- a/libs/ardour/ardour/export_format_manager.h +++ b/libs/ardour/ardour/export_format_manager.h @@ -27,7 +27,7 @@ #include <boost/shared_ptr.hpp> #include <boost/weak_ptr.hpp> -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "ardour/export_formats.h" @@ -92,7 +92,7 @@ class ExportFormatManager : public PBD::ScopedConnectionList /* Signals */ - boost::signals2::signal<void(bool)> CompleteChanged; + PBD::Signal1<void,bool> CompleteChanged; /* Access to lists */ diff --git a/libs/ardour/ardour/export_formats.h b/libs/ardour/ardour/export_formats.h index 3ef207097b..03585f79a9 100644 --- a/libs/ardour/ardour/export_formats.h +++ b/libs/ardour/ardour/export_formats.h @@ -25,7 +25,7 @@ #include <boost/weak_ptr.hpp> #include "pbd/failed_constructor.h" -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "ardour/export_format_base.h" #include "ardour/export_format_compatibility.h" @@ -128,11 +128,11 @@ class HasSampleFormat : public PBD::ScopedConnectionList { /* Proxies for signals from sample formats and dither types */ - boost::signals2::signal<void(bool, WeakSampleFormatPtr)> SampleFormatSelectChanged; - boost::signals2::signal<void(bool, WeakSampleFormatPtr)> SampleFormatCompatibleChanged; + PBD::Signal2<void,bool, WeakSampleFormatPtr> SampleFormatSelectChanged; + PBD::Signal2<void,bool, WeakSampleFormatPtr> SampleFormatCompatibleChanged; - boost::signals2::signal<void(bool, WeakDitherTypePtr)> DitherTypeSelectChanged; - boost::signals2::signal<void(bool, WeakDitherTypePtr)> DitherTypeCompatibleChanged; + PBD::Signal2<void,bool, WeakDitherTypePtr> DitherTypeSelectChanged; + PBD::Signal2<void,bool, WeakDitherTypePtr> DitherTypeCompatibleChanged; static std::string get_sample_format_name (ExportFormatBase::SampleFormat format); diff --git a/libs/ardour/ardour/export_handler.h b/libs/ardour/ardour/export_handler.h index ded6ed5b02..bbf1f7e208 100644 --- a/libs/ardour/ardour/export_handler.h +++ b/libs/ardour/ardour/export_handler.h @@ -118,8 +118,8 @@ class ExportHandler : public ExportElementFactory bool realtime; - boost::signals2::scoped_connection files_written_connection; - boost::signals2::scoped_connection export_read_finished_connection; + PBD::ScopedConnection files_written_connection; + PBD::ScopedConnection export_read_finished_connection; std::list<Glib::ustring> files_written; void add_file (const Glib::ustring&); @@ -177,7 +177,7 @@ class ExportHandler : public ExportElementFactory TimespanPtr current_timespan; ConfigMap::iterator current_map_it; TimespanBounds timespan_bounds; - boost::signals2::scoped_connection channel_config_connection; + PBD::ScopedConnection channel_config_connection; }; diff --git a/libs/ardour/ardour/export_multiplication.h b/libs/ardour/ardour/export_multiplication.h index aace72cc42..eb90e62c47 100644 --- a/libs/ardour/ardour/export_multiplication.h +++ b/libs/ardour/ardour/export_multiplication.h @@ -36,7 +36,7 @@ bool selected () const { return _selected; } void select (bool value); - boost::signals2::signal<void(bool)> SelectChanged; + PBD::Signal1<void,bool> SelectChanged; protected: @@ -151,7 +151,7 @@ void split_node (GraphNode * node, float position); void remove_node (GraphNode * node); - boost::signals2::signal<void()> GraphChanged; + PBD::Signal0<void> GraphChanged; private: diff --git a/libs/ardour/ardour/export_processor.h b/libs/ardour/ardour/export_processor.h index 8e7918d7c5..493dd3231f 100644 --- a/libs/ardour/ardour/export_processor.h +++ b/libs/ardour/ardour/export_processor.h @@ -80,7 +80,7 @@ class ExportProcessor void write_files (); - static boost::signals2::signal<void(const Glib::ustring&)> WritingFile; + static PBD::Signal1<void,const Glib::ustring&> WritingFile; private: diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h index 30bb3c5b91..a29979460f 100644 --- a/libs/ardour/ardour/export_profile_manager.h +++ b/libs/ardour/ardour/export_profile_manager.h @@ -206,7 +206,7 @@ class ExportProfileManager void remove_format_profile (FormatPtr format); FormatPtr get_new_format (FormatPtr original); - boost::signals2::signal<void()> FormatListChanged; + PBD::Signal0<void> FormatListChanged; private: diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h index 9fd3c84ecc..1613fffe52 100644 --- a/libs/ardour/ardour/export_status.h +++ b/libs/ardour/ardour/export_status.h @@ -22,7 +22,7 @@ #define __ardour_export_status_h__ #include <list> -#include <boost/signals2.hpp> +#include "pbd/signals.h" #include <stdint.h> @@ -46,12 +46,12 @@ struct ExportStatus { volatile bool stop; volatile bool running; - boost::signals2::signal<void()> Aborting; + PBD::Signal0<void> Aborting; void abort (bool error_occurred = false); bool aborted () const { return _aborted; } bool errors () const { return _errors; } - boost::signals2::signal<void()> Finished; + PBD::Signal0<void> Finished; void finish (); bool finished () const { return _finished; } diff --git a/libs/ardour/ardour/export_timespan.h b/libs/ardour/ardour/export_timespan.h index 461caf6dd8..7b7ae7cd99 100644 --- a/libs/ardour/ardour/export_timespan.h +++ b/libs/ardour/ardour/export_timespan.h @@ -69,7 +69,7 @@ class ExportTimespan /// Reads data from each channel and writes to tempfile int process (nframes_t frames); - boost::signals2::scoped_connection process_connection; + PBD::ScopedConnection process_connection; void set_range (nframes_t start, nframes_t end); nframes_t get_length () const { return end_frame - start_frame; } diff --git a/libs/ardour/ardour/internal_return.h b/libs/ardour/ardour/internal_return.h index 498c9f3605..c5facebef6 100644 --- a/libs/ardour/ardour/internal_return.h +++ b/libs/ardour/ardour/internal_return.h @@ -47,7 +47,7 @@ class InternalReturn : public Return BufferSet* get_buffers(); void release_buffers(); - static boost::signals2::signal<void(nframes_t)> CycleStart; + static PBD::Signal1<void,nframes_t> CycleStart; private: BufferSet buffers; diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h index 7573efd685..2171462ab7 100644 --- a/libs/ardour/ardour/internal_send.h +++ b/libs/ardour/ardour/internal_send.h @@ -53,7 +53,7 @@ class InternalSend : public Send BufferSet* target; boost::shared_ptr<Route> _send_to; PBD::ID _send_to_id; - boost::signals2::scoped_connection connect_c; + PBD::ScopedConnection connect_c; void send_to_going_away (); void send_to_name_changed (); diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index eeb7ed64f0..b718cfa5c9 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -132,7 +132,7 @@ class IO : public SessionObject, public Latent const ChanCount& n_ports () const { return _ports.count(); } - boost::signals2::signal<void(IOChange,void*)> changed; + PBD::Signal2<void,IOChange,void*> changed; virtual XMLNode& state (bool full); XMLNode& get_state (void); @@ -144,7 +144,7 @@ class IO : public SessionObject, public Latent static int disable_ports (void); static int enable_ports (void); - static boost::signals2::signal<void(ChanCount)> PortCountChanged; // emitted when the number of ports changes + static PBD::Signal1<void,ChanCount> PortCountChanged; // emitted when the number of ports changes static std::string name_from_state (const XMLNode&); static void set_name_in_state (XMLNode&, const std::string&); @@ -152,7 +152,7 @@ class IO : public SessionObject, public Latent /* we have to defer/order port connection. this is how we do it. */ - static boost::signals2::signal<int()> ConnectingLegal; + static PBD::Signal0<int> ConnectingLegal; static bool connecting_legal; XMLNode *pending_state_node; @@ -180,14 +180,14 @@ class IO : public SessionObject, public Latent private: int connecting_became_legal (); - boost::signals2::scoped_connection connection_legal_c; + PBD::ScopedConnection connection_legal_c; boost::shared_ptr<Bundle> _bundle; ///< a bundle representing our ports struct UserBundleInfo { UserBundleInfo (IO*, boost::shared_ptr<UserBundle> b); boost::shared_ptr<UserBundle> bundle; - boost::signals2::scoped_connection changed; + PBD::ScopedConnection changed; }; std::vector<UserBundleInfo*> _bundles_connected; ///< user bundles connected to our ports diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h index e4a42a80e2..2acf7337a7 100644 --- a/libs/ardour/ardour/io_processor.h +++ b/libs/ardour/ardour/io_processor.h @@ -67,8 +67,8 @@ class IOProcessor : public Processor virtual bool feeds (boost::shared_ptr<Route> other) const; - boost::signals2::signal<void(IOProcessor*,bool)> AutomationPlaybackChanged; - boost::signals2::signal<void(IOProcessor*,uint32_t)> AutomationChanged; + PBD::Signal2<void,IOProcessor*,bool> AutomationPlaybackChanged; + PBD::Signal2<void,IOProcessor*,uint32_t> AutomationChanged; XMLNode& state (bool full_state); int set_state (const XMLNode&, int version); diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index b50a645a93..1f2b80c831 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -108,15 +108,15 @@ class Location : public PBD::StatefulDestructible bool is_range_marker() const { return _flags & IsRangeMarker; } bool matches (Flags f) const { return _flags & f; } - boost::signals2::signal<void(Location*)> name_changed; - boost::signals2::signal<void(Location*)> end_changed; - boost::signals2::signal<void(Location*)> start_changed; + PBD::Signal1<void,Location*> name_changed; + PBD::Signal1<void,Location*> end_changed; + PBD::Signal1<void,Location*> start_changed; - boost::signals2::signal<void(Location*,void*)> FlagsChanged; + PBD::Signal2<void,Location*,void*> FlagsChanged; /* this is sent only when both start&end change at the same time */ - boost::signals2::signal<void(Location*)> changed; + PBD::Signal1<void,Location*> changed; /* CD Track / CD-Text info */ @@ -175,11 +175,11 @@ class Locations : public PBD::StatefulDestructible void find_all_between (nframes64_t start, nframes64_t, LocationList&, Location::Flags); - boost::signals2::signal<void(Location*)> current_changed; - boost::signals2::signal<void()> changed; - boost::signals2::signal<void(Location*)> added; - boost::signals2::signal<void(Location*)> removed; - boost::signals2::signal<void(Change)> StateChanged; + PBD::Signal1<void,Location*> current_changed; + PBD::Signal0<void> changed; + PBD::Signal1<void,Location*> added; + PBD::Signal1<void,Location*> removed; + PBD::Signal1<void,Change> StateChanged; template<class T> void apply (T& obj, void (T::*method)(LocationList&)) { Glib::Mutex::Lock lm (lock); diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h index 1f5e3307d6..2a283c0c64 100644 --- a/libs/ardour/ardour/meter.h +++ b/libs/ardour/ardour/meter.h @@ -22,6 +22,7 @@ #include <vector> #include "ardour/types.h" #include "ardour/processor.h" +#include "pbd/signals.h" #include "pbd/fastlog.h" namespace ARDOUR { @@ -33,16 +34,11 @@ class Session; class Metering { public: static void update_meters (); - static boost::signals2::signal<void()> Meter; - - static boost::signals2::connection connect (boost::function<void()>); - static void disconnect (boost::signals2::connection& c); + static PBD::Signal0<void> Meter; private: /* this object is not meant to be instantiated */ Metering(); - - static Glib::StaticMutex m_meter_signal_lock; }; /** Meters peaks on the input and stores them for access. diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index 9961b51528..3cf64da6ea 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -158,7 +158,7 @@ public: XMLNode& get_state(); int set_state(const XMLNode&) { return 0; } - boost::signals2::signal<void()> ContentsChanged; + PBD::Signal0<void> ContentsChanged; const MidiSource* midi_source() const { return _midi_source; } void set_midi_source(MidiSource* source) { _midi_source = source; } diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h index 8c4ff43d5c..f352009ba7 100644 --- a/libs/ardour/ardour/midi_patch_manager.h +++ b/libs/ardour/ardour/midi_patch_manager.h @@ -22,7 +22,7 @@ #define MIDI_PATCH_MANAGER_H_ #include "midi++/midnam_patch.h" -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "ardour/session_handle.h" namespace ARDOUR { diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 74448991d9..7b867c70fd 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -86,10 +86,10 @@ class MidiSource : virtual public Source uint32_t read_data_count() const { return _read_data_count; } uint32_t write_data_count() const { return _write_data_count; } - static boost::signals2::signal<void(MidiSource*)> MidiSourceCreated; + static PBD::Signal1<void,MidiSource*> MidiSourceCreated; // Signal a range of recorded data is available for reading from model() - mutable boost::signals2::signal<void(sframes_t,nframes_t)> ViewDataRangeReady; + mutable PBD::Signal2<void,sframes_t,nframes_t> ViewDataRangeReady; XMLNode& get_state (); int set_state (const XMLNode&, int version); diff --git a/libs/ardour/ardour/midi_ui.h b/libs/ardour/ardour/midi_ui.h index 0ecf1b0589..869d7ab708 100644 --- a/libs/ardour/ardour/midi_ui.h +++ b/libs/ardour/ardour/midi_ui.h @@ -42,7 +42,7 @@ class MidiControlUI : public AbstractUI<MidiUIRequest> typedef std::list<GSource*> PortSources; PortSources port_sources; ARDOUR::Session& _session; - boost::signals2::scoped_connection rebind_connection; + PBD::ScopedConnection rebind_connection; bool midi_input_handler (Glib::IOCondition, MIDI::Port*); void reset_ports (); diff --git a/libs/ardour/ardour/mute_master.h b/libs/ardour/ardour/mute_master.h index a76775c710..afc1037e42 100644 --- a/libs/ardour/ardour/mute_master.h +++ b/libs/ardour/ardour/mute_master.h @@ -64,7 +64,7 @@ class MuteMaster : public AutomationControl void set_value (float); /* note: float is used as a bitfield of MutePoints */ float get_value () const; - boost::signals2::signal<void()> MutePointChanged; + PBD::Signal0<void> MutePointChanged; XMLNode& get_state(); int set_state(const XMLNode&, int version); diff --git a/libs/ardour/ardour/named_selection.h b/libs/ardour/ardour/named_selection.h index 0c930d5b72..c17ef3bf4d 100644 --- a/libs/ardour/ardour/named_selection.h +++ b/libs/ardour/ardour/named_selection.h @@ -46,7 +46,7 @@ struct NamedSelection : public PBD::Stateful int set_state (const XMLNode&, int version); - static boost::signals2::signal<void(NamedSelection*)> NamedSelectionCreated; + static PBD::Signal1<void,NamedSelection*> NamedSelectionCreated; }; }/* namespace ARDOUR */ diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index bf5a04c745..954727d280 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -81,8 +81,8 @@ class StreamPanner : public PBD::Stateful boost::shared_ptr<AutomationControl> pan_control() { return _control; } - boost::signals2::signal<void()> Changed; /* for position */ - boost::signals2::signal<void()> StateChanged; /* for mute */ + PBD::Signal0<void> Changed; /* for position */ + PBD::Signal0<void> StateChanged; /* for mute */ int set_state (const XMLNode&, int version); virtual XMLNode& state (bool full_state) = 0; @@ -270,9 +270,9 @@ public: StreamPanner &streampanner( uint32_t n ) const { assert( n < _streampanners.size() ); return *_streampanners[n]; } uint32_t npanners() const { return _streampanners.size(); } - boost::signals2::signal<void()> Changed; - boost::signals2::signal<void()> LinkStateChanged; - boost::signals2::signal<void()> StateChanged; /* for bypass */ + PBD::Signal0<void> Changed; + PBD::Signal0<void> LinkStateChanged; + PBD::Signal0<void> StateChanged; /* for bypass */ /* only StreamPanner should call these */ diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index 9c089c2f05..8bcdc5540b 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -51,7 +51,6 @@ class Session; class Region; class Playlist : public SessionObject - , public boost::noncopyable , public boost::enable_shared_from_this<Playlist> { public: typedef std::list<boost::shared_ptr<Region> > RegionList; @@ -130,13 +129,13 @@ class Playlist : public SessionObject int set_state (const XMLNode&, int version); XMLNode& get_template (); - boost::signals2::signal<void(bool)> InUse; - boost::signals2::signal<void()> Modified; - boost::signals2::signal<void(boost::weak_ptr<Region>)> RegionAdded; - boost::signals2::signal<void(boost::weak_ptr<Region>)> RegionRemoved; - boost::signals2::signal<void()> NameChanged; - boost::signals2::signal<void()> LengthChanged; - boost::signals2::signal<void(std::list< Evoral::RangeMove<nframes_t> > const &)> RangesMoved; + PBD::Signal1<void,bool> InUse; + PBD::Signal0<void> Modified; + PBD::Signal1<void,boost::weak_ptr<Region> > RegionAdded; + PBD::Signal1<void,boost::weak_ptr<Region> > RegionRemoved; + PBD::Signal0<void> NameChanged; + PBD::Signal0<void> LengthChanged; + PBD::Signal1<void,std::list< Evoral::RangeMove<nframes_t> > const &> RangesMoved; static std::string bump_name (std::string old_name, Session&); diff --git a/libs/ardour/ardour/playlist_factory.h b/libs/ardour/ardour/playlist_factory.h index 4c3680ae8e..17645ad8a3 100644 --- a/libs/ardour/ardour/playlist_factory.h +++ b/libs/ardour/ardour/playlist_factory.h @@ -31,7 +31,7 @@ class Session; class PlaylistFactory { public: - static boost::signals2::signal<void(boost::shared_ptr<Playlist>, bool)> PlaylistCreated; + static PBD::Signal2<void,boost::shared_ptr<Playlist>, bool> PlaylistCreated; static boost::shared_ptr<Playlist> create (Session&, const XMLNode&, bool hidden = false, bool unused = false); static boost::shared_ptr<Playlist> create (DataType type, Session&, std::string name, bool hidden = false); diff --git a/libs/ardour/ardour/plugin.h b/libs/ardour/ardour/plugin.h index ea8f95d8f5..4770c43511 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -143,7 +143,7 @@ class Plugin : public PBD::StatefulDestructible, public Latent virtual bool has_editor() const = 0; - boost::signals2::signal<void(uint32_t,float)> ParameterChanged; + PBD::Signal2<void,uint32_t,float> ParameterChanged; /* NOTE: this block of virtual methods looks like the interface to a Processor, but Plugin does not inherit from Processor. diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h index 6be8f1dda6..25f380c41b 100644 --- a/libs/ardour/ardour/plugin_insert.h +++ b/libs/ardour/ardour/plugin_insert.h @@ -106,7 +106,7 @@ class PluginInsert : public Processor void collect_signal_for_analysis(nframes_t nframes); - boost::signals2::signal<void(BufferSet*, BufferSet*)> AnalysisDataGathered; + PBD::Signal2<void,BufferSet*, BufferSet*> AnalysisDataGathered; private: /* disallow copy construction */ diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h index 44c529835e..14c4190787 100644 --- a/libs/ardour/ardour/plugin_manager.h +++ b/libs/ardour/ardour/plugin_manager.h @@ -70,7 +70,7 @@ class PluginManager : public boost::noncopyable { PluginStatusType get_status (const PluginInfoPtr&); /** plugins were added to or removed from one of the PluginInfoLists */ - boost::signals2::signal<void()> PluginListChanged; + PBD::Signal0<void> PluginListChanged; private: struct PluginStatus { diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index be4df6bd02..ce4b88f8f2 100644 --- a/libs/ardour/ardour/port.h +++ b/libs/ardour/ardour/port.h @@ -25,7 +25,7 @@ #include <vector> #include <jack/jack.h> #include <boost/utility.hpp> -#include <boost/signals2.hpp> +#include "pbd/signals.h" #include "ardour/data_type.h" #include "ardour/types.h" @@ -118,7 +118,7 @@ public: static void set_engine (AudioEngine *); - boost::signals2::signal<void(bool)> MonitorInputChanged; + PBD::Signal1<void,bool> MonitorInputChanged; protected: diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h index 5962e8f44e..2dd78c66f4 100644 --- a/libs/ardour/ardour/processor.h +++ b/libs/ardour/ardour/processor.h @@ -98,10 +98,10 @@ class Processor : public SessionObject, public AutomatableControls, public Laten void *get_gui () const { return _gui; } void set_gui (void *p) { _gui = p; } - static boost::signals2::signal<void(Processor*)> ProcessorCreated; + static PBD::Signal1<void,Processor*> ProcessorCreated; - boost::signals2::signal<void()> ActiveChanged; - boost::signals2::signal<void(ChanCount,ChanCount)> ConfigurationChanged; + PBD::Signal0<void> ActiveChanged; + PBD::Signal2<void,ChanCount,ChanCount> ConfigurationChanged; protected: int _pending_active; diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index a276fb19ee..4cae00c532 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -26,7 +26,7 @@ #include <boost/utility.hpp> #include "pbd/undo.h" -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "ardour/ardour.h" #include "ardour/data_type.h" @@ -49,10 +49,9 @@ enum RegionEditState { }; class Region - : public SessionObject - , public boost::noncopyable - , public boost::enable_shared_from_this<Region> - , public Readable + : public SessionObject + , public boost::enable_shared_from_this<Region> + , public Readable { public: typedef std::vector<boost::shared_ptr<Source> > SourceList; @@ -96,8 +95,8 @@ class Region static Change LayerChanged; static Change HiddenChanged; - boost::signals2::signal<void(Change)> StateChanged; - static boost::signals2::signal<void(boost::shared_ptr<ARDOUR::Region>)> RegionPropertyChanged; + PBD::Signal1<void,Change> StateChanged; + static PBD::Signal1<void,boost::shared_ptr<ARDOUR::Region> > RegionPropertyChanged; void unlock_property_changes () { _flags = Flag (_flags & ~DoNotSendPropertyChanges); } void block_property_changes () { _flags = Flag (_flags | DoNotSendPropertyChanges); } diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index 51858e4926..b53e9490de 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -40,7 +40,7 @@ class RegionFactory { itself, to permit dynamic_cast<> to be used to infer the type of Region. */ - static boost::signals2::signal<void(boost::shared_ptr<Region>)> CheckNewRegion; + static PBD::Signal1<void,boost::shared_ptr<Region> > CheckNewRegion; static boost::shared_ptr<Region> create (boost::shared_ptr<const Region>); diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index dd6173e963..9630975d1f 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -227,28 +227,28 @@ class Route : public SessionObject, public AutomatableControls, public RouteGrou void set_user_latency (nframes_t); nframes_t initial_delay() const { return _initial_delay; } - boost::signals2::signal<void()> active_changed; - boost::signals2::signal<void()> phase_invert_changed; - boost::signals2::signal<void()> denormal_protection_changed; - boost::signals2::signal<void(void*)> listen_changed; - boost::signals2::signal<void(void*)> solo_changed; - boost::signals2::signal<void(void*)> solo_safe_changed; - boost::signals2::signal<void(void*)> solo_isolated_changed; - boost::signals2::signal<void(void*)> comment_changed; - boost::signals2::signal<void(void*)> mute_changed; - boost::signals2::signal<void()> mute_points_changed; + PBD::Signal0<void> active_changed; + PBD::Signal0<void> phase_invert_changed; + PBD::Signal0<void> denormal_protection_changed; + PBD::Signal1<void,void*> listen_changed; + PBD::Signal1<void,void*> solo_changed; + PBD::Signal1<void,void*> solo_safe_changed; + PBD::Signal1<void,void*> solo_isolated_changed; + PBD::Signal1<void,void*> comment_changed; + PBD::Signal1<void,void*> mute_changed; + PBD::Signal0<void> mute_points_changed; /** the processors have changed; the parameter indicates what changed */ - boost::signals2::signal<void(RouteProcessorChange)> processors_changed; - boost::signals2::signal<void(void*)> record_enable_changed; + PBD::Signal1<void,RouteProcessorChange> processors_changed; + PBD::Signal1<void,void*> record_enable_changed; /** the metering point has changed */ - boost::signals2::signal<void(void*)> meter_change; - boost::signals2::signal<void()> signal_latency_changed; - boost::signals2::signal<void()> initial_delay_changed; + PBD::Signal1<void,void*> meter_change; + PBD::Signal0<void> signal_latency_changed; + PBD::Signal0<void> initial_delay_changed; /* gui's call this for their own purposes. */ - boost::signals2::signal<void(std::string,void*)> gui_changed; + PBD::Signal2<void,std::string,void*> gui_changed; /* stateful */ @@ -261,7 +261,7 @@ class Route : public SessionObject, public AutomatableControls, public RouteGrou int save_as_template (const std::string& path, const std::string& name); - boost::signals2::signal<void(void*)> SelectedChanged; + PBD::Signal1<void,void*> SelectedChanged; int listen_via (boost::shared_ptr<Route>, Placement p, bool active, bool aux); void drop_listen (boost::shared_ptr<Route>); @@ -306,10 +306,10 @@ class Route : public SessionObject, public AutomatableControls, public RouteGrou void set_remote_control_id (uint32_t id); uint32_t remote_control_id () const; - boost::signals2::signal<void()> RemoteControlIDChanged; + PBD::Signal0<void> RemoteControlIDChanged; void sync_order_keys (std::string const &); - static boost::signals2::signal<void(std::string const &)> SyncOrderKeys; + static PBD::Signal1<void,std::string const &> SyncOrderKeys; protected: friend class Session; diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h index fe4079050d..48b5cb52db 100644 --- a/libs/ardour/ardour/route_group.h +++ b/libs/ardour/ardour/route_group.h @@ -24,10 +24,10 @@ #include <set> #include <string> #include <stdint.h> -#include <boost/signals2.hpp> +#include "pbd/signals.h" #include "pbd/stateful.h" -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "ardour/types.h" @@ -128,8 +128,8 @@ public: boost::shared_ptr<RouteList> route_list() { return routes; } - boost::signals2::signal<void()> changed; - boost::signals2::signal<void(void*)> FlagsChanged; + PBD::Signal0<void> changed; + PBD::Signal1<void,void*> FlagsChanged; XMLNode& get_state (); diff --git a/libs/ardour/ardour/route_group_member.h b/libs/ardour/ardour/route_group_member.h index 8743423b18..824fd52bd3 100644 --- a/libs/ardour/ardour/route_group_member.h +++ b/libs/ardour/ardour/route_group_member.h @@ -33,7 +33,7 @@ class RouteGroupMember RouteGroup* route_group () const { return _route_group; } - boost::signals2::signal<void()> route_group_changed; + PBD::Signal0<void> route_group_changed; protected: RouteGroup* _route_group; diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 273f251f3d..7c6c83a121 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -38,7 +38,7 @@ #include "pbd/error.h" #include "pbd/rcu.h" #include "pbd/statefuldestructible.h" -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "pbd/undo.h" #include "midi++/mmc.h" @@ -118,7 +118,7 @@ class VSTPlugin; extern void setup_enum_writer (); -class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager, public boost::noncopyable +class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionList, public SessionEventManager { public: enum RecordState { @@ -164,14 +164,14 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void set_deletion_in_progress (); void clear_deletion_in_progress (); bool deletion_in_progress() const { return _state_of_the_state & Deletion; } - boost::signals2::signal<void()> DirtyChanged; + PBD::Signal0<void> DirtyChanged; const SessionDirectory& session_directory () const { return *(_session_dir.get()); } - static boost::signals2::signal<void()> AutoBindingOn; - static boost::signals2::signal<void()> AutoBindingOff; + static PBD::Signal0<void> AutoBindingOn; + static PBD::Signal0<void> AutoBindingOff; - static boost::signals2::signal<void(std::string)> Dialog; + static PBD::Signal1<void,std::string> Dialog; std::string sound_dir (bool with_path = true) const; std::string peak_dir () const; @@ -272,29 +272,29 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi /* Proxy signal for region hidden changes */ - boost::signals2::signal<void(boost::shared_ptr<Region>)> RegionHiddenChange; + PBD::Signal1<void,boost::shared_ptr<Region> > RegionHiddenChange; /* Emitted when all i/o connections are complete */ - boost::signals2::signal<void()> IOConnectionsComplete; + PBD::Signal0<void> IOConnectionsComplete; /* Record status signals */ - boost::signals2::signal<void()> RecordStateChanged; + PBD::Signal0<void> RecordStateChanged; /* Transport mechanism signals */ - boost::signals2::signal<void()> TransportStateChange; /* generic */ - boost::signals2::signal<void(nframes64_t)> PositionChanged; /* sent after any non-sequential motion */ - boost::signals2::signal<void()> DurationChanged; - boost::signals2::signal<void(nframes64_t)> Xrun; - boost::signals2::signal<void()> TransportLooped; + PBD::Signal0<void> TransportStateChange; /* generic */ + PBD::Signal1<void,nframes64_t> PositionChanged; /* sent after any non-sequential motion */ + PBD::Signal0<void> DurationChanged; + PBD::Signal1<void,nframes64_t> Xrun; + PBD::Signal0<void> TransportLooped; /** emitted when a locate has occurred */ - boost::signals2::signal<void()> Located; + PBD::Signal0<void> Located; - boost::signals2::signal<void(RouteList&)> RouteAdded; - boost::signals2::signal<void()> RouteGroupChanged; + PBD::Signal1<void,RouteList&> RouteAdded; + PBD::Signal0<void> RouteGroupChanged; void queue_event (SessionEvent*); @@ -348,9 +348,9 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi Locations *locations() { return &_locations; } - boost::signals2::signal<void(Location*)> auto_loop_location_changed; - boost::signals2::signal<void(Location*)> auto_punch_location_changed; - boost::signals2::signal<void()> locations_modified; + PBD::Signal1<void,Location*> auto_loop_location_changed; + PBD::Signal1<void,Location*> auto_punch_location_changed; + PBD::Signal0<void> locations_modified; void set_auto_punch_location (Location *); void set_auto_loop_location (Location *); @@ -375,8 +375,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi static int rename_template (std::string old_name, std::string new_name); static int delete_template (std::string name); - boost::signals2::signal<void(std::string)> StateSaved; - boost::signals2::signal<void()> StateReady; + PBD::Signal1<void,std::string> StateSaved; + PBD::Signal0<void> StateReady; std::vector<std::string*>* possible_states() const; static std::vector<std::string*>* possible_states (std::string path); @@ -406,8 +406,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi RouteGroup *route_group_by_name (std::string); - boost::signals2::signal<void(RouteGroup*)> route_group_added; - boost::signals2::signal<void()> route_group_removed; + PBD::Signal1<void,RouteGroup*> route_group_added; + PBD::Signal0<void> route_group_removed; void foreach_route_group (boost::function<void(RouteGroup*)> f) { for (std::list<RouteGroup *>::iterator i = _route_groups.begin(); i != _route_groups.end(); i++) { @@ -476,9 +476,9 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi nframes_t convert_to_frames_at (nframes_t position, AnyTime const &); - static boost::signals2::signal<void()> StartTimeChanged; - static boost::signals2::signal<void()> EndTimeChanged; - static boost::signals2::signal<void()> TimecodeOffsetChanged; + static PBD::Signal0<void> StartTimeChanged; + static PBD::Signal0<void> EndTimeChanged; + static PBD::Signal0<void> TimecodeOffsetChanged; std::vector<SyncSource> get_available_sync_options() const; void request_sync_source (Slave*); @@ -496,15 +496,15 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi TempoMap& tempo_map() { return *_tempo_map; } /// signals the current transport position in frames, bbt and timecode time (in that order) - boost::signals2::signal<void(const nframes_t&, const BBT_Time&, const Timecode::Time&)> tick; + PBD::Signal3<void,const nframes_t&, const BBT_Time&, const Timecode::Time&> tick; /* region info */ void add_regions (std::vector<boost::shared_ptr<Region> >&); - boost::signals2::signal<void(boost::weak_ptr<Region>)> RegionAdded; - boost::signals2::signal<void(std::vector<boost::weak_ptr<Region> >&)> RegionsAdded; - boost::signals2::signal<void(boost::weak_ptr<Region>)> RegionRemoved; + PBD::Signal1<void,boost::weak_ptr<Region> > RegionAdded; + PBD::Signal1<void,std::vector<boost::weak_ptr<Region> >&> RegionsAdded; + PBD::Signal1<void,boost::weak_ptr<Region> > RegionRemoved; int region_name (std::string& result, std::string base = std::string(""), bool newlevel = false); std::string new_region_name (std::string); @@ -529,9 +529,9 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi int start_audio_export (nframes_t position, bool realtime); - boost::signals2::signal<int(nframes_t)> ProcessExport; - boost::signals2::signal<void()> ExportReadFinished; - static boost::signals2::signal<void(std::string, std::string)> Exported; + PBD::Signal1<int,nframes_t> ProcessExport; + PBD::Signal0<void> ExportReadFinished; + static PBD::Signal2<void,std::string, std::string> Exported; void add_source (boost::shared_ptr<Source>); void remove_source (boost::weak_ptr<Source>); @@ -548,16 +548,16 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi 0 for "yes, delete this playlist", 1 for "no, don't delete this playlist". */ - boost::signals2::signal<void(boost::shared_ptr<Playlist>)> AskAboutPlaylistDeletion; + PBD::Signal1<void,boost::shared_ptr<Playlist> > AskAboutPlaylistDeletion; /** handlers should return 0 for "ignore the rate mismatch", !0 for "do not use this session" */ - static boost::signals2::signal<int(nframes_t, nframes_t)> AskAboutSampleRateMismatch; + static PBD::Signal2<int,nframes_t, nframes_t> AskAboutSampleRateMismatch; /** handlers should return !0 for use pending state, 0 for ignore it. */ - static boost::signals2::signal<int()> AskAboutPendingState; + static PBD::Signal0<int> AskAboutPendingState; boost::shared_ptr<AudioFileSource> create_audio_source_for_session (ARDOUR::AudioDiskstream&, uint32_t which_channel, bool destructive); @@ -575,8 +575,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void remove_named_selection (NamedSelection *); template<class T> void foreach_named_selection (T& obj, void (T::*func)(NamedSelection&)); - boost::signals2::signal<void()> NamedSelectionAdded; - boost::signals2::signal<void()> NamedSelectionRemoved; + PBD::Signal0<void> NamedSelectionAdded; + PBD::Signal0<void> NamedSelectionRemoved; /* Curves and AutomationLists (TODO when they go away) */ void add_automation_list(AutomationList*); @@ -595,7 +595,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void cancel_audition (); bool is_auditioning () const; - boost::signals2::signal<void(bool)> AuditionActive; + PBD::Signal1<void,bool> AuditionActive; /* flattening stuff */ @@ -617,8 +617,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void set_listen (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false); void set_record_enable (boost::shared_ptr<RouteList>, bool, SessionEvent::RTeventCallback after = rt_cleanup, bool group_override = false); - boost::signals2::signal<void(bool)> SoloActive; - boost::signals2::signal<void()> SoloChanged; + PBD::Signal1<void,bool> SoloActive; + PBD::Signal0<void> SoloChanged; /* control/master out */ @@ -656,8 +656,8 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void remove_bundle (boost::shared_ptr<Bundle>); boost::shared_ptr<Bundle> bundle_by_name (std::string) const; - boost::signals2::signal<void(boost::shared_ptr<Bundle>)> BundleAdded; - boost::signals2::signal<void(boost::shared_ptr<Bundle>)> BundleRemoved; + PBD::Signal1<void,boost::shared_ptr<Bundle> > BundleAdded; + PBD::Signal1<void,boost::shared_ptr<Bundle> > BundleRemoved; /* MIDI control */ @@ -671,10 +671,10 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi MIDI::Port *midi_port() const { return _midi_port; } MIDI::Port *midi_clock_port() const { return _midi_clock_port; } - boost::signals2::signal<void()> MTC_PortChanged; - boost::signals2::signal<void()> MMC_PortChanged; - boost::signals2::signal<void()> MIDI_PortChanged; - boost::signals2::signal<void()> MIDIClock_PortChanged; + PBD::Signal0<void> MTC_PortChanged; + PBD::Signal0<void> MMC_PortChanged; + PBD::Signal0<void> MIDI_PortChanged; + PBD::Signal0<void> MIDIClock_PortChanged; void set_trace_midi_input (bool, MIDI::Port* port = 0); void set_trace_midi_output (bool, MIDI::Port* port = 0); @@ -691,7 +691,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void stop_scrub (); void set_scrub_speed (float); nframes_t scrub_buffer_size() const; - boost::signals2::signal<void()> ScrubReady; + PBD::Signal0<void> ScrubReady; /* History (for editors, mixers, UIs etc.) */ @@ -765,7 +765,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi void* ptr, float opt); - static boost::signals2::signal<void()> SendFeedback; + static PBD::Signal0<void> SendFeedback; /* Controllables */ @@ -943,7 +943,7 @@ class Session : public PBD::StatefulDestructible, public PBD::ScopedConnectionLi int stop_audio_export (); void finalize_audio_export (); - boost::signals2::scoped_connection export_freewheel_connection; + PBD::ScopedConnection export_freewheel_connection; void prepare_diskstreams (); void commit_diskstreams (nframes_t, bool& session_requires_butler); diff --git a/libs/ardour/ardour/session_handle.h b/libs/ardour/ardour/session_handle.h index c747ee9976..87c6fb6670 100644 --- a/libs/ardour/ardour/session_handle.h +++ b/libs/ardour/ardour/session_handle.h @@ -20,7 +20,7 @@ #ifndef __libardour_session_handle_h__ #define __libardour_session_handle_h__ -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" namespace ARDOUR { class Session; diff --git a/libs/ardour/ardour/session_object.h b/libs/ardour/ardour/session_object.h index eb1a7c3e30..47caab5475 100644 --- a/libs/ardour/ardour/session_object.h +++ b/libs/ardour/ardour/session_object.h @@ -22,7 +22,7 @@ #include <string> #include "pbd/statefuldestructible.h" -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "ardour/session_handle.h" @@ -53,7 +53,7 @@ class SessionObject : public SessionHandleRef, public PBD::StatefulDestructible return true; } - boost::signals2::signal<void()> NameChanged; + PBD::Signal0<void> NameChanged; protected: std::string _name; diff --git a/libs/ardour/ardour/session_playlists.h b/libs/ardour/ardour/session_playlists.h index 8870794cc0..db29ee8c05 100644 --- a/libs/ardour/ardour/session_playlists.h +++ b/libs/ardour/ardour/session_playlists.h @@ -27,7 +27,7 @@ #include <boost/shared_ptr.hpp> #include <boost/function.hpp> -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" class XMLNode; diff --git a/libs/ardour/ardour/slave.h b/libs/ardour/ardour/slave.h index 4fe8e1ec46..1cc73474d7 100644 --- a/libs/ardour/ardour/slave.h +++ b/libs/ardour/ardour/slave.h @@ -27,7 +27,7 @@ #include <jack/jack.h> -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "ardour/types.h" #include "midi++/parser.h" @@ -242,7 +242,7 @@ class MTC_Slave : public Slave { private: Session& session; MIDI::Port* port; - PBD::ScopedConnectionList* port_connections; + PBD::ScopedConnectionList port_connections; bool can_notify_on_unknown_rate; PIChaser* pic; @@ -303,7 +303,7 @@ class MIDIClock_Slave : public Slave { private: ISlaveSessionProxy* session; MIDI::Port* port; - PBD::ScopedConnectionList* port_connections; + PBD::ScopedConnectionList port_connections; /// pulses per quarter note for one MIDI clock frame (default 24) int ppqn; diff --git a/libs/ardour/ardour/sndfilesource.h b/libs/ardour/ardour/sndfilesource.h index 45d535e916..95829769f6 100644 --- a/libs/ardour/ardour/sndfilesource.h +++ b/libs/ardour/ardour/sndfilesource.h @@ -98,6 +98,7 @@ class SndFileSource : public AudioFileSource { nframes_t destructive_write_unlocked (Sample *dst, nframes_t cnt); nframes_t nondestructive_write_unlocked (Sample *dst, nframes_t cnt); void handle_header_position_change (); + PBD::ScopedConnection header_position_connection; }; } // namespace ARDOUR diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index a7a6e2207c..b91d8f129c 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -35,7 +35,7 @@ namespace ARDOUR { class Session; -class Source : public SessionObject, public boost::noncopyable +class Source : public SessionObject { public: enum Flag { @@ -81,15 +81,15 @@ class Source : public SessionObject, public boost::noncopyable virtual bool set_destructive (bool /*yn*/) { return false; } virtual bool length_mutable() const { return false; } - static boost::signals2::signal<void(Source*)> SourceCreated; - boost::signals2::signal<void(boost::shared_ptr<Source>)> Switched; + static PBD::Signal1<void,Source*> SourceCreated; + PBD::Signal1<void,boost::shared_ptr<Source> > Switched; bool has_been_analysed() const; virtual bool can_be_analysed() const { return false; } virtual void set_been_analysed (bool yn); virtual bool check_for_analysis_data_on_disk(); - boost::signals2::signal<void()> AnalysisChanged; + PBD::Signal0<void> AnalysisChanged; AnalysisFeatureList transients; std::string get_transients_path() const; diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h index 4da285e980..c32b96ae97 100644 --- a/libs/ardour/ardour/source_factory.h +++ b/libs/ardour/ardour/source_factory.h @@ -37,7 +37,7 @@ class SourceFactory { public: static void init (); - static boost::signals2::signal<void(boost::shared_ptr<Source>)> SourceCreated; + static PBD::Signal1<void,boost::shared_ptr<Source> > SourceCreated; static boost::shared_ptr<Source> create (Session&, const XMLNode& node, bool async = false); static boost::shared_ptr<Source> createSilent (Session&, const XMLNode& node, diff --git a/libs/ardour/ardour/tempo.h b/libs/ardour/ardour/tempo.h index ba7bbbcf7e..9fe6f1fee5 100644 --- a/libs/ardour/ardour/tempo.h +++ b/libs/ardour/ardour/tempo.h @@ -258,7 +258,7 @@ class TempoMap : public PBD::StatefulDestructible nframes_t frame_rate () const { return _frame_rate; } - boost::signals2::signal<void(ARDOUR::Change)> StateChanged; + PBD::Signal1<void,ARDOUR::Change> StateChanged; private: static Tempo _default_tempo; diff --git a/libs/ardour/ardour/ticker.h b/libs/ardour/ardour/ticker.h index 9a26d4d3ff..e133ad5d23 100644 --- a/libs/ardour/ardour/ticker.h +++ b/libs/ardour/ardour/ticker.h @@ -20,7 +20,7 @@ #include "midi++/jack.h" -#include "pbd/scoped_connections.h" +#include "pbd/signals.h" #include "ardour/types.h" #include "ardour/session_handle.h" diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 82b4f701b4..0ed4b8c70b 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -43,7 +43,7 @@ class Track : public Route TrackMode mode () const { return _mode; } virtual int set_mode (TrackMode /*m*/) { return false; } virtual bool can_use_mode (TrackMode /*m*/, bool& /*bounce_required*/) { return false; } - boost::signals2::signal<void()> TrackModeChanged; + PBD::Signal0<void> TrackModeChanged; virtual int no_roll (nframes_t nframes, sframes_t start_frame, sframes_t end_frame, bool state_changing, bool can_record, bool rec_monitors_input); @@ -90,8 +90,8 @@ class Track : public Route bool record_enabled() const; void set_record_enable (bool yn, void *src); - boost::signals2::signal<void()> DiskstreamChanged; - boost::signals2::signal<void()> FreezeChange; + PBD::Signal0<void> DiskstreamChanged; + PBD::Signal0<void> FreezeChange; protected: Track (Session& sess, const XMLNode& node, DataType default_type = DataType::AUDIO); |