diff --git a/libs/ardour/ardour/analysis_graph.h b/libs/ardour/ardour/analysis_graph.h index ad9fb0fc0d..898754fd2f 100644 --- a/libs/ardour/ardour/analysis_graph.h +++ b/libs/ardour/ardour/analysis_graph.h @@ -58,7 +58,7 @@ class LIBARDOUR_API AnalysisGraph { bool canceled () const { return _canceled; } void set_total_samples (samplecnt_t p) { _samples_end = p; } - PBD::Signal2 Progress; + PBD::Signal Progress; private: ARDOUR::Session* _session; diff --git a/libs/ardour/ardour/ardour.h b/libs/ardour/ardour/ardour.h index 43abeb99af..892182bd69 100644 --- a/libs/ardour/ardour/ardour.h +++ b/libs/ardour/ardour/ardour.h @@ -50,11 +50,11 @@ namespace ARDOUR { class AudioEngine; class Session; - extern LIBARDOUR_API PBD::Signal1 BootMessage; - extern LIBARDOUR_API PBD::Signal3 PluginScanMessage; - extern LIBARDOUR_API PBD::Signal1 PluginScanTimeout; - extern LIBARDOUR_API PBD::Signal0 GUIIdle; - extern LIBARDOUR_API PBD::Signal3 CopyConfigurationFiles; + extern LIBARDOUR_API PBD::Signal BootMessage; + extern LIBARDOUR_API PBD::Signal PluginScanMessage; + extern LIBARDOUR_API PBD::Signal PluginScanTimeout; + extern LIBARDOUR_API PBD::Signal GUIIdle; + extern LIBARDOUR_API PBD::Signal CopyConfigurationFiles; extern LIBARDOUR_API std::map reserved_io_names; extern LIBARDOUR_API float ui_scale_factor; diff --git a/libs/ardour/ardour/audioengine.h b/libs/ardour/ardour/audioengine.h index 3941396ee6..13b6ba5857 100644 --- a/libs/ardour/ardour/audioengine.h +++ b/libs/ardour/ardour/audioengine.h @@ -159,39 +159,39 @@ class LIBARDOUR_API AudioEngine : public PortManager, public SessionHandlePtr (the regular process() call to session->process() is not made) */ - PBD::Signal1 Freewheel; + PBD::Signal Freewheel; - PBD::Signal0 Xrun; + PBD::Signal Xrun; /** this signal is emitted if the sample rate changes */ - PBD::Signal1 SampleRateChanged; + PBD::Signal SampleRateChanged; /** this signal is emitted if the buffer size changes */ - PBD::Signal1 BufferSizeChanged; + PBD::Signal BufferSizeChanged; /** this signal is emitted if the device cannot operate properly */ - PBD::Signal0 DeviceError; + PBD::Signal DeviceError; /* this signal is emitted if the device list changed */ - PBD::Signal0 DeviceListChanged; + PBD::Signal DeviceListChanged; /* this signal is sent if the backend ever disconnects us */ - PBD::Signal1 Halted; + PBD::Signal Halted; /* these two are emitted when the engine itself is started and stopped */ - PBD::Signal1 Running; - PBD::Signal0 Stopped; + PBD::Signal Running; + PBD::Signal Stopped; /* these two are emitted when a device reset is initiated/finished */ - PBD::Signal0 DeviceResetStarted; - PBD::Signal0 DeviceResetFinished; + PBD::Signal DeviceResetStarted; + PBD::Signal DeviceResetFinished; static AudioEngine* instance() { return _instance; } static void destroy(); @@ -242,7 +242,7 @@ class LIBARDOUR_API AudioEngine : public PortManager, public SessionHandlePtr * value. */ - PBD::Signal0 BecameSilent; + PBD::Signal BecameSilent; void reset_silence_countdown (); void add_pending_port_deletion (Port*); diff --git a/libs/ardour/ardour/audiofilesource.h b/libs/ardour/ardour/audiofilesource.h index 2ccbad390b..fac0f4313c 100644 --- a/libs/ardour/ardour/audiofilesource.h +++ b/libs/ardour/ardour/audiofilesource.h @@ -78,7 +78,7 @@ public: static void set_bwf_serial_number (int); static void set_header_position_offset (samplecnt_t offset); - static PBD::Signal0 HeaderPositionOffsetChanged; + static PBD::Signal HeaderPositionOffsetChanged; protected: /** Constructor to be called for existing external-to-session files */ diff --git a/libs/ardour/ardour/audiosource.h b/libs/ardour/ardour/audiosource.h index 6a6b36db47..a92b00fc47 100644 --- a/libs/ardour/ardour/audiosource.h +++ b/libs/ardour/ardour/audiosource.h @@ -69,8 +69,8 @@ class LIBARDOUR_API AudioSource : virtual public Source, public ARDOUR::AudioRea int build_peaks (); bool peaks_ready (boost::function callWhenReady, PBD::ScopedConnection** connection_created_if_not_ready, PBD::EventLoop* event_loop) const; - mutable PBD::Signal0 PeaksReady; - mutable PBD::Signal2 PeakRangeReady; + mutable PBD::Signal PeaksReady; + mutable PBD::Signal PeakRangeReady; XMLNode& get_state () const; int set_state (const XMLNode&, int version); diff --git a/libs/ardour/ardour/auditioner.h b/libs/ardour/ardour/auditioner.h index 76c1d30b09..c54d95061a 100644 --- a/libs/ardour/ardour/auditioner.h +++ b/libs/ardour/ardour/auditioner.h @@ -70,7 +70,7 @@ public: virtual ChanCount input_streams () const; - PBD::Signal2 AuditionProgress; + PBD::Signal AuditionProgress; /* Track */ int roll (pframes_t nframes, samplepos_t start_sample, samplepos_t end_sample, bool& need_butler); diff --git a/libs/ardour/ardour/automatable.h b/libs/ardour/ardour/automatable.h index 3b0fb9f35b..ae6aaa7b47 100644 --- a/libs/ardour/ardour/automatable.h +++ b/libs/ardour/ardour/automatable.h @@ -116,7 +116,7 @@ public: int set_automation_xml_state (const XMLNode&, Evoral::Parameter default_param); XMLNode& get_automation_xml_state() const; - PBD::Signal0 AutomationStateChanged; + PBD::Signal AutomationStateChanged; void start_domain_bounce (Temporal::DomainBounceInfo&); void finish_domain_bounce (Temporal::DomainBounceInfo&); diff --git a/libs/ardour/ardour/automation_list.h b/libs/ardour/ardour/automation_list.h index 2115d4b356..b8ad0632d7 100644 --- a/libs/ardour/ardour/automation_list.h +++ b/libs/ardour/ardour/automation_list.h @@ -89,7 +89,7 @@ public: void set_automation_state (AutoState); AutoState automation_state() const; - PBD::Signal1 automation_state_changed; + PBD::Signal automation_state_changed; bool automation_playback() const { return (_state & Play) || ((_state & (Touch | Latch)) && !touching()); @@ -98,9 +98,9 @@ public: return ((_state & Write) || ((_state & (Touch | Latch)) && touching())); } - PBD::Signal0 StateChanged; + PBD::Signal StateChanged; - static PBD::Signal1 AutomationListCreated; + static PBD::Signal AutomationListCreated; void start_write_pass (timepos_t const & when); void write_pass_finished (timepos_t const & when, double thinning_factor=0.0); diff --git a/libs/ardour/ardour/bundle.h b/libs/ardour/ardour/bundle.h index 9c4c91a1f1..c6e93edbca 100644 --- a/libs/ardour/ardour/bundle.h +++ b/libs/ardour/ardour/bundle.h @@ -137,7 +137,7 @@ class LIBARDOUR_API Bundle : public PBD::ScopedConnectionList DirectionChanged = 0x10 ///< the direction (whether ports are inputs or outputs) has changed }; - PBD::Signal1 Changed; + PBD::Signal Changed; protected: diff --git a/libs/ardour/ardour/clip_library.h b/libs/ardour/ardour/clip_library.h index 4dfa031784..a91f1b83b4 100644 --- a/libs/ardour/ardour/clip_library.h +++ b/libs/ardour/ardour/clip_library.h @@ -33,7 +33,7 @@ namespace ARDOUR { class Region; -extern LIBARDOUR_API PBD::Signal2 LibraryClipAdded; +extern LIBARDOUR_API PBD::Signal LibraryClipAdded; LIBARDOUR_API std::string clip_library_dir (bool create_if_missing = false); LIBARDOUR_API bool export_to_clip_library (std::shared_ptr r, void* src = NULL); diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h index 01576bf5a2..6a235c129b 100644 --- a/libs/ardour/ardour/control_protocol_manager.h +++ b/libs/ardour/ardour/control_protocol_manager.h @@ -87,10 +87,10 @@ class LIBARDOUR_API ControlProtocolManager : public PBD::Stateful, public ARDOUR int set_state (const XMLNode&, int version); XMLNode& get_state () const; - PBD::Signal1 ProtocolStatusChange; + PBD::Signal ProtocolStatusChange; void stripable_selection_changed (ARDOUR::StripableNotificationListPtr); - static PBD::Signal1 StripableSelectionChanged; + static PBD::Signal StripableSelectionChanged; private: ControlProtocolManager (); diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index 4e2efc997c..4cba84788a 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -96,7 +96,7 @@ public: BufferSet& output_buffers() { return *_output_buffers; } - PBD::Signal0 MuteChange; + PBD::Signal MuteChange; int set_state (const XMLNode&, int version); @@ -153,7 +153,7 @@ private: std::shared_ptr _polarity_control; static bool panners_legal; - static PBD::Signal0 PannersLegal; + static PBD::Signal PannersLegal; void panners_became_legal (); PBD::ScopedConnection panner_legal_c; diff --git a/libs/ardour/ardour/disk_io.h b/libs/ardour/ardour/disk_io.h index 8337dd82b8..2a421570e4 100644 --- a/libs/ardour/ardour/disk_io.h +++ b/libs/ardour/ardour/disk_io.h @@ -87,8 +87,8 @@ public: bool slaved() const { return _slaved; } void set_slaved(bool yn) { _slaved = yn; } - PBD::Signal0 SpeedChanged; - PBD::Signal0 ReverseChanged; + PBD::Signal SpeedChanged; + PBD::Signal ReverseChanged; int set_state (const XMLNode&, int version); diff --git a/libs/ardour/ardour/disk_reader.h b/libs/ardour/ardour/disk_reader.h index 29d5c2164f..212cc39999 100644 --- a/libs/ardour/ardour/disk_reader.h +++ b/libs/ardour/ardour/disk_reader.h @@ -69,7 +69,7 @@ public: LIBARDOUR_API int set_state (const XMLNode&, int version); - PBD::Signal0 AlignmentStyleChanged; + PBD::Signal AlignmentStyleChanged; LIBARDOUR_API float buffer_load () const; @@ -96,7 +96,7 @@ public: LIBARDOUR_API void internal_playback_seek (sampleoffset_t distance); LIBARDOUR_API int seek (samplepos_t sample, bool complete_refill = false); - LIBARDOUR_API static PBD::Signal0 Underrun; + LIBARDOUR_API static PBD::Signal Underrun; LIBARDOUR_API void playlist_modified (); LIBARDOUR_API void reset_tracker (); diff --git a/libs/ardour/ardour/disk_writer.h b/libs/ardour/ardour/disk_writer.h index 71f930138d..9ee8f50687 100644 --- a/libs/ardour/ardour/disk_writer.h +++ b/libs/ardour/ardour/disk_writer.h @@ -79,7 +79,7 @@ public: AlignStyle alignment_style () const { return _alignment_style; } void set_align_style (AlignStyle, bool force = false); - PBD::Signal0 AlignmentStyleChanged; + PBD::Signal AlignmentStyleChanged; bool configure_io (ChanCount in, ChanCount out); @@ -103,7 +103,7 @@ public: int seek (samplepos_t sample, bool complete_refill); - static PBD::Signal0 Overrun; + static PBD::Signal Overrun; void set_note_mode (NoteMode m); @@ -111,10 +111,10 @@ public: * Parameter is the source that it is destined for. * A caller can get a copy of the data with get_gui_feed_buffer () */ - PBD::Signal1 > DataRecorded; + PBD::Signal )> DataRecorded; - PBD::Signal0 RecordEnableChanged; - PBD::Signal0 RecordSafeChanged; + PBD::Signal RecordEnableChanged; + PBD::Signal RecordSafeChanged; void transport_looped (samplepos_t transport_sample); void transport_stopped_wallclock (struct tm&, time_t, bool abort); diff --git a/libs/ardour/ardour/element_importer.h b/libs/ardour/ardour/element_importer.h index 2e0f0ff5a0..c0b4a339cd 100644 --- a/libs/ardour/ardour/element_importer.h +++ b/libs/ardour/ardour/element_importer.h @@ -73,10 +73,10 @@ class LIBARDOUR_API ElementImporter bool broken () { return _broken; } /// Signal that requests for anew name - static PBD::Signal2,std::string, std::string> Rename; + static PBD::Signal(std::string, std::string)> Rename; /// Signal for ok/cancel prompting - static PBD::Signal1 Prompt; + static PBD::Signal Prompt; protected: diff --git a/libs/ardour/ardour/export_format_base.h b/libs/ardour/ardour/export_format_base.h index a9393f704d..4613742acd 100644 --- a/libs/ardour/ardour/export_format_base.h +++ b/libs/ardour/ardour/export_format_base.h @@ -126,8 +126,8 @@ class LIBARDOUR_API ExportFormatBase { : _selected (false), _compatible (true) { } ~SelectableCompatible () {} - PBD::Signal1 SelectChanged; - PBD::Signal1 CompatibleChanged; + PBD::Signal SelectChanged; + PBD::Signal 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 341e0aea93..5dc56e0a05 100644 --- a/libs/ardour/ardour/export_format_manager.h +++ b/libs/ardour/ardour/export_format_manager.h @@ -84,8 +84,8 @@ class LIBARDOUR_API ExportFormatManager : public PBD::ScopedConnectionList /* Signals */ - PBD::Signal1 CompleteChanged; - PBD::Signal0 DescriptionChanged; + PBD::Signal CompleteChanged; + PBD::Signal DescriptionChanged; /* Access to lists */ diff --git a/libs/ardour/ardour/export_formats.h b/libs/ardour/ardour/export_formats.h index dbed0ed089..5dd931b5e9 100644 --- a/libs/ardour/ardour/export_formats.h +++ b/libs/ardour/ardour/export_formats.h @@ -214,11 +214,11 @@ public: DitherTypePtr get_selected_dither_type (); /* Proxies for signals from sample formats and dither types */ - PBD::Signal2 SampleFormatSelectChanged; - PBD::Signal2 SampleFormatCompatibleChanged; + PBD::Signal SampleFormatSelectChanged; + PBD::Signal SampleFormatCompatibleChanged; - PBD::Signal2 DitherTypeSelectChanged; - PBD::Signal2 DitherTypeCompatibleChanged; + PBD::Signal DitherTypeSelectChanged; + PBD::Signal 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 a5806204d2..065f641d2c 100644 --- a/libs/ardour/ardour/export_handler.h +++ b/libs/ardour/ardour/export_handler.h @@ -116,7 +116,7 @@ class LIBARDOUR_API ExportHandler : public ExportElementFactory, public sigc::tr /** signal emitted when soundcloud export reports progress updates during upload. * The parameters are total and current bytes downloaded, and the current filename */ - PBD::Signal3 SoundcloudProgress; + PBD::Signal SoundcloudProgress; /* upload credentials & preferences */ std::string soundcloud_username; diff --git a/libs/ardour/ardour/export_multiplication.h b/libs/ardour/ardour/export_multiplication.h index a02d273abf..35979aab04 100644 --- a/libs/ardour/ardour/export_multiplication.h +++ b/libs/ardour/ardour/export_multiplication.h @@ -54,7 +54,7 @@ bool selected () const { return _selected; } void select (bool value); - PBD::Signal1 SelectChanged; + PBD::Signal SelectChanged; protected: @@ -169,7 +169,7 @@ void split_node (GraphNode * node, float position); void remove_node (GraphNode * node); - PBD::Signal0 GraphChanged; + PBD::Signal GraphChanged; private: diff --git a/libs/ardour/ardour/export_profile_manager.h b/libs/ardour/ardour/export_profile_manager.h index 41f21847a3..1cd14c46e6 100644 --- a/libs/ardour/ardour/export_profile_manager.h +++ b/libs/ardour/ardour/export_profile_manager.h @@ -217,7 +217,7 @@ public: ExportFormatSpecPtr get_new_format (ExportFormatSpecPtr original); - PBD::Signal0 FormatListChanged; + PBD::Signal FormatListChanged; private: FormatStateList formats; diff --git a/libs/ardour/ardour/export_status.h b/libs/ardour/ardour/export_status.h index b6370c9481..a7300e75e2 100644 --- a/libs/ardour/ardour/export_status.h +++ b/libs/ardour/ardour/export_status.h @@ -53,7 +53,7 @@ class LIBARDOUR_API ExportStatus { } Glib::Threads::Mutex& lock () { return _run_lock; } - PBD::Signal1 Finished; + PBD::Signal Finished; void finish (TransportRequestSource); void cleanup (); diff --git a/libs/ardour/ardour/file_source.h b/libs/ardour/ardour/file_source.h index b6ec2edc6c..a63b447f92 100644 --- a/libs/ardour/ardour/file_source.h +++ b/libs/ardour/ardour/file_source.h @@ -85,7 +85,7 @@ public: virtual void set_path (const std::string&); void replace_file (const std::string&); - static PBD::Signal2 > AmbiguousFileName; + static PBD::Signal )> AmbiguousFileName; void existence_check (); virtual void prevent_deletion (); diff --git a/libs/ardour/ardour/instrument_info.h b/libs/ardour/ardour/instrument_info.h index 23080093f4..fe5434f9ae 100644 --- a/libs/ardour/ardour/instrument_info.h +++ b/libs/ardour/ardour/instrument_info.h @@ -72,7 +72,7 @@ public: size_t master_controller_count () const; uint16_t channels_for_control_list (std::string const& ctrl_name_list) const; - PBD::Signal0 Changed; + PBD::Signal Changed; bool have_custom_plugin_info () const; diff --git a/libs/ardour/ardour/internal_send.h b/libs/ardour/ardour/internal_send.h index cd5118f01a..7e814a3a41 100644 --- a/libs/ardour/ardour/internal_send.h +++ b/libs/ardour/ardour/internal_send.h @@ -60,7 +60,7 @@ public: void set_can_pan (bool yn); uint32_t pan_outs () const; - static PBD::Signal1 CycleStart; + static PBD::Signal CycleStart; protected: XMLNode& state() const; diff --git a/libs/ardour/ardour/io.h b/libs/ardour/ardour/io.h index 88e84178cf..48cf3dc76e 100644 --- a/libs/ardour/ardour/io.h +++ b/libs/ardour/ardour/io.h @@ -148,7 +148,7 @@ public: * IOChange contains ConfigurationChanged. In other cases, * the process lock status is undefined. */ - PBD::Signal2 changed; + PBD::Signal changed; XMLNode& get_state () const; @@ -179,9 +179,9 @@ public: * can attach to this, and return `true' if they want to prevent * the change from happening. */ - PBD::Signal1 PortCountChanging; + PBD::SignalWithCombiner PortCountChanging; - static PBD::Signal1 PortCountChanged; // emitted when the number of ports changes + static PBD::Signal 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&); diff --git a/libs/ardour/ardour/io_processor.h b/libs/ardour/ardour/io_processor.h index c181f6d266..0c9a953f48 100644 --- a/libs/ardour/ardour/io_processor.h +++ b/libs/ardour/ardour/io_processor.h @@ -72,8 +72,8 @@ public: virtual bool feeds (std::shared_ptr other) const; - PBD::Signal2 AutomationPlaybackChanged; - PBD::Signal2 AutomationChanged; + PBD::Signal AutomationPlaybackChanged; + PBD::Signal AutomationChanged; XMLNode& state () const; int set_state (const XMLNode&, int version); diff --git a/libs/ardour/ardour/latent.h b/libs/ardour/ardour/latent.h index a06b1392a7..edf798cf26 100644 --- a/libs/ardour/ardour/latent.h +++ b/libs/ardour/ardour/latent.h @@ -83,8 +83,8 @@ public: return _zero_latency; } - static PBD::Signal0 DisableSwitchChanged; - PBD::Signal0 LatencyChanged; + static PBD::Signal DisableSwitchChanged; + PBD::Signal LatencyChanged; protected: int set_state (const XMLNode& node, int version); diff --git a/libs/ardour/ardour/location.h b/libs/ardour/ardour/location.h index 38047fc487..47eaaaa22f 100644 --- a/libs/ardour/ardour/location.h +++ b/libs/ardour/ardour/location.h @@ -143,32 +143,32 @@ public: * locations at once. */ - static PBD::Signal1 name_changed; - static PBD::Signal1 end_changed; - static PBD::Signal1 start_changed; - static PBD::Signal1 flags_changed; - static PBD::Signal1 lock_changed; - static PBD::Signal1 cue_change; - static PBD::Signal1 scene_changed; - static PBD::Signal1 time_domain_changed; /* unused */ + static PBD::Signal name_changed; + static PBD::Signal end_changed; + static PBD::Signal start_changed; + static PBD::Signal flags_changed; + static PBD::Signal lock_changed; + static PBD::Signal cue_change; + static PBD::Signal scene_changed; + static PBD::Signal time_domain_changed; /* unused */ /* this is sent only when both start and end change at the same time */ - static PBD::Signal1 changed; + static PBD::Signal changed; /* these are member signals for objects that care only about * changes to this object */ - PBD::Signal0 Changed; + PBD::Signal Changed; - PBD::Signal0 NameChanged; - PBD::Signal0 EndChanged; - PBD::Signal0 StartChanged; - PBD::Signal0 FlagsChanged; - PBD::Signal0 LockChanged; - PBD::Signal0 CueChanged; - PBD::Signal0 SceneChanged; /* unused */ - PBD::Signal0 TimeDomainChanged; + PBD::Signal NameChanged; + PBD::Signal EndChanged; + PBD::Signal StartChanged; + PBD::Signal FlagsChanged; + PBD::Signal LockChanged; + PBD::Signal CueChanged; + PBD::Signal SceneChanged; /* unused */ + PBD::Signal TimeDomainChanged; /* CD Track / CD-Text info */ @@ -334,15 +334,15 @@ public: void time_domain_changed (); - PBD::Signal1 current_changed; + PBD::Signal current_changed; /* Objects that care about individual addition and removal of Locations should connect to added/removed. * If an object additionally cares about potential mass clearance of Locations, they should connect to changed. */ - PBD::Signal1 added; - PBD::Signal1 removed; - PBD::Signal0 changed; /* emitted when any action that could have added/removed more than 1 location actually removed 1 or more */ + PBD::Signal added; + PBD::Signal removed; + PBD::Signal changed; /* emitted when any action that could have added/removed more than 1 location actually removed 1 or more */ template void apply (T& obj, void (T::*method)(const LocationList&)) const { /* We don't want to hold the lock while the given method runs, so take a copy diff --git a/libs/ardour/ardour/luascripting.h b/libs/ardour/ardour/luascripting.h index 1b4101846f..b83f68c9c9 100644 --- a/libs/ardour/ardour/luascripting.h +++ b/libs/ardour/ardour/luascripting.h @@ -116,7 +116,7 @@ public: LuaScriptList &scripts (LuaScriptInfo::ScriptType); void refresh (bool run_scan = false); - PBD::Signal0 scripts_changed; + PBD::Signal scripts_changed; LuaScriptInfoPtr by_name (const std::string&, LuaScriptInfo::ScriptType); diff --git a/libs/ardour/ardour/meter.h b/libs/ardour/ardour/meter.h index 1861ed9b7f..b23447c468 100644 --- a/libs/ardour/ardour/meter.h +++ b/libs/ardour/ardour/meter.h @@ -85,7 +85,7 @@ public: void set_meter_type (MeterType t); MeterType meter_type () const { return _meter_type; } - PBD::Signal1 MeterTypeChanged; + PBD::Signal MeterTypeChanged; protected: XMLNode& state () const; diff --git a/libs/ardour/ardour/midi_channel_filter.h b/libs/ardour/ardour/midi_channel_filter.h index 83b92f956d..af1785cc12 100644 --- a/libs/ardour/ardour/midi_channel_filter.h +++ b/libs/ardour/ardour/midi_channel_filter.h @@ -85,8 +85,8 @@ public: return _mode_mask.load() & 0x0000FFFF; } - PBD::Signal0 ChannelMaskChanged; - PBD::Signal0 ChannelModeChanged; + PBD::Signal ChannelMaskChanged; + PBD::Signal ChannelModeChanged; private: std::atomic _mode_mask; ///< 16 bits mode, 16 bits mask diff --git a/libs/ardour/ardour/midi_cursor.h b/libs/ardour/ardour/midi_cursor.h index c40a2f4b35..ddec62cfcf 100644 --- a/libs/ardour/ardour/midi_cursor.h +++ b/libs/ardour/ardour/midi_cursor.h @@ -34,7 +34,7 @@ namespace ARDOUR { struct MidiCursor : public boost::noncopyable { MidiCursor() {} - void connect(PBD::Signal1& invalidated) { + void connect(PBD::Signal& invalidated) { connections.drop_connections(); invalidated.connect_same_thread (connections, boost::bind(&MidiCursor::invalidate, this, _1)); } diff --git a/libs/ardour/ardour/midi_model.h b/libs/ardour/ardour/midi_model.h index 18fd4da7b8..be01e2fb3f 100644 --- a/libs/ardour/ardour/midi_model.h +++ b/libs/ardour/ardour/midi_model.h @@ -312,8 +312,8 @@ public: XMLNode& get_state() const; int set_state(const XMLNode&) { return 0; } - PBD::Signal0 ContentsChanged; - PBD::Signal1 ContentsShifted; + PBD::Signal ContentsChanged; + PBD::Signal ContentsShifted; std::shared_ptr > find_note (NotePtr); PatchChangePtr find_patch_change (Evoral::event_id_t); diff --git a/libs/ardour/ardour/midi_patch_manager.h b/libs/ardour/ardour/midi_patch_manager.h index cc3680235f..073b8dd1bd 100644 --- a/libs/ardour/ardour/midi_patch_manager.h +++ b/libs/ardour/ardour/midi_patch_manager.h @@ -61,7 +61,7 @@ public: return *_manager; } - PBD::Signal0 PatchesChanged; + PBD::Signal PatchesChanged; bool add_custom_midnam (const std::string& id, char const*); bool update_custom_midnam (const std::string& id, char const*); diff --git a/libs/ardour/ardour/midi_scene_changer.h b/libs/ardour/ardour/midi_scene_changer.h index b1c4bf6824..f7ff8f424c 100644 --- a/libs/ardour/ardour/midi_scene_changer.h +++ b/libs/ardour/ardour/midi_scene_changer.h @@ -46,11 +46,11 @@ class MIDISceneChanger : public SceneChanger /** Signal emitted whenever any relevant MIDI input is detected. */ - PBD::Signal0 MIDIInputActivity; + PBD::Signal MIDIInputActivity; /** Signal emitted whenever any relevant MIDI output is sent. */ - PBD::Signal0 MIDIOutputActivity; + PBD::Signal MIDIOutputActivity; private: typedef std::multimap > Scenes; diff --git a/libs/ardour/ardour/midi_source.h b/libs/ardour/ardour/midi_source.h index 42205bfd11..b00a16574b 100644 --- a/libs/ardour/ardour/midi_source.h +++ b/libs/ardour/ardour/midi_source.h @@ -178,7 +178,7 @@ class LIBARDOUR_API MidiSource : virtual public Source void invalidate(const WriterLock& lock); /** Thou shalt not emit this directly, use invalidate() instead. */ - mutable PBD::Signal1 Invalidated; + mutable PBD::Signal Invalidated; void set_note_mode(const WriterLock& lock, NoteMode mode); @@ -197,11 +197,11 @@ class LIBARDOUR_API MidiSource : virtual public Source void copy_automation_state_from (MidiSource *); /** Emitted when a different MidiModel is set */ - PBD::Signal0 ModelChanged; + PBD::Signal ModelChanged; /** Emitted when a parameter's interpolation style is changed */ - PBD::Signal2 InterpolationChanged; + PBD::Signal InterpolationChanged; /** Emitted when a parameter's automation state is changed */ - PBD::Signal2 AutomationStateChanged; + PBD::Signal AutomationStateChanged; protected: virtual void flush_midi(const WriterLock& lock) = 0; diff --git a/libs/ardour/ardour/midi_track.h b/libs/ardour/ardour/midi_track.h index d46a7aec10..eeea1ab190 100644 --- a/libs/ardour/ardour/midi_track.h +++ b/libs/ardour/ardour/midi_track.h @@ -99,7 +99,7 @@ public: void set_step_editing (bool yn); MidiRingBuffer& step_edit_ring_buffer() { return _step_edit_ring_buffer; } - PBD::Signal1 StepEditStatusChange; + PBD::Signal StepEditStatusChange; std::shared_ptr write_source (uint32_t n = 0); @@ -121,7 +121,7 @@ public: std::shared_ptr midi_playlist (); - PBD::Signal1 > DataRecorded; + PBD::Signal )> DataRecorded; std::shared_ptr get_gui_feed_buffer () const; MonitorState monitoring_state () const; @@ -134,7 +134,7 @@ public: void set_input_active (bool); bool input_active () const; - PBD::Signal0 InputActiveChanged; + PBD::Signal InputActiveChanged; void set_restore_pgm_on_load (bool yn); bool restore_pgm_on_load () const; diff --git a/libs/ardour/ardour/mixer_scene.h b/libs/ardour/ardour/mixer_scene.h index d152e0af6d..8341f6cb83 100644 --- a/libs/ardour/ardour/mixer_scene.h +++ b/libs/ardour/ardour/mixer_scene.h @@ -49,7 +49,7 @@ public: XMLNode& get_state () const; int set_state (XMLNode const&, int version); - static PBD::Signal0 Change; + static PBD::Signal Change; private: typedef std::map ControllableValueMap; diff --git a/libs/ardour/ardour/monitor_port.h b/libs/ardour/ardour/monitor_port.h index f353ea0017..fab07a45ba 100644 --- a/libs/ardour/ardour/monitor_port.h +++ b/libs/ardour/ardour/monitor_port.h @@ -47,7 +47,7 @@ public: void set_active_monitors (std::list const&); void clear_ports (bool instantly); - PBD::Signal2 MonitorInputChanged; + PBD::Signal MonitorInputChanged; protected: friend class PortManager; diff --git a/libs/ardour/ardour/monitor_processor.h b/libs/ardour/ardour/monitor_processor.h index 163455905b..af71d2e8ac 100644 --- a/libs/ardour/ardour/monitor_processor.h +++ b/libs/ardour/ardour/monitor_processor.h @@ -157,7 +157,7 @@ public: bool monitor_active () const { return _monitor_active; } - PBD::Signal0 Changed; + PBD::Signal Changed; std::shared_ptr channel_cut_control (uint32_t) const; std::shared_ptr channel_dim_control (uint32_t) const; diff --git a/libs/ardour/ardour/mute_master.h b/libs/ardour/ardour/mute_master.h index 049ff0951c..01c9c48189 100644 --- a/libs/ardour/ardour/mute_master.h +++ b/libs/ardour/ardour/mute_master.h @@ -75,7 +75,7 @@ public: void set_muted_by_masters (bool); - PBD::Signal0 MutePointChanged; + PBD::Signal MutePointChanged; XMLNode& get_state() const; int set_state(const XMLNode&, int version); diff --git a/libs/ardour/ardour/muteable.h b/libs/ardour/ardour/muteable.h index d3831e0b4f..7d1ba99a07 100644 --- a/libs/ardour/ardour/muteable.h +++ b/libs/ardour/ardour/muteable.h @@ -40,7 +40,7 @@ public: return _mute_master; } - PBD::Signal0 mute_points_changed; + PBD::Signal mute_points_changed; protected: std::shared_ptr _mute_master; diff --git a/libs/ardour/ardour/pannable.h b/libs/ardour/ardour/pannable.h index 5b7f878313..d2e09ccdc1 100644 --- a/libs/ardour/ardour/pannable.h +++ b/libs/ardour/ardour/pannable.h @@ -53,7 +53,7 @@ public: void set_automation_state (AutoState); AutoState automation_state() const { return _auto_state; } - PBD::Signal1 automation_state_changed; + PBD::Signal automation_state_changed; bool automation_playback() const { return (_auto_state & Play) || ((_auto_state & (Touch | Latch)) && !touching()); diff --git a/libs/ardour/ardour/panner.h b/libs/ardour/ardour/panner.h index 18aa319a77..3b8d725fbf 100644 --- a/libs/ardour/ardour/panner.h +++ b/libs/ardour/ardour/panner.h @@ -103,7 +103,7 @@ public: virtual void reset () = 0; /* azimut, width or elevation updated -> recalc signal_position -> emit Changed */ - PBD::Signal0 SignalPositionChanged; + PBD::Signal SignalPositionChanged; /** * Pan some input buffers to a number of output buffers. diff --git a/libs/ardour/ardour/panner_shell.h b/libs/ardour/ardour/panner_shell.h index 2b239dd687..d09f76e4c9 100644 --- a/libs/ardour/ardour/panner_shell.h +++ b/libs/ardour/ardour/panner_shell.h @@ -64,8 +64,8 @@ public: XMLNode& get_state () const; int set_state (const XMLNode&, int version); - PBD::Signal0 PannableChanged; /* Pannable changed -- l*/ - PBD::Signal0 Changed; /* panner and/or outputs count and/or bypass state changed */ + PBD::Signal PannableChanged; /* Pannable changed -- l*/ + PBD::Signal Changed; /* panner and/or outputs count and/or bypass state changed */ std::shared_ptr panner() const { return _panner; } std::shared_ptr pannable() const { return _panlinked ? _pannable_route : _pannable_internal; } diff --git a/libs/ardour/ardour/playlist.h b/libs/ardour/ardour/playlist.h index ce042b8e35..6a56923ffd 100644 --- a/libs/ardour/ardour/playlist.h +++ b/libs/ardour/ardour/playlist.h @@ -246,20 +246,20 @@ public: virtual int set_state (const XMLNode&, int version); XMLNode& get_template (); - PBD::Signal1 InUse; - PBD::Signal0 ContentsChanged; - PBD::Signal1 > RegionAdded; - PBD::Signal1 > RegionRemoved; - PBD::Signal0 NameChanged; - PBD::Signal0 LayeringChanged; + PBD::Signal InUse; + PBD::Signal ContentsChanged; + PBD::Signal )> RegionAdded; + PBD::Signal )> RegionRemoved; + PBD::Signal NameChanged; + PBD::Signal LayeringChanged; /** Emitted when regions have moved (not when regions have only been trimmed) */ - PBD::Signal2 const &, bool> RangesMoved; + PBD::Signal const &, bool)> RangesMoved; /** Emitted when regions are extended; the ranges passed are the new extra time ranges that these regions now occupy. */ - PBD::Signal1 const &> RegionsExtended; + PBD::Signal const &)> RegionsExtended; 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 5344958236..208615148e 100644 --- a/libs/ardour/ardour/playlist_factory.h +++ b/libs/ardour/ardour/playlist_factory.h @@ -31,7 +31,7 @@ class Session; class LIBARDOUR_API PlaylistFactory { public: - static PBD::Signal1> PlaylistCreated; + static PBD::Signal)> PlaylistCreated; static std::shared_ptr create (Session&, const XMLNode&, bool hidden = false); static std::shared_ptr 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 2eef4ea352..6db0122f7e 100644 --- a/libs/ardour/ardour/plugin.h +++ b/libs/ardour/ardour/plugin.h @@ -213,17 +213,17 @@ public: virtual bool has_inline_display () { return false; } virtual bool inline_display_in_gui () { return false; } virtual Display_Image_Surface* render_inline_display (uint32_t, uint32_t) { return NULL; } - PBD::Signal0 QueueDraw; + PBD::Signal QueueDraw; virtual bool has_midnam () { return false; } virtual bool read_midnam () { return false; } virtual std::string midnam_model () { return ""; } - PBD::Signal0 UpdateMidnam; - PBD::Signal0 UpdatedMidnam; + PBD::Signal UpdateMidnam; + PBD::Signal UpdatedMidnam; virtual bool knows_bank_patch () { return false; } virtual uint32_t bank_patch (uint8_t chn) { return UINT32_MAX; } - PBD::Signal1 BankPatchChange; + PBD::Signal BankPatchChange; struct PresetRecord { PresetRecord () : valid (false) { } @@ -289,22 +289,22 @@ public: virtual int first_user_preset_index () const { return 0; } /** Emitted when a preset is added or removed, respectively */ - PBD::Signal0 PresetAdded; - PBD::Signal0 PresetRemoved; + PBD::Signal PresetAdded; + PBD::Signal PresetRemoved; /** Emitted when any preset has been changed */ - static PBD::Signal3 PresetsChanged; + static PBD::Signal PresetsChanged; /** Emitted when a preset has been loaded */ - PBD::Signal0 PresetLoaded; + PBD::Signal PresetLoaded; /** Emitted when a parameter is altered in a way that may have * changed the settings with respect to any loaded preset. */ - PBD::Signal0 PresetDirty; + PBD::Signal PresetDirty; /** Emitted for preset-load to set a control-port */ - PBD::Signal2 PresetPortSetValue; + PBD::Signal PresetPortSetValue; /** @return true if plugin has a custom plugin GUI */ virtual bool has_editor () const = 0; @@ -312,7 +312,7 @@ public: /** Emitted when a parameter is altered by something outside of our * control, most typically a Plugin GUI/editor */ - PBD::Signal2 ParameterChangedExternally; + PBD::Signal ParameterChangedExternally; virtual bool reconfigure_io (ChanCount /*in*/, ChanCount /*aux_in*/, ChanCount /*out*/) { return true; } virtual bool match_variable_io (ChanCount& /*in*/, ChanCount& /*aux_in*/, ChanCount& /*out*/) { return false; } @@ -377,10 +377,10 @@ public: virtual void announce_property_values () {} /** Emitted when a property is changed in the plugin. */ - PBD::Signal2 PropertyChanged; + PBD::Signal PropertyChanged; - PBD::Signal1 StartTouch; - PBD::Signal1 EndTouch; + PBD::Signal StartTouch; + PBD::Signal EndTouch; protected: friend class PluginInsert; diff --git a/libs/ardour/ardour/plugin_insert.h b/libs/ardour/ardour/plugin_insert.h index 42a17ff5b6..eeb12b4bc4 100644 --- a/libs/ardour/ardour/plugin_insert.h +++ b/libs/ardour/ardour/plugin_insert.h @@ -264,10 +264,10 @@ public: out = _configured_out; } - PBD::Signal2 AnalysisDataGathered; - PBD::Signal0 PluginIoReConfigure; - PBD::Signal0 PluginMapChanged; - PBD::Signal0 PluginConfigChanged; + PBD::Signal AnalysisDataGathered; + PBD::Signal PluginIoReConfigure; + PBD::Signal PluginMapChanged; + PBD::Signal PluginConfigChanged; protected: XMLNode& state () const; diff --git a/libs/ardour/ardour/plugin_manager.h b/libs/ardour/ardour/plugin_manager.h index 661f1bfaa1..be1e3fc7ef 100644 --- a/libs/ardour/ardour/plugin_manager.h +++ b/libs/ardour/ardour/plugin_manager.h @@ -168,19 +168,19 @@ public: /** plugins were added to or removed from one of the PluginInfoLists * This implies PluginScanLogChanged. */ - PBD::Signal0 PluginListChanged; + PBD::Signal PluginListChanged; /** Plugin Statistics (use-count, recently-used) changed */ - PBD::Signal0 PluginStatsChanged; + PBD::Signal PluginStatsChanged; /** Plugin ScanLog changed */ - PBD::Signal0 PluginScanLogChanged; + PBD::Signal PluginScanLogChanged; /** A single plugin's Hidden/Favorite status changed */ - PBD::Signal3 PluginStatusChanged; //PluginType t, string id, string tag + PBD::Signal PluginStatusChanged; //PluginType t, string id, string tag /** A single plugin's Tags status changed */ - PBD::Signal3 PluginTagChanged; //PluginType t, string id, string tag + PBD::Signal PluginTagChanged; //PluginType t, string id, string tag private: typedef std::shared_ptr PSLEPtr; diff --git a/libs/ardour/ardour/port.h b/libs/ardour/ardour/port.h index d920266cad..bdc768b38a 100644 --- a/libs/ardour/ardour/port.h +++ b/libs/ardour/ardour/port.h @@ -141,12 +141,12 @@ public: void decrement_internal_connections (); - PBD::Signal1 MonitorInputChanged; - PBD::Signal3,std::shared_ptr, bool > ConnectedOrDisconnected; + PBD::Signal MonitorInputChanged; + PBD::Signal,std::shared_ptr, bool )> ConnectedOrDisconnected; - static PBD::Signal0 PortDrop; - static PBD::Signal0 PortSignalDrop; - static PBD::Signal0 ResamplerQualityChanged; + static PBD::Signal PortDrop; + static PBD::Signal PortSignalDrop; + static PBD::Signal ResamplerQualityChanged; static void set_varispeed_ratio (double s); //< varispeed playback static bool set_engine_ratio (double session, double engine); //< SR mismatch diff --git a/libs/ardour/ardour/port_manager.h b/libs/ardour/ardour/port_manager.h index a738d3f6b4..e000d8da0a 100644 --- a/libs/ardour/ardour/port_manager.h +++ b/libs/ardour/ardour/port_manager.h @@ -243,26 +243,26 @@ public: void remove_midi_port_flags (std::string const&, MidiPortFlags); /** Emitted if the list of ports to be used for MIDI selection tracking changes */ - PBD::Signal0 MidiSelectionPortsChanged; + PBD::Signal MidiSelectionPortsChanged; /** Emitted if anything other than the selection property for a MIDI port changes */ - PBD::Signal0 MidiPortInfoChanged; + PBD::Signal MidiPortInfoChanged; /** Emitted if pretty-name of a port changed */ - PBD::Signal1 PortPrettyNameChanged; + PBD::Signal PortPrettyNameChanged; /** Emitted if the backend notifies us of a graph order event */ - PBD::Signal0 GraphReordered; + PBD::Signal GraphReordered; /** Emitted if a Port is registered or unregistered */ - PBD::Signal0 PortRegisteredOrUnregistered; + PBD::Signal PortRegisteredOrUnregistered; /** Emitted if a Port is connected or disconnected. * The Port parameters are the ports being connected / disconnected, or 0 if they are not known to Ardour. * The std::string parameters are the (long) port names. * The bool parameter is true if ports were connected, or false for disconnected. */ - PBD::Signal5, std::string, std::weak_ptr, std::string, bool> PortConnectedOrDisconnected; + PBD::Signal, std::string, std::weak_ptr, std::string, bool)> PortConnectedOrDisconnected; - PBD::Signal3, bool> PhysInputChanged; + PBD::Signal, bool)> PhysInputChanged; /* Input port meters and monitors */ void reset_input_meters (); diff --git a/libs/ardour/ardour/presentation_info.h b/libs/ardour/ardour/presentation_info.h index 7e4f1d99d2..009a8727c4 100644 --- a/libs/ardour/ardour/presentation_info.h +++ b/libs/ardour/ardour/presentation_info.h @@ -260,7 +260,7 @@ class LIBARDOUR_API PresentationInfo : public PBD::Stateful /* for things concerned about *any* PresentationInfo. */ - static PBD::Signal1 Change; + static PBD::Signal Change; static void send_static_change (const PBD::PropertyChange&); static void make_property_quarks (); diff --git a/libs/ardour/ardour/processor.h b/libs/ardour/ardour/processor.h index cc8838ed77..9779a9c0e0 100644 --- a/libs/ardour/ardour/processor.h +++ b/libs/ardour/ardour/processor.h @@ -148,16 +148,16 @@ class LIBARDOUR_API Processor : public SessionObject, public Automatable, public virtual void set_pre_fader (bool); virtual bool get_pre_fader () const { return _pre_fader; } - PBD::Signal0 ActiveChanged; - PBD::Signal0 BypassableChanged; - PBD::Signal2 ConfigurationChanged; + PBD::Signal ActiveChanged; + PBD::Signal BypassableChanged; + PBD::Signal ConfigurationChanged; /* cross-thread signals. * This allows control-surfaces to show/hide a plugin GUI. */ - PBD::Signal0 ToggleUI; - PBD::Signal0 ShowUI; - PBD::Signal0 HideUI; + PBD::Signal ToggleUI; + PBD::Signal ShowUI; + PBD::Signal HideUI; ProcessorWindowProxy * window_proxy () const { return _window_proxy; } void set_window_proxy (ProcessorWindowProxy* wp) { _window_proxy = wp; } diff --git a/libs/ardour/ardour/region.h b/libs/ardour/ardour/region.h index 1d5d646449..612ae01f1f 100644 --- a/libs/ardour/ardour/region.h +++ b/libs/ardour/ardour/region.h @@ -111,9 +111,9 @@ public: static void make_property_quarks (); - static PBD::Signal2, const PBD::PropertyChange&> RegionsPropertyChanged; + static PBD::Signal, const PBD::PropertyChange&)> RegionsPropertyChanged; - PBD::Signal0 RegionFxChanged; + PBD::Signal RegionFxChanged; typedef std::map ChangeMap; diff --git a/libs/ardour/ardour/region_factory.h b/libs/ardour/ardour/region_factory.h index 79703dbff6..d1046724bf 100644 --- a/libs/ardour/ardour/region_factory.h +++ b/libs/ardour/ardour/region_factory.h @@ -64,7 +64,7 @@ public: * itself, to permit dynamic_cast<> to be used to * infer the type of Region. */ - static PBD::Signal1 > CheckNewRegion; + static PBD::Signal )> CheckNewRegion; /** create a "pure copy" of Region \p other */ static std::shared_ptr create (std::shared_ptr other, bool announce, bool fork = false, ThawList* tl = 0); diff --git a/libs/ardour/ardour/route.h b/libs/ardour/ardour/route.h index 2e1be45087..4fd9c36fd6 100644 --- a/libs/ardour/ardour/route.h +++ b/libs/ardour/ardour/route.h @@ -377,9 +377,9 @@ public: samplecnt_t signal_latency() const { return _signal_latency; } samplecnt_t playback_latency (bool incl_downstream = false) const; - PBD::Signal0 active_changed; - PBD::Signal0 denormal_protection_changed; - PBD::Signal0 comment_changed; + PBD::Signal active_changed; + PBD::Signal denormal_protection_changed; + PBD::Signal comment_changed; bool is_track(); @@ -388,7 +388,7 @@ public: * nubers < 0 indicate busses * zero is reserved for unnumbered special busses. * */ - PBD::Signal0 track_number_changed; + PBD::Signal track_number_changed; int64_t track_number() const { return _track_number; } void set_track_number(int64_t tn) { @@ -405,23 +405,23 @@ public: }; /** ask GUI about port-count, fan-out when adding instrument */ - static PBD::Signal3, std::shared_ptr, PluginSetupOptions > PluginSetup; + static PBD::Signal, std::shared_ptr, PluginSetupOptions )> PluginSetup; /** used to signal the GUI to fan-out (track-creation) */ - static PBD::Signal1 > FanOut; + static PBD::Signal )> FanOut; /** the processors have changed; the parameter indicates what changed */ - PBD::Signal1 processors_changed; - PBD::Signal1 record_enable_changed; + PBD::Signal processors_changed; + PBD::Signal record_enable_changed; /** a processor's latency has changed * (emitted from PluginInsert::latency_changed) */ - PBD::Signal0 processor_latency_changed; + PBD::Signal processor_latency_changed; /** the metering point has changed */ - PBD::Signal0 meter_change; + PBD::Signal meter_change; /** Emitted with the process lock held */ - PBD::Signal0 io_changed; + PBD::Signal io_changed; /* stateful */ XMLNode& get_state() const; @@ -436,7 +436,7 @@ public: int save_as_template (const std::string& path, const std::string& name, const std::string& description ); - PBD::Signal1 SelectedChanged; + PBD::Signal SelectedChanged; int add_aux_send (std::shared_ptr, std::shared_ptr); int add_foldback_send (std::shared_ptr, bool post_fader); diff --git a/libs/ardour/ardour/route_group.h b/libs/ardour/ardour/route_group.h index 877d248c4e..446f76c0c1 100644 --- a/libs/ardour/ardour/route_group.h +++ b/libs/ardour/ardour/route_group.h @@ -145,9 +145,9 @@ public: std::shared_ptr route_list() { return routes; } /** Emitted when a route has been added to this group */ - PBD::Signal2 > RouteAdded; + PBD::Signal )> RouteAdded; /** Emitted when a route has been removed from this group */ - PBD::Signal2 > RouteRemoved; + PBD::Signal )> RouteRemoved; XMLNode& get_state () const; diff --git a/libs/ardour/ardour/route_group_member.h b/libs/ardour/ardour/route_group_member.h index bd6085d3ce..ca15398ba8 100644 --- a/libs/ardour/ardour/route_group_member.h +++ b/libs/ardour/ardour/route_group_member.h @@ -37,7 +37,7 @@ class LIBARDOUR_API RouteGroupMember RouteGroup* route_group () const { return _route_group; } /** Emitted when this member joins or leaves a route group */ - PBD::Signal0 route_group_changed; + PBD::Signal route_group_changed; protected: RouteGroup* _route_group; diff --git a/libs/ardour/ardour/scene_change.h b/libs/ardour/ardour/scene_change.h index 1e5a8ee3b0..85fed5480e 100644 --- a/libs/ardour/ardour/scene_change.h +++ b/libs/ardour/ardour/scene_change.h @@ -42,8 +42,8 @@ class SceneChange : public PBD::Stateful bool active () const { return _active; } void set_active (bool); - PBD::Signal0 ColorChanged; - PBD::Signal0 ActiveChanged; + PBD::Signal ColorChanged; + PBD::Signal ActiveChanged; protected: /* derived classes are responsible for serializing & deserializing this value */ diff --git a/libs/ardour/ardour/send.h b/libs/ardour/ardour/send.h index 6b823200bd..ecd007f83b 100644 --- a/libs/ardour/ardour/send.h +++ b/libs/ardour/ardour/send.h @@ -54,8 +54,8 @@ public: virtual void set_delay_out (samplecnt_t, size_t bus = 0) = 0; virtual void update_delaylines (bool rt_ok) = 0; - static PBD::Signal0 ChangedLatency; - static PBD::Signal0 QueueUpdate; + static PBD::Signal ChangedLatency; + static PBD::Signal QueueUpdate; protected: samplecnt_t _delay_in; @@ -78,7 +78,7 @@ public: int set_state(const XMLNode&, int version); - PBD::Signal0 SelfDestruct; + PBD::Signal SelfDestruct; void set_remove_on_disconnect (bool b) { _remove_on_disconnect = b; } bool remove_on_disconnect () const { return _remove_on_disconnect; } diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h index 4876d925dc..67ba2eacb8 100644 --- a/libs/ardour/ardour/session.h +++ b/libs/ardour/ardour/session.h @@ -261,14 +261,14 @@ public: void end_unnamed_status () const; - PBD::Signal0 DirtyChanged; + PBD::Signal DirtyChanged; const SessionDirectory& session_directory () const { return *(_session_dir.get()); } - static PBD::Signal1 Dialog; + static PBD::Signal Dialog; - PBD::Signal0 BatchUpdateStart; - PBD::Signal0 BatchUpdateEnd; + PBD::Signal BatchUpdateStart; + PBD::Signal BatchUpdateEnd; int ensure_subdirs (); @@ -417,24 +417,24 @@ public: void maybe_write_autosave (); - PBD::Signal1 SurroundObjectCountChanged; + PBD::Signal SurroundObjectCountChanged; /* Emitted when all i/o connections are complete */ - PBD::Signal0 IOConnectionsComplete; + PBD::Signal IOConnectionsComplete; /* Record status signals */ - PBD::Signal0 RecordStateChanged; /* signals changes in recording state (i.e. are we recording) */ + PBD::Signal RecordStateChanged; /* signals changes in recording state (i.e. are we recording) */ /* XXX may 2015: paul says: it isn't clear to me that this has semantics that cannot be inferrred from the previous signal and session state. */ - PBD::Signal0 RecordArmStateChanged; /* signals changes in recording arming */ + PBD::Signal RecordArmStateChanged; /* signals changes in recording arming */ - PBD::Signal0 UpdateRouteRecordState; /* signals potential change in route recording arming */ + PBD::Signal UpdateRouteRecordState; /* signals potential change in route recording arming */ /* Emited when session is loaded */ - PBD::Signal0 SessionLoaded; + PBD::Signal SessionLoaded; /* Transport mechanism signals */ @@ -445,38 +445,38 @@ public: * - start (from the process thread) * - engine halted */ - PBD::Signal0 TransportStateChange; + PBD::Signal TransportStateChange; - PBD::Signal1 PositionChanged; /* sent after any non-sequential motion */ - PBD::Signal1 Xrun; - PBD::Signal0 TransportLooped; + PBD::Signal PositionChanged; /* sent after any non-sequential motion */ + PBD::Signal Xrun; + PBD::Signal TransportLooped; /** emitted when a locate has occurred */ - PBD::Signal0 Located; + PBD::Signal Located; - PBD::Signal1 RouteAdded; + PBD::Signal RouteAdded; /** Emitted when a property of one of our route groups changes. * The parameter is the RouteGroup that has changed. */ - PBD::Signal1 RouteGroupPropertyChanged; + PBD::Signal RouteGroupPropertyChanged; /** Emitted when a route is added to one of our route groups. * First parameter is the RouteGroup, second is the route. */ - PBD::Signal2 > RouteAddedToRouteGroup; + PBD::Signal )> RouteAddedToRouteGroup; /** Emitted when a route is removed from one of our route groups. * First parameter is the RouteGroup, second is the route. */ - PBD::Signal2 > RouteRemovedFromRouteGroup; + PBD::Signal )> RouteRemovedFromRouteGroup; /** Emitted when a foldback send is created or deleted */ - PBD::Signal0 FBSendsChanged; + PBD::Signal FBSendsChanged; /* Step Editing status changed */ - PBD::Signal1 StepEditStatusChange; + PBD::Signal StepEditStatusChange; /* Timecode state signals */ - PBD::Signal0 MtcOrLtcInputPortChanged; + PBD::Signal MtcOrLtcInputPortChanged; void queue_event (SessionEvent*); @@ -542,9 +542,9 @@ public: Locations *locations() { return _locations; } - PBD::Signal1 auto_loop_location_changed; - PBD::Signal1 auto_punch_location_changed; - PBD::Signal0 locations_modified; + PBD::Signal auto_loop_location_changed; + PBD::Signal auto_punch_location_changed; + PBD::Signal locations_modified; void set_auto_punch_location (Location *); void set_auto_loop_location (Location *); @@ -560,7 +560,7 @@ public: samplecnt_t worst_latency_preroll () const; samplecnt_t worst_latency_preroll_buffer_size_ceil () const; - PBD::Signal1 LatencyUpdated; + PBD::Signal LatencyUpdated; struct SaveAs { std::string new_parent_folder; /* parent folder where new session folder will be created */ @@ -583,7 +583,7 @@ public: * Handler should return true for save-as to continue, or false * to stop (and remove all evidence of partial save-as). */ - PBD::Signal3 Progress; + PBD::Signal Progress; /* if save_as() returns non-zero, this string will indicate the reason why. */ @@ -632,8 +632,8 @@ public: void set_nsm_state (bool state) { _under_nsm_control = state; } bool save_default_options (); - PBD::Signal1 StateSaved; - PBD::Signal0 StateReady; + PBD::Signal StateSaved; + PBD::Signal StateReady; /* emitted when session needs to be saved due to some internal * event or condition (i.e. not in response to a user request). @@ -643,12 +643,12 @@ public: * * Argument is the snapshot name to use when saving. */ - PBD::Signal1 SaveSessionRequested; + PBD::Signal SaveSessionRequested; /* emitted during a session save to allow other entities to add state, via * extra XML, to the session state */ - PBD::Signal0 SessionSaveUnderway; + PBD::Signal SessionSaveUnderway; std::vector possible_states() const; static std::vector possible_states (std::string path); @@ -710,9 +710,9 @@ public: RouteGroup* route_group_by_name (std::string); RouteGroup& all_route_group() const; - PBD::Signal1 route_group_added; - PBD::Signal0 route_group_removed; - PBD::Signal0 route_groups_reordered; + PBD::Signal route_group_added; + PBD::Signal route_group_removed; + PBD::Signal route_groups_reordered; void foreach_route_group (boost::function f) { for (std::list::iterator i = _route_groups.begin(); i != _route_groups.end(); ++i) { @@ -800,8 +800,8 @@ public: samplecnt_t convert_to_samples (AnyTime const & position); samplecnt_t any_duration_to_samples (samplepos_t position, AnyTime const & duration); - static PBD::Signal1 StartTimeChanged; - static PBD::Signal1 EndTimeChanged; + static PBD::Signal StartTimeChanged; + static PBD::Signal EndTimeChanged; void request_sync_source (std::shared_ptr); bool synced_to_engine() const; @@ -829,7 +829,7 @@ public: bool punch_is_possible () const; bool loop_is_possible () const; - PBD::Signal0 PunchLoopConstraintChange; + PBD::Signal PunchLoopConstraintChange; void maybe_update_tempo_from_midiclock_tempo (float bpm); @@ -857,8 +857,8 @@ public: int start_audio_export (samplepos_t position, bool realtime = false, bool region_export = false); - PBD::Signal1 ProcessExport; - static PBD::Signal4 Exported; + PBD::Signal ProcessExport; + static PBD::Signal Exported; void add_source (std::shared_ptr); void remove_source (std::weak_ptr, bool drop_references = true); @@ -878,26 +878,26 @@ public: 0 for "yes, delete this playlist", 1 for "no, don't delete this playlist". */ - static PBD::Signal1 > AskAboutPlaylistDeletion; + static PBD::Signal )> AskAboutPlaylistDeletion; /** handlers should return 0 for "ignore the rate mismatch", !0 for "do not use this session" */ - static PBD::Signal2 AskAboutSampleRateMismatch; + static PBD::Signal AskAboutSampleRateMismatch; /** non interactive message */ - static PBD::Signal2 NotifyAboutSampleRateMismatch; + static PBD::Signal NotifyAboutSampleRateMismatch; /** handlers should return !0 for use pending state, 0 for ignore it. */ - static PBD::Signal0 AskAboutPendingState; + static PBD::Signal AskAboutPendingState; /** after loading a session, once all ports have been created and connected * signal is emitted to let objects that need to do some housekeeping * post-connect. */ - static PBD::Signal0 AfterConnect; + static PBD::Signal AfterConnect; std::shared_ptr create_audio_source_for_session ( size_t, std::string const &, uint32_t); @@ -923,7 +923,7 @@ public: void cancel_audition (); bool is_auditioning () const; - PBD::Signal1 AuditionActive; + PBD::Signal AuditionActive; /* session script */ void register_lua_function (const std::string&, const std::string&, const LuaScriptParamList&); @@ -932,10 +932,10 @@ public: uint32_t registered_lua_function_count () const { return _n_lua_scripts; } void scripts_changed (); // called from lua, updates _n_lua_scripts - PBD::Signal0 LuaScriptsChanged; + PBD::Signal LuaScriptsChanged; /* I/O Plugin */ - PBD::Signal0 IOPluginsChanged; + PBD::Signal IOPluginsChanged; void load_io_plugin (std::shared_ptr); bool unload_io_plugin (std::shared_ptr); @@ -986,15 +986,15 @@ public: void set_exclusive_input_active (std::shared_ptr rt, bool onoff, bool flip_others = false); - PBD::Signal1 SoloActive; - PBD::Signal0 SoloChanged; - PBD::Signal0 MuteChanged; - PBD::Signal0 IsolatedChanged; - PBD::Signal0 MonitorChanged; - PBD::Signal0 MonitorBusAddedOrRemoved; - PBD::Signal0 SurroundMasterAddedOrRemoved; + PBD::Signal SoloActive; + PBD::Signal SoloChanged; + PBD::Signal MuteChanged; + PBD::Signal IsolatedChanged; + PBD::Signal MonitorChanged; + PBD::Signal MonitorBusAddedOrRemoved; + PBD::Signal SurroundMasterAddedOrRemoved; - PBD::Signal0 session_routes_reconnected; + PBD::Signal session_routes_reconnected; /* monitor/master out */ int add_master_bus (ChanCount const&); @@ -1060,7 +1060,7 @@ public: void remove_bundle (std::shared_ptr); std::shared_ptr bundle_by_name (std::string) const; - PBD::Signal0 BundleAddedOrRemoved; + PBD::Signal BundleAddedOrRemoved; void midi_panic (); @@ -1149,7 +1149,7 @@ public: float opt ); - static PBD::Signal0 SendFeedback; + static PBD::Signal SendFeedback; /* Speakers */ @@ -1236,12 +1236,12 @@ public: processing path. Until it is fixed (by the user) some (unspecified) routes will not be run. */ - static PBD::Signal0 FeedbackDetected; + static PBD::Signal FeedbackDetected; /** Emitted when a graph sort has successfully completed, which means that it has no feedback cycles. */ - static PBD::Signal0 SuccessfulGraphSort; + static PBD::Signal SuccessfulGraphSort; /* handlers can return an integer value: 0: config.set_audio_search_path() or config.set_midi_search_path() was used @@ -1252,19 +1252,19 @@ public: -1: just mark this one missing any other value: as -1 */ - static PBD::Signal3 MissingFile; + static PBD::Signal MissingFile; void set_missing_file_replacement (const std::string& mfr) { _missing_file_replacement = mfr; } /** Emitted when the session wants Ardour to quit */ - static PBD::Signal0 Quit; + static PBD::Signal Quit; /** Emitted when Ardour is asked to load a session in an older session * format, and makes a backup copy. */ - static PBD::Signal2 VersionMismatch; + static PBD::Signal VersionMismatch; SceneChanger* scene_changer() const { return _scene_changer; } @@ -1963,8 +1963,8 @@ private: public: /* Emited when a new source is added to the session */ - PBD::Signal1< void, std::weak_ptr > SourceAdded; - PBD::Signal1< void, std::weak_ptr > SourceRemoved; + PBD::Signal< void(std::weak_ptr )> SourceAdded; + PBD::Signal< void(std::weak_ptr )> SourceRemoved; typedef std::map > SourceMap; diff --git a/libs/ardour/ardour/slavable.h b/libs/ardour/ardour/slavable.h index 7d3b5594aa..4ff7fbd38e 100644 --- a/libs/ardour/ardour/slavable.h +++ b/libs/ardour/ardour/slavable.h @@ -53,14 +53,14 @@ public: virtual void assign (std::shared_ptr); void unassign (std::shared_ptr); - PBD::Signal2,bool> AssignmentChange; + PBD::Signal,bool)> AssignmentChange; virtual std::shared_ptr automation_control (const Evoral::Parameter&) = 0; static std::string xml_node_name; /* signal sent VCAManager once assignment is possible */ - static PBD::Signal1 Assign; + static PBD::Signal Assign; std::vector > masters (VCAManager*) const; diff --git a/libs/ardour/ardour/slavable_automation_control.h b/libs/ardour/ardour/slavable_automation_control.h index 4b4b8d0c9f..cd4a6d6c26 100644 --- a/libs/ardour/ardour/slavable_automation_control.h +++ b/libs/ardour/ardour/slavable_automation_control.h @@ -70,7 +70,7 @@ public: */ int32_t get_boolean_masters () const; - PBD::Signal0 MasterStatusChange; + PBD::Signal MasterStatusChange; void use_saved_master_ratios (); diff --git a/libs/ardour/ardour/source.h b/libs/ardour/ardour/source.h index cf64469895..087dbb861c 100644 --- a/libs/ardour/ardour/source.h +++ b/libs/ardour/ardour/source.h @@ -94,14 +94,14 @@ public: virtual bool length_mutable() const { return false; } - static PBD::Signal1 SourceCreated; + static PBD::Signal SourceCreated; 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(); - PBD::Signal0 AnalysisChanged; + PBD::Signal AnalysisChanged; AnalysisFeatureList transients; std::string get_transients_path() const; @@ -118,7 +118,7 @@ public: bool remove_cue_marker (CueMarker const &); bool rename_cue_marker (CueMarker&, std::string const &); bool clear_cue_markers (); - PBD::Signal0 CueMarkersChanged; + PBD::Signal CueMarkersChanged; virtual timepos_t natural_position() const { return _natural_position; } virtual void set_natural_position (timepos_t const & pos); diff --git a/libs/ardour/ardour/source_factory.h b/libs/ardour/ardour/source_factory.h index 1f488ad1f9..0417853eb0 100644 --- a/libs/ardour/ardour/source_factory.h +++ b/libs/ardour/ardour/source_factory.h @@ -40,7 +40,7 @@ public: static void init (); static void terminate (); - static PBD::Signal1> SourceCreated; + static PBD::Signal)> SourceCreated; static std::shared_ptr create (Session&, const XMLNode& node, bool async = false); static std::shared_ptr createSilent (Session&, const XMLNode& node, samplecnt_t, float sample_rate); diff --git a/libs/ardour/ardour/speaker.h b/libs/ardour/ardour/speaker.h index a7dd654f05..9dd567e31d 100644 --- a/libs/ardour/ardour/speaker.h +++ b/libs/ardour/ardour/speaker.h @@ -40,7 +40,7 @@ public: int id; /** emitted when this speaker's position has changed */ - PBD::Signal0 PositionChanged; + PBD::Signal PositionChanged; private: PBD::CartesianVector _coords; diff --git a/libs/ardour/ardour/speakers.h b/libs/ardour/ardour/speakers.h index f6f8beb506..802cfbd738 100644 --- a/libs/ardour/ardour/speakers.h +++ b/libs/ardour/ardour/speakers.h @@ -54,7 +54,7 @@ public: XMLNode& get_state () const; int set_state (const XMLNode&, int version); - PBD::Signal0 Changed; + PBD::Signal Changed; protected: std::vector _speakers; diff --git a/libs/ardour/ardour/stripable.h b/libs/ardour/ardour/stripable.h index d4b4695c2d..8d2f8b57c7 100644 --- a/libs/ardour/ardour/stripable.h +++ b/libs/ardour/ardour/stripable.h @@ -102,7 +102,7 @@ class LIBARDOUR_API Stripable : public SessionObject, /* gui's call this for their own purposes. */ - PBD::Signal2 gui_changed; + PBD::Signal gui_changed; /* ************************************************************* * Pure interface begins here @@ -148,7 +148,7 @@ class LIBARDOUR_API Stripable : public SessionObject, /* ACs mapped to any control have changed. API user is to drop references, * and query mapped ctrl again */ - PBD::Signal0 MappedControlsChanged; + PBD::Signal MappedControlsChanged; /* "well-known" controls for sends to well-known busses in this route. Any or all may * be null. diff --git a/libs/ardour/ardour/surround_pannable.h b/libs/ardour/ardour/surround_pannable.h index ea17b68abc..2985339871 100644 --- a/libs/ardour/ardour/surround_pannable.h +++ b/libs/ardour/ardour/surround_pannable.h @@ -55,7 +55,7 @@ public: void set_automation_state (AutoState); AutoState automation_state() const { return _auto_state; } - PBD::Signal1 automation_state_changed; + PBD::Signal automation_state_changed; bool automation_playback() const { return (_auto_state & Play) || ((_auto_state & (Touch | Latch)) && !touching()); diff --git a/libs/ardour/ardour/surround_send.h b/libs/ardour/ardour/surround_send.h index cbd01a44d8..cf66dbc041 100644 --- a/libs/ardour/ardour/surround_send.h +++ b/libs/ardour/ardour/surround_send.h @@ -41,8 +41,8 @@ public: uint32_t n_pannables () const; - PBD::Signal0 NPannablesChanged; - PBD::Signal0 PanChanged; + PBD::Signal NPannablesChanged; + PBD::Signal PanChanged; /* Route/processor interface */ bool can_support_io_configuration (const ChanCount& in, ChanCount& out) { return in == out; } diff --git a/libs/ardour/ardour/tailtime.h b/libs/ardour/ardour/tailtime.h index 6f0d81a69e..80c5546e20 100644 --- a/libs/ardour/ardour/tailtime.h +++ b/libs/ardour/ardour/tailtime.h @@ -50,7 +50,7 @@ public: void unset_user_tailtime (); void set_user_tailtime (samplecnt_t val); - PBD::Signal0 TailTimeChanged; + PBD::Signal TailTimeChanged; protected: int set_state (const XMLNode& node, int version); diff --git a/libs/ardour/ardour/track.h b/libs/ardour/ardour/track.h index 0866bab465..dfb8d1cad0 100644 --- a/libs/ardour/ardour/track.h +++ b/libs/ardour/ardour/track.h @@ -183,12 +183,12 @@ public: void time_domain_changed (); - PBD::Signal0 FreezeChange; - PBD::Signal0 PlaylistChanged; - PBD::Signal0 PlaylistAdded; - PBD::Signal0 SpeedChanged; - PBD::Signal0 AlignmentStyleChanged; - PBD::Signal0 ChanCountChanged; + PBD::Signal FreezeChange; + PBD::Signal PlaylistChanged; + PBD::Signal PlaylistAdded; + PBD::Signal SpeedChanged; + PBD::Signal AlignmentStyleChanged; + PBD::Signal ChanCountChanged; protected: XMLNode& state (bool save_template) const; diff --git a/libs/ardour/ardour/transport_master_manager.h b/libs/ardour/ardour/transport_master_manager.h index 2a8f20c27c..7964963a69 100644 --- a/libs/ardour/ardour/transport_master_manager.h +++ b/libs/ardour/ardour/transport_master_manager.h @@ -53,8 +53,8 @@ class LIBARDOUR_API TransportMasterManager : public boost::noncopyable int remove (std::string const & name); void clear (bool emit = true); - PBD::Signal1 > Added; - PBD::Signal1 > Removed; // null argument means "clear" + PBD::Signal )> Added; + PBD::Signal )> Removed; // null argument means "clear" double pre_process_transport_masters (pframes_t, samplepos_t session_transport_position); @@ -66,7 +66,7 @@ class LIBARDOUR_API TransportMasterManager : public boost::noncopyable int set_current (SyncSource); int set_current (std::string const &); - PBD::Signal2, std::shared_ptr > CurrentChanged; + PBD::Signal, std::shared_ptr )> CurrentChanged; int set_state (XMLNode const &, int); XMLNode& get_state() const; diff --git a/libs/ardour/ardour/triggerbox.h b/libs/ardour/ardour/triggerbox.h index eebc13d65d..ee01cce0db 100644 --- a/libs/ardour/ardour/triggerbox.h +++ b/libs/ardour/ardour/triggerbox.h @@ -300,8 +300,8 @@ class LIBARDOUR_API Trigger : public PBD::Stateful { virtual void arm(); virtual void disarm (); bool armed() const { return _armed; } - PBD::Signal0 ArmChanged; - static PBD::Signal1 TriggerArmChanged; + PBD::Signal ArmChanged; + static PBD::Signal TriggerArmChanged; Temporal::BBT_Argument compute_start (Temporal::TempoMap::SharedPtr const &, samplepos_t start, samplepos_t end, Temporal::BBT_Offset const & q, samplepos_t& start_samples, bool& will_start); virtual timepos_t compute_end (Temporal::TempoMap::SharedPtr const &, Temporal::BBT_Time const &, samplepos_t, Temporal::Beats &) = 0; @@ -431,7 +431,7 @@ class LIBARDOUR_API Trigger : public PBD::Stateful { virtual void check_edit_swap (timepos_t const & time, bool playing, BufferSet& bufs) {} - static PBD::Signal2 TriggerPropertyChange; + static PBD::Signal TriggerPropertyChange; protected: struct UIRequests { @@ -805,17 +805,17 @@ class LIBARDOUR_API TriggerBox : public Processor, public std::enable_shared_fro static CueRecords cue_records; static bool cue_recording () { return _cue_recording; } static void set_cue_recording (bool yn); - static PBD::Signal0 CueRecordingChanged; + static PBD::Signal CueRecordingChanged; void set_record_enabled (bool yn); RecordState record_enabled() const { return _record_state; } - PBD::Signal0 RecEnableChanged; - static PBD::Signal0 TriggerRecEnableChanged; + PBD::Signal RecEnableChanged; + static PBD::Signal TriggerRecEnableChanged; void arm_from_another_thread (Trigger& slot, samplepos_t, uint32_t chans); void disarm(); bool armed() const { return (bool) _arm_info.load(); } - PBD::Signal0 ArmedChanged; + PBD::Signal ArmedChanged; void run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes, bool result_required); void run_cycle (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double speed, pframes_t nframes); @@ -823,7 +823,7 @@ class LIBARDOUR_API TriggerBox : public Processor, public std::enable_shared_fro bool configure_io (ChanCount in, ChanCount out); bool empty() const { return _active_slots == 0; } - PBD::Signal0 EmptyStatusChanged; + PBD::Signal EmptyStatusChanged; int32_t order() const { return _order; } void set_order(int32_t n); @@ -891,7 +891,7 @@ class LIBARDOUR_API TriggerBox : public Processor, public std::enable_shared_fro /* valid only within the ::run() call tree */ int32_t active_scene() const { return _active_scene; } - PBD::Signal1 TriggerSwapped; + PBD::Signal TriggerSwapped; enum TriggerMidiMapMode { AbletonPush, @@ -935,13 +935,13 @@ class LIBARDOUR_API TriggerBox : public Processor, public std::enable_shared_fro static PBD::PropertyChange all_trigger_props(); void send_property_change (PBD::PropertyChange pc); - static PBD::Signal2 TriggerBoxPropertyChange; + static PBD::Signal TriggerBoxPropertyChange; std::shared_ptr get_gui_feed_buffer () const; void dump (std::ostream &) const; - PBD::Signal1 Captured; + PBD::Signal Captured; private: struct Requests { @@ -1051,7 +1051,7 @@ class LIBARDOUR_API TriggerBox : public Processor, public std::enable_shared_fro static bool _learning; static std::pair learning_for; - static PBD::Signal0 TriggerMIDILearned; + static PBD::Signal TriggerMIDILearned; static void init_pool(); diff --git a/libs/ardour/ardour/vca.h b/libs/ardour/ardour/vca.h index c3d8b5be8c..e09f1582bd 100644 --- a/libs/ardour/ardour/vca.h +++ b/libs/ardour/ardour/vca.h @@ -60,7 +60,7 @@ class LIBARDOUR_API VCA : public Stripable, XMLNode& get_state() const; int set_state (XMLNode const&, int version); - PBD::Signal0 Drop; /* signal to slaves to drop control by this VCA */ + PBD::Signal Drop; /* signal to slaves to drop control by this VCA */ /* Slavable API */ diff --git a/libs/ardour/ardour/vca_manager.h b/libs/ardour/ardour/vca_manager.h index f51625d52c..8d5ad2afe6 100644 --- a/libs/ardour/ardour/vca_manager.h +++ b/libs/ardour/ardour/vca_manager.h @@ -52,8 +52,8 @@ public: VCAList vcas() const; VCAList::size_type n_vcas() const { return _vcas.size(); } - PBD::Signal1 VCAAdded; - PBD::Signal0 VCACreated; /*<< is not emitted during set_state */ + PBD::Signal VCAAdded; + PBD::Signal VCACreated; /*<< is not emitted during set_state */ XMLNode& get_state() const; int set_state (XMLNode const&, int version); diff --git a/libs/ardour/ardour/vst3_plugin.h b/libs/ardour/ardour/vst3_plugin.h index 8a9d83fb1a..9bc671baa5 100644 --- a/libs/ardour/ardour/vst3_plugin.h +++ b/libs/ardour/ardour/vst3_plugin.h @@ -100,7 +100,7 @@ public: IPlugView* view (); void close_view (); void update_contoller_param (); - PBD::Signal2 OnResizeView; + PBD::Signal OnResizeView; tresult PLUGIN_API queryInterface (const TUID _iid, void** obj) SMTG_OVERRIDE; uint32 PLUGIN_API addRef () SMTG_OVERRIDE { return 1; } @@ -178,7 +178,7 @@ public: ParamValueChanged }; - PBD::Signal3 OnParameterChange; + PBD::Signal OnParameterChange; /* API for Ardour -- Setup/Processing */ uint32_t plugin_latency (); @@ -444,7 +444,7 @@ public: void close_view (); void update_contoller_param (); - PBD::Signal2 OnResizeView; + PBD::Signal OnResizeView; private: samplecnt_t plugin_latency () const; diff --git a/libs/ardour/ardour/vst_plugin.h b/libs/ardour/ardour/vst_plugin.h index e3398fec77..e54fd68600 100644 --- a/libs/ardour/ardour/vst_plugin.h +++ b/libs/ardour/ardour/vst_plugin.h @@ -63,8 +63,8 @@ public: std::string describe_parameter (Evoral::Parameter); std::set automatable() const; - PBD::Signal0 LoadPresetProgram; - PBD::Signal0 VSTSizeWindow; + PBD::Signal LoadPresetProgram; + PBD::Signal VSTSizeWindow; bool parameter_is_audio (uint32_t) const { return false; } bool parameter_is_control (uint32_t) const { return true; } diff --git a/libs/ardour/audiofilesource.cc b/libs/ardour/audiofilesource.cc index ee5972f07c..c3e83bfa13 100644 --- a/libs/ardour/audiofilesource.cc +++ b/libs/ardour/audiofilesource.cc @@ -72,7 +72,7 @@ using namespace ARDOUR; using namespace PBD; using namespace Glib; -PBD::Signal0 AudioFileSource::HeaderPositionOffsetChanged; +PBD::Signal AudioFileSource::HeaderPositionOffsetChanged; samplecnt_t AudioFileSource::header_position_offset = 0; /* XXX maybe this too */ diff --git a/libs/ardour/automation_list.cc b/libs/ardour/automation_list.cc index 9c50835590..e2c7574249 100644 --- a/libs/ardour/automation_list.cc +++ b/libs/ardour/automation_list.cc @@ -49,7 +49,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PBD::Signal1 AutomationList::AutomationListCreated; +PBD::Signal AutomationList::AutomationListCreated; #if 0 static void dumpit (const AutomationList& al, string prefix = "") diff --git a/libs/ardour/clip_library.cc b/libs/ardour/clip_library.cc index c036269c6c..eecb63f9e3 100644 --- a/libs/ardour/clip_library.cc +++ b/libs/ardour/clip_library.cc @@ -40,7 +40,7 @@ using namespace ARDOUR; using namespace std; using namespace PBD; -PBD::Signal2 ARDOUR::LibraryClipAdded; +PBD::Signal ARDOUR::LibraryClipAdded; string ARDOUR::clip_library_dir (bool create_if_missing) diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 43ed625498..4746162129 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -63,7 +63,7 @@ using namespace PBD; ControlProtocolManager* ControlProtocolManager::_instance = 0; const string ControlProtocolManager::state_node_name = X_("ControlProtocols"); -PBD::Signal1 ControlProtocolManager::StripableSelectionChanged; +PBD::Signal ControlProtocolManager::StripableSelectionChanged; #ifdef HAVE_USB static int diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index b350c9a4fe..b7efde08af 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -50,7 +50,7 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -PBD::Signal0 Delivery::PannersLegal; +PBD::Signal Delivery::PannersLegal; bool Delivery::panners_legal = false; /* deliver to an existing IO object */ diff --git a/libs/ardour/disk_io.cc b/libs/ardour/disk_io.cc index 3bb19b3905..cfd7832778 100644 --- a/libs/ardour/disk_io.cc +++ b/libs/ardour/disk_io.cc @@ -45,8 +45,8 @@ using namespace std; const string DiskIOProcessor::state_node_name = X_("DiskIOProcessor"); -// PBD::Signal0 DiskIOProcessor::DiskOverrun; -// PBD::Signal0 DiskIOProcessor::DiskUnderrun; +// PBD::Signal DiskIOProcessor::DiskOverrun; +// PBD::Signal DiskIOProcessor::DiskUnderrun; DiskIOProcessor::DiskIOProcessor (Session& s, Track& t, string const & str, Flag f, Temporal::TimeDomainProvider const & tdp) : Processor (s, str, tdp) diff --git a/libs/ardour/disk_reader.cc b/libs/ardour/disk_reader.cc index 439b3c7232..f04ee305f5 100644 --- a/libs/ardour/disk_reader.cc +++ b/libs/ardour/disk_reader.cc @@ -48,7 +48,7 @@ using namespace PBD; using namespace std; ARDOUR::samplecnt_t DiskReader::_chunk_samples = default_chunk_samples (); -PBD::Signal0 DiskReader::Underrun; +PBD::Signal DiskReader::Underrun; thread_local Sample* DiskReader::_sum_buffer = 0; thread_local Sample* DiskReader::_mixdown_buffer = 0; thread_local gain_t* DiskReader::_gain_buffer = 0; diff --git a/libs/ardour/disk_writer.cc b/libs/ardour/disk_writer.cc index 1fb04b270c..0e9d914bec 100644 --- a/libs/ardour/disk_writer.cc +++ b/libs/ardour/disk_writer.cc @@ -45,7 +45,7 @@ using namespace PBD; using namespace std; ARDOUR::samplecnt_t DiskWriter::_chunk_samples = DiskWriter::default_chunk_samples (); -PBD::Signal0 DiskWriter::Overrun; +PBD::Signal DiskWriter::Overrun; DiskWriter::DiskWriter (Session& s, Track& t, string const & str, DiskIOProcessor::Flag f) : DiskIOProcessor (s, t, X_("recorder:") + str, f, Temporal::TimeDomainProvider (Config->get_default_automation_time_domain())) diff --git a/libs/ardour/element_importer.cc b/libs/ardour/element_importer.cc index a3940b08c8..6f5b3ef5f8 100644 --- a/libs/ardour/element_importer.cc +++ b/libs/ardour/element_importer.cc @@ -34,8 +34,8 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -PBD::Signal2,string, string> ElementImporter::Rename; -PBD::Signal1 ElementImporter::Prompt; +PBD::Signal(string, string)> ElementImporter::Rename; +PBD::Signal ElementImporter::Prompt; ElementImporter::ElementImporter (XMLTree const & source, ARDOUR::Session & session) : source (source), diff --git a/libs/ardour/file_source.cc b/libs/ardour/file_source.cc index b14e84b0cb..a63f050287 100644 --- a/libs/ardour/file_source.cc +++ b/libs/ardour/file_source.cc @@ -56,7 +56,7 @@ using namespace ARDOUR; using namespace PBD; using namespace Glib; -PBD::Signal2 > FileSource::AmbiguousFileName; +PBD::Signal )> FileSource::AmbiguousFileName; FileSource::FileSource (Session& session, DataType type, const string& path, const string& origin, Source::Flag flag) : Source(session, type, path, flag) diff --git a/libs/ardour/globals.cc b/libs/ardour/globals.cc index 80c13d96df..0339164e6d 100644 --- a/libs/ardour/globals.cc +++ b/libs/ardour/globals.cc @@ -155,11 +155,11 @@ mix_buffers_with_gain_t ARDOUR::mix_buffers_with_gain = 0; mix_buffers_no_gain_t ARDOUR::mix_buffers_no_gain = 0; copy_vector_t ARDOUR::copy_vector = 0; -PBD::Signal1 ARDOUR::BootMessage; -PBD::Signal3 ARDOUR::PluginScanMessage; -PBD::Signal1 ARDOUR::PluginScanTimeout; -PBD::Signal0 ARDOUR::GUIIdle; -PBD::Signal3 ARDOUR::CopyConfigurationFiles; +PBD::Signal ARDOUR::BootMessage; +PBD::Signal ARDOUR::PluginScanMessage; +PBD::Signal ARDOUR::PluginScanTimeout; +PBD::Signal ARDOUR::GUIIdle; +PBD::Signal ARDOUR::CopyConfigurationFiles; std::map ARDOUR::reserved_io_names; diff --git a/libs/ardour/internal_send.cc b/libs/ardour/internal_send.cc index 1e1511c5fc..7b73e5745f 100644 --- a/libs/ardour/internal_send.cc +++ b/libs/ardour/internal_send.cc @@ -47,7 +47,7 @@ using namespace PBD; using namespace ARDOUR; using namespace std; -PBD::Signal1 InternalSend::CycleStart; +PBD::Signal InternalSend::CycleStart; InternalSend::InternalSend (Session& s, std::shared_ptr p, diff --git a/libs/ardour/io.cc b/libs/ardour/io.cc index b334fbc625..8f66ca777f 100644 --- a/libs/ardour/io.cc +++ b/libs/ardour/io.cc @@ -63,7 +63,7 @@ using namespace ARDOUR; using namespace PBD; const string IO::state_node_name = "IO"; -PBD::Signal1 IO::PortCountChanged; +PBD::Signal IO::PortCountChanged; static std::string legalize_io_name (std::string n) diff --git a/libs/ardour/latent.cc b/libs/ardour/latent.cc index c31b1ec545..3ba37f8c23 100644 --- a/libs/ardour/latent.cc +++ b/libs/ardour/latent.cc @@ -23,7 +23,7 @@ using namespace ARDOUR; bool ARDOUR::Latent::_zero_latency = false; -PBD::Signal0 Latent::DisableSwitchChanged; +PBD::Signal Latent::DisableSwitchChanged; Latent::Latent () : HasLatency () diff --git a/libs/ardour/location.cc b/libs/ardour/location.cc index f807590834..95e1311268 100644 --- a/libs/ardour/location.cc +++ b/libs/ardour/location.cc @@ -55,15 +55,15 @@ using namespace ARDOUR; using namespace PBD; using namespace Temporal; -PBD::Signal1 Location::name_changed; -PBD::Signal1 Location::end_changed; -PBD::Signal1 Location::start_changed; -PBD::Signal1 Location::flags_changed; -PBD::Signal1 Location::lock_changed; -PBD::Signal1 Location::cue_change; -PBD::Signal1 Location::scene_changed; -PBD::Signal1 Location::time_domain_changed; -PBD::Signal1 Location::changed; +PBD::Signal Location::name_changed; +PBD::Signal Location::end_changed; +PBD::Signal Location::start_changed; +PBD::Signal Location::flags_changed; +PBD::Signal Location::lock_changed; +PBD::Signal Location::cue_change; +PBD::Signal Location::scene_changed; +PBD::Signal Location::time_domain_changed; +PBD::Signal Location::changed; Location::Location (Session& s) : SessionHandleRef (s) diff --git a/libs/ardour/mixer_scene.cc b/libs/ardour/mixer_scene.cc index 5ca7928459..040cb188c6 100644 --- a/libs/ardour/mixer_scene.cc +++ b/libs/ardour/mixer_scene.cc @@ -29,7 +29,7 @@ using namespace PBD; using namespace ARDOUR; -PBD::Signal0 MixerScene::Change; +PBD::Signal MixerScene::Change; MixerScene::MixerScene (Session& s) : SessionHandleRef (s) diff --git a/libs/ardour/playlist_factory.cc b/libs/ardour/playlist_factory.cc index e7849e33d7..8150ecb7cf 100644 --- a/libs/ardour/playlist_factory.cc +++ b/libs/ardour/playlist_factory.cc @@ -32,7 +32,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PBD::Signal1> PlaylistFactory::PlaylistCreated; +PBD::Signal)> PlaylistFactory::PlaylistCreated; std::shared_ptr PlaylistFactory::create (Session& s, const XMLNode& node, bool hidden) diff --git a/libs/ardour/plugin.cc b/libs/ardour/plugin.cc index 06e442d91a..52444799d6 100644 --- a/libs/ardour/plugin.cc +++ b/libs/ardour/plugin.cc @@ -77,7 +77,7 @@ using namespace PBD; namespace ARDOUR { class AudioEngine; } -PBD::Signal3 Plugin::PresetsChanged; +PBD::Signal Plugin::PresetsChanged; bool PluginInfo::needs_midi_input () const diff --git a/libs/ardour/port.cc b/libs/ardour/port.cc index d7bafecc68..5f107ec089 100644 --- a/libs/ardour/port.cc +++ b/libs/ardour/port.cc @@ -39,9 +39,9 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PBD::Signal0 Port::PortDrop; -PBD::Signal0 Port::PortSignalDrop; -PBD::Signal0 Port::ResamplerQualityChanged; +PBD::Signal Port::PortDrop; +PBD::Signal Port::PortSignalDrop; +PBD::Signal Port::ResamplerQualityChanged; bool Port::_connecting_blocked = false; pframes_t Port::_global_port_buffer_offset = 0; diff --git a/libs/ardour/presentation_info.cc b/libs/ardour/presentation_info.cc index 94a1844dfa..4110e279a7 100644 --- a/libs/ardour/presentation_info.cc +++ b/libs/ardour/presentation_info.cc @@ -46,7 +46,7 @@ using std::string; string PresentationInfo::state_node_name = X_("PresentationInfo"); -PBD::Signal1 PresentationInfo::Change; +PBD::Signal PresentationInfo::Change; Glib::Threads::Mutex PresentationInfo::static_signal_lock; std::atomic PresentationInfo::_change_signal_suspended (0); PBD::PropertyChange PresentationInfo::_pending_static_changes; diff --git a/libs/ardour/region.cc b/libs/ardour/region.cc index 9d6fea03cb..a6e4825b50 100644 --- a/libs/ardour/region.cc +++ b/libs/ardour/region.cc @@ -92,7 +92,7 @@ namespace ARDOUR { } } -PBD::Signal2,const PropertyChange&> Region::RegionsPropertyChanged; +PBD::Signal,const PropertyChange&)> Region::RegionsPropertyChanged; /* these static values are used by Region Groups to assign a group-id across the scope of an operation that might span many function calls */ uint64_t Region::_retained_group_id = 0; diff --git a/libs/ardour/region_factory.cc b/libs/ardour/region_factory.cc index c1726304c8..b611d08f17 100644 --- a/libs/ardour/region_factory.cc +++ b/libs/ardour/region_factory.cc @@ -42,7 +42,7 @@ using namespace ARDOUR; using namespace PBD; using namespace std; -PBD::Signal1 > RegionFactory::CheckNewRegion; +PBD::Signal )> RegionFactory::CheckNewRegion; Glib::Threads::Mutex RegionFactory::region_map_lock; RegionFactory::RegionMap RegionFactory::region_map; PBD::ScopedConnectionList* RegionFactory::region_list_connections = 0; diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 478bf2dd50..57ac1b5644 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -110,9 +110,9 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PBD::Signal3, std::shared_ptr, Route::PluginSetupOptions > Route::PluginSetup; +PBD::Signal, std::shared_ptr, Route::PluginSetupOptions )> Route::PluginSetup; -PBD::Signal1 > Route::FanOut; +PBD::Signal )> Route::FanOut; /** Base class for all routable/mixable objects (tracks and busses) */ Route::Route (Session& sess, string name, PresentationInfo::Flag flag, DataType default_type) diff --git a/libs/ardour/send.cc b/libs/ardour/send.cc index f6a20590d1..e5a5ad1e93 100644 --- a/libs/ardour/send.cc +++ b/libs/ardour/send.cc @@ -51,8 +51,8 @@ using namespace ARDOUR; using namespace PBD; using namespace std; -PBD::Signal0 LatentSend::ChangedLatency; -PBD::Signal0 LatentSend::QueueUpdate; +PBD::Signal LatentSend::ChangedLatency; +PBD::Signal LatentSend::QueueUpdate; LatentSend::LatentSend () : _delay_in (0) diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index c1e706dd06..e0f9849a78 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -165,22 +165,22 @@ bool Session::_disable_all_loaded_plugins = false; bool Session::_bypass_all_loaded_plugins = false; std::atomic Session::_name_id_counter (0); -PBD::Signal1 Session::Dialog; -PBD::Signal0 Session::AskAboutPendingState; -PBD::Signal2 Session::AskAboutSampleRateMismatch; -PBD::Signal2 Session::NotifyAboutSampleRateMismatch; -PBD::Signal0 Session::SendFeedback; -PBD::Signal3 Session::MissingFile; +PBD::Signal Session::Dialog; +PBD::Signal Session::AskAboutPendingState; +PBD::Signal Session::AskAboutSampleRateMismatch; +PBD::Signal Session::NotifyAboutSampleRateMismatch; +PBD::Signal Session::SendFeedback; +PBD::Signal Session::MissingFile; -PBD::Signal1 Session::StartTimeChanged; -PBD::Signal1 Session::EndTimeChanged; -PBD::Signal4 Session::Exported; -PBD::Signal1 > Session::AskAboutPlaylistDeletion; -PBD::Signal0 Session::Quit; -PBD::Signal0 Session::FeedbackDetected; -PBD::Signal0 Session::SuccessfulGraphSort; -PBD::Signal2 Session::VersionMismatch; -PBD::Signal0 Session::AfterConnect; +PBD::Signal Session::StartTimeChanged; +PBD::Signal Session::EndTimeChanged; +PBD::Signal Session::Exported; +PBD::Signal )> Session::AskAboutPlaylistDeletion; +PBD::Signal Session::Quit; +PBD::Signal Session::FeedbackDetected; +PBD::Signal Session::SuccessfulGraphSort; +PBD::Signal Session::VersionMismatch; +PBD::Signal Session::AfterConnect; const samplecnt_t Session::bounce_chunk_size = 8192; static void clean_up_session_event (SessionEvent* ev) { delete ev; } diff --git a/libs/ardour/slavable.cc b/libs/ardour/slavable.cc index c2e16b2f70..b80507d299 100644 --- a/libs/ardour/slavable.cc +++ b/libs/ardour/slavable.cc @@ -36,7 +36,7 @@ using namespace PBD; using namespace ARDOUR; std::string Slavable::xml_node_name = X_("Slavable"); -PBD::Signal1 Slavable::Assign; /* signal sent once +PBD::Signal Slavable::Assign; /* signal sent once * assignment is possible */ Slavable::Slavable () diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 332bbf3293..75be0d5768 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -52,7 +52,7 @@ using namespace ARDOUR; using namespace std; using namespace PBD; -PBD::Signal1> SourceFactory::SourceCreated; +PBD::Signal)> SourceFactory::SourceCreated; Glib::Threads::Cond SourceFactory::PeaksToBuild; Glib::Threads::Mutex SourceFactory::peak_building_lock; std::list> SourceFactory::files_with_peaks; diff --git a/libs/ardour/triggerbox.cc b/libs/ardour/triggerbox.cc index 1b5084e2e0..1162d86ecd 100644 --- a/libs/ardour/triggerbox.cc +++ b/libs/ardour/triggerbox.cc @@ -209,8 +209,8 @@ FollowAction::to_string () const Trigger * const Trigger::MagicClearPointerValue = (Trigger*) 0xfeedface; -PBD::Signal2 Trigger::TriggerPropertyChange; -PBD::Signal1 Trigger::TriggerArmChanged; +PBD::Signal Trigger::TriggerPropertyChange; +PBD::Signal Trigger::TriggerArmChanged; Trigger::Trigger (uint32_t n, TriggerBox& b) : _launch_style (Properties::launch_style, OneShot) @@ -3441,18 +3441,18 @@ std::atomic TriggerBox::active_trigger_boxes (0); TriggerBoxThread* TriggerBox::worker = 0; CueRecords TriggerBox::cue_records (256); std::atomic TriggerBox::_cue_recording (false); -PBD::Signal0 TriggerBox::CueRecordingChanged; +PBD::Signal TriggerBox::CueRecordingChanged; bool TriggerBox::roll_requested = false; bool TriggerBox::_learning = false; TriggerBox::CustomMidiMap TriggerBox::_custom_midi_map; std::pair TriggerBox::learning_for; -PBD::Signal0 TriggerBox::TriggerMIDILearned; +PBD::Signal TriggerBox::TriggerMIDILearned; std::shared_ptr TriggerBox::input_parser; PBD::ScopedConnectionList TriggerBox::static_connections; PBD::ScopedConnection TriggerBox::midi_input_connection; std::shared_ptr TriggerBox::current_input; -PBD::Signal2 TriggerBox::TriggerBoxPropertyChange; +PBD::Signal TriggerBox::TriggerBoxPropertyChange; typedef std::map , std::shared_ptr> RegionStateMap; RegionStateMap enqueued_state_map; diff --git a/libs/audiographer/audiographer/general/cmdpipe_writer.h b/libs/audiographer/audiographer/general/cmdpipe_writer.h index 249ccf8573..648e4a3e03 100644 --- a/libs/audiographer/audiographer/general/cmdpipe_writer.h +++ b/libs/audiographer/audiographer/general/cmdpipe_writer.h @@ -105,7 +105,7 @@ public: using Sink::process; - PBD::Signal1 FileWritten; + PBD::Signal FileWritten; private: CmdPipeWriter (CmdPipeWriter const & other) {} diff --git a/libs/audiographer/audiographer/sndfile/sndfile_writer.h b/libs/audiographer/audiographer/sndfile/sndfile_writer.h index dba2a89b56..f88eed2267 100644 --- a/libs/audiographer/audiographer/sndfile/sndfile_writer.h +++ b/libs/audiographer/audiographer/sndfile/sndfile_writer.h @@ -73,7 +73,7 @@ class SndfileWriter using Sink::process; - PBD::Signal1 FileWritten; + PBD::Signal FileWritten; protected: /// SndfileHandle has to be constructed directly by deriving classes diff --git a/libs/audiographer/audiographer/sndfile/tmp_file.h b/libs/audiographer/audiographer/sndfile/tmp_file.h index d6bc5546a5..ed25fa42c7 100644 --- a/libs/audiographer/audiographer/sndfile/tmp_file.h +++ b/libs/audiographer/audiographer/sndfile/tmp_file.h @@ -21,7 +21,7 @@ class TmpFile { public: virtual ~TmpFile () {} - PBD::Signal0 FileFlushed; + PBD::Signal FileFlushed; }; diff --git a/libs/backends/alsa/alsa_audiobackend.h b/libs/backends/alsa/alsa_audiobackend.h index 0614a773d8..6b0ecb3fa2 100644 --- a/libs/backends/alsa/alsa_audiobackend.h +++ b/libs/backends/alsa/alsa_audiobackend.h @@ -393,7 +393,7 @@ class AlsaAudioBackend : public AudioBackend, public PortEngineSharedImpl std::vector inputs; std::vector outputs; - PBD::Signal0 UpdateLatency; + PBD::Signal UpdateLatency; PBD::ScopedConnection latency_connection; protected: diff --git a/libs/backends/alsa/alsa_slave.h b/libs/backends/alsa/alsa_slave.h index 82ba1e3d71..e2c0a0b2b5 100644 --- a/libs/backends/alsa/alsa_slave.h +++ b/libs/backends/alsa/alsa_slave.h @@ -60,7 +60,7 @@ public: uint32_t nplay (void) const { return _pcmi.nplay (); } uint32_t ncapt (void) const { return _pcmi.ncapt (); } - PBD::Signal0 Halted; + PBD::Signal Halted; protected: virtual void update_latencies (uint32_t, uint32_t) = 0; diff --git a/libs/backends/jack/jack_connection.h b/libs/backends/jack/jack_connection.h index f0fb2c1fdb..b9aaab7aa8 100644 --- a/libs/backends/jack/jack_connection.h +++ b/libs/backends/jack/jack_connection.h @@ -21,8 +21,8 @@ class JackConnection { jack_client_t* jack() const { return _jack; } - PBD::Signal0 Connected; - PBD::Signal1 Disconnected; + PBD::Signal Connected; + PBD::Signal Disconnected; void halted_callback (); void halted_info_callback (jack_status_t, const char*); diff --git a/libs/canvas/canvas/image.h b/libs/canvas/canvas/image.h index fd0630295b..1d6320a94c 100644 --- a/libs/canvas/canvas/image.h +++ b/libs/canvas/canvas/image.h @@ -105,7 +105,7 @@ private: mutable Cairo::RefPtr _surface; void accept_data (); - PBD::Signal0 DataReady; + PBD::Signal DataReady; PBD::ScopedConnectionList data_connections; }; diff --git a/libs/ctrl-interface/control_protocol/basic_ui.cc b/libs/ctrl-interface/control_protocol/basic_ui.cc index 8e906da5d8..5a1dbc7e7f 100644 --- a/libs/ctrl-interface/control_protocol/basic_ui.cc +++ b/libs/ctrl-interface/control_protocol/basic_ui.cc @@ -41,7 +41,7 @@ using namespace ARDOUR; using namespace Temporal; -PBD::Signal2 BasicUI::AccessAction; +PBD::Signal BasicUI::AccessAction; BasicUI::BasicUI (Session& s) : session (&s), diff --git a/libs/ctrl-interface/control_protocol/control_protocol.cc b/libs/ctrl-interface/control_protocol/control_protocol.cc index bbf307b1d1..4eec33470d 100644 --- a/libs/ctrl-interface/control_protocol/control_protocol.cc +++ b/libs/ctrl-interface/control_protocol/control_protocol.cc @@ -41,22 +41,22 @@ using namespace ARDOUR; using namespace std; using namespace PBD; -PBD::Signal0 ControlProtocol::ZoomToSession; -PBD::Signal0 ControlProtocol::ZoomOut; -PBD::Signal0 ControlProtocol::ZoomIn; -PBD::Signal0 ControlProtocol::Enter; -PBD::Signal0 ControlProtocol::Undo; -PBD::Signal0 ControlProtocol::Redo; -PBD::Signal1 ControlProtocol::ScrollTimeline; -PBD::Signal1 ControlProtocol::GotoView; -PBD::Signal0 ControlProtocol::CloseDialog; -PBD::Signal0 ControlProtocol::VerticalZoomInAll; -PBD::Signal0 ControlProtocol::VerticalZoomOutAll; -PBD::Signal0 ControlProtocol::VerticalZoomInSelected; -PBD::Signal0 ControlProtocol::VerticalZoomOutSelected; -PBD::Signal0 ControlProtocol::StepTracksDown; -PBD::Signal0 ControlProtocol::StepTracksUp; -PBD::Signal1 > ControlProtocol::PluginSelected; +PBD::Signal ControlProtocol::ZoomToSession; +PBD::Signal ControlProtocol::ZoomOut; +PBD::Signal ControlProtocol::ZoomIn; +PBD::Signal ControlProtocol::Enter; +PBD::Signal ControlProtocol::Undo; +PBD::Signal ControlProtocol::Redo; +PBD::Signal ControlProtocol::ScrollTimeline; +PBD::Signal ControlProtocol::GotoView; +PBD::Signal ControlProtocol::CloseDialog; +PBD::Signal ControlProtocol::VerticalZoomInAll; +PBD::Signal ControlProtocol::VerticalZoomOutAll; +PBD::Signal ControlProtocol::VerticalZoomInSelected; +PBD::Signal ControlProtocol::VerticalZoomOutSelected; +PBD::Signal ControlProtocol::StepTracksDown; +PBD::Signal ControlProtocol::StepTracksUp; +PBD::Signal )> ControlProtocol::PluginSelected; StripableNotificationList ControlProtocol::_last_selected; PBD::ScopedConnection ControlProtocol::selection_connection; diff --git a/libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h b/libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h index 431b9fe3a9..a1a0f0c436 100644 --- a/libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h +++ b/libs/ctrl-interface/control_protocol/control_protocol/basic_ui.h @@ -62,7 +62,7 @@ class LIBCONTROLCP_API BasicUI { void loop_toggle (); void loop_location (Temporal::timepos_t const & start, Temporal::timepos_t const & end); void access_action ( std::string action_path ); - static PBD::Signal2 AccessAction; + static PBD::Signal AccessAction; void goto_zero (); void goto_start (bool and_roll = false); void goto_end (); diff --git a/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h b/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h index 55ca8b42df..8f10e7d9a8 100644 --- a/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h +++ b/libs/ctrl-interface/control_protocol/control_protocol/control_protocol.h @@ -61,28 +61,28 @@ public: virtual void stripable_selection_changed () = 0; - PBD::Signal0 ActiveChanged; + PBD::Signal ActiveChanged; /* signals that a control protocol can emit and other (presumably graphical) * user interfaces can respond to */ - static PBD::Signal0 ZoomToSession; - static PBD::Signal0 ZoomIn; - static PBD::Signal0 ZoomOut; - static PBD::Signal0 Enter; - static PBD::Signal0 Undo; - static PBD::Signal0 Redo; - static PBD::Signal1 ScrollTimeline; - static PBD::Signal1 GotoView; - static PBD::Signal0 CloseDialog; - static PBD::Signal0 VerticalZoomInAll; - static PBD::Signal0 VerticalZoomOutAll; - static PBD::Signal0 VerticalZoomInSelected; - static PBD::Signal0 VerticalZoomOutSelected; - static PBD::Signal0 StepTracksDown; - static PBD::Signal0 StepTracksUp; - static PBD::Signal1 > PluginSelected; + static PBD::Signal ZoomToSession; + static PBD::Signal ZoomIn; + static PBD::Signal ZoomOut; + static PBD::Signal Enter; + static PBD::Signal Undo; + static PBD::Signal Redo; + static PBD::Signal ScrollTimeline; + static PBD::Signal GotoView; + static PBD::Signal CloseDialog; + static PBD::Signal VerticalZoomInAll; + static PBD::Signal VerticalZoomOutAll; + static PBD::Signal VerticalZoomInSelected; + static PBD::Signal VerticalZoomOutSelected; + static PBD::Signal StepTracksDown; + static PBD::Signal StepTracksUp; + static PBD::Signal )> PluginSelected; void add_stripable_to_selection (std::shared_ptr); void set_stripable_selection (std::shared_ptr); diff --git a/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h b/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h index 5bb8c0d1de..d35f6f53b5 100644 --- a/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h +++ b/libs/ctrl-interface/midi_surface/midi_surface/midi_surface.h @@ -80,7 +80,7 @@ class MIDISurface : public ARDOUR::ControlProtocol std::list > bundles (); - PBD::Signal0 ConnectionChange; + PBD::Signal ConnectionChange; CONTROL_PROTOCOL_THREADS_NEED_TEMPO_MAP_DECL(); diff --git a/libs/evoral/evoral/Control.h b/libs/evoral/evoral/Control.h index beb931a5c5..517a874c9c 100644 --- a/libs/evoral/evoral/Control.h +++ b/libs/evoral/evoral/Control.h @@ -66,7 +66,7 @@ public: inline const Parameter& parameter() const { return _parameter; } /** Emitted when the our ControlList is marked dirty */ - PBD::Signal0 ListMarkedDirty; + PBD::Signal ListMarkedDirty; protected: Parameter _parameter; diff --git a/libs/evoral/evoral/ControlList.h b/libs/evoral/evoral/ControlList.h index 817ae30cdb..7fafc63c4e 100644 --- a/libs/evoral/evoral/ControlList.h +++ b/libs/evoral/evoral/ControlList.h @@ -362,11 +362,11 @@ public: bool in_write_pass () const; bool in_new_write_pass () { return new_write_pass; } - PBD::Signal0 WritePassStarted; + PBD::Signal WritePassStarted; /** Emitted when mark_dirty() is called on this object */ - mutable PBD::Signal0 Dirty; + mutable PBD::Signal Dirty; /** Emitted when our interpolation style changes */ - PBD::Signal1 InterpolationChanged; + PBD::Signal InterpolationChanged; bool operator!= (ControlList const &) const; diff --git a/libs/gtkmm2ext/bindings.cc b/libs/gtkmm2ext/bindings.cc index 65bba923f8..36ac9ef7e8 100644 --- a/libs/gtkmm2ext/bindings.cc +++ b/libs/gtkmm2ext/bindings.cc @@ -45,7 +45,7 @@ using namespace Gtkmm2ext; using namespace PBD; list Bindings::bindings; /* global. Gulp */ -PBD::Signal1 Bindings::BindingsChanged; +PBD::Signal Bindings::BindingsChanged; int Bindings::_drag_active = 0; template diff --git a/libs/gtkmm2ext/gtkmm2ext/bindings.h b/libs/gtkmm2ext/gtkmm2ext/bindings.h index 5638058c1e..537c077c7e 100644 --- a/libs/gtkmm2ext/gtkmm2ext/bindings.h +++ b/libs/gtkmm2ext/gtkmm2ext/bindings.h @@ -165,7 +165,7 @@ class LIBGTKMM2EXT_API Bindings { static void associate_all (); static void save_all_bindings_as_html (std::ostream&); - static PBD::Signal1 BindingsChanged; + static PBD::Signal BindingsChanged; struct DragsBlockBindings { DragsBlockBindings() { Bindings::_drag_active++; } diff --git a/libs/midi++2/midi++/mmc.h b/libs/midi++2/midi++/mmc.h index 84dc09a8b5..098b96c466 100644 --- a/libs/midi++2/midi++/mmc.h +++ b/libs/midi++2/midi++/mmc.h @@ -45,7 +45,7 @@ class MachineControlCommand; class LIBMIDIPP_API MachineControl { public: - typedef PBD::Signal1 MMCSignal; + typedef PBD::Signal MMCSignal; enum Command { cmdStop = 0x1, @@ -154,28 +154,28 @@ class LIBMIDIPP_API MachineControl MMCSignal Wait; MMCSignal Resume; - PBD::Signal0 SPPStart; - PBD::Signal0 SPPContinue; - PBD::Signal0 SPPStop; + PBD::Signal SPPStart; + PBD::Signal SPPContinue; + PBD::Signal SPPStop; /* The second argument is the shuttle speed, the third is true if the direction is "forwards", false for "reverse" */ - PBD::Signal3 Shuttle; + PBD::Signal Shuttle; /* The second argument specifies the desired track record enabled status. */ - PBD::Signal3 + PBD::Signal TrackRecordStatusChange; /* The second argument specifies the desired track record enabled status. */ - PBD::Signal3 + PBD::Signal TrackMuteChange; /* The second argument points to a byte array containing @@ -183,11 +183,11 @@ class LIBMIDIPP_API MachineControl format (5 bytes, roughly: hrs/mins/secs/frames/subframes) */ - PBD::Signal2 Locate; + PBD::Signal Locate; /* The second argument is the number of steps to jump */ - PBD::Signal2 Step; + PBD::Signal Step; #define MMC_NTRACKS 48 diff --git a/libs/midi++2/midi++/parser.h b/libs/midi++2/midi++/parser.h index cf3aa9083c..be6a956afc 100644 --- a/libs/midi++2/midi++/parser.h +++ b/libs/midi++2/midi++/parser.h @@ -34,16 +34,16 @@ namespace MIDI { class Port; class Parser; -typedef PBD::Signal1 ZeroByteSignal; -typedef PBD::Signal2 BankSignal; -typedef PBD::Signal2 TimestampedSignal; -typedef PBD::Signal2 OneByteSignal; -typedef PBD::Signal2 TwoByteSignal; -typedef PBD::Signal2 PitchBendSignal; -typedef PBD::Signal3 RPNSignal; -typedef PBD::Signal3 RPNValueSignal; -typedef PBD::Signal3 Signal; -typedef PBD::Signal4 AnySignal; +typedef PBD::Signal ZeroByteSignal; +typedef PBD::Signal BankSignal; +typedef PBD::Signal TimestampedSignal; +typedef PBD::Signal OneByteSignal; +typedef PBD::Signal TwoByteSignal; +typedef PBD::Signal PitchBendSignal; +typedef PBD::Signal RPNSignal; +typedef PBD::Signal RPNValueSignal; +typedef PBD::Signal Signal; +typedef PBD::Signal AnySignal; class LIBMIDIPP_API Parser { public: @@ -119,9 +119,9 @@ class LIBMIDIPP_API Parser { void set_offline (bool); bool offline() const { return _offline; } - PBD::Signal0 OfflineStatusChanged; + PBD::Signal OfflineStatusChanged; - PBD::Signal2 edit; + PBD::Signal edit; void set_mmc_forwarding (bool yn) { _mmc_forward = yn; @@ -134,10 +134,10 @@ class LIBMIDIPP_API Parser { const byte *mtc_current() const { return _mtc_time; } bool mtc_locked() const { return _mtc_locked; } - PBD::Signal3 mtc_qtr; - PBD::Signal3 mtc_time; - PBD::Signal1 mtc_status; - PBD::Signal0 mtc_skipped; + PBD::Signal mtc_qtr; + PBD::Signal mtc_time; + PBD::Signal mtc_status; + PBD::Signal mtc_skipped; void set_mtc_forwarding (bool yn) { _mtc_forward = yn; diff --git a/libs/pbd/controllable.cc b/libs/pbd/controllable.cc index 31857a713b..cbc1c1576e 100644 --- a/libs/pbd/controllable.cc +++ b/libs/pbd/controllable.cc @@ -32,10 +32,10 @@ using namespace PBD; using namespace std; -PBD::Signal1 > Controllable::StartLearning; -PBD::Signal1 > Controllable::StopLearning; -PBD::Signal1 > Controllable::GUIFocusChanged; -PBD::Signal1 > Controllable::ControlTouched; +PBD::Signal )> Controllable::StartLearning; +PBD::Signal )> Controllable::StopLearning; +PBD::Signal )> Controllable::GUIFocusChanged; +PBD::Signal )> Controllable::ControlTouched; Glib::Threads::RWLock Controllable::registry_lock; Controllable::Controllables Controllable::registry; diff --git a/libs/pbd/pbd/configuration.h b/libs/pbd/pbd/configuration.h index a317145d93..eb6351db71 100644 --- a/libs/pbd/pbd/configuration.h +++ b/libs/pbd/pbd/configuration.h @@ -44,7 +44,7 @@ class LIBPBD_API Configuration : public PBD::Stateful virtual XMLNode & get_variables (std::string const & nodename) const = 0; virtual void set_variables (XMLNode const &) = 0; - PBD::Signal1 ParameterChanged; + PBD::Signal ParameterChanged; typedef std::vector Metadata; diff --git a/libs/pbd/pbd/controllable.h b/libs/pbd/pbd/controllable.h index 23b9996210..4cd0433d09 100644 --- a/libs/pbd/pbd/controllable.h +++ b/libs/pbd/pbd/controllable.h @@ -138,15 +138,15 @@ public: virtual std::string get_user_string() const { return std::string(); } - PBD::Signal0 LearningFinished; + PBD::Signal LearningFinished; - static PBD::Signal1 > StartLearning; - static PBD::Signal1 > StopLearning; + static PBD::Signal )> StartLearning; + static PBD::Signal )> StopLearning; - static PBD::Signal1 > GUIFocusChanged; - static PBD::Signal1 > ControlTouched; + static PBD::Signal )> GUIFocusChanged; + static PBD::Signal )> ControlTouched; - PBD::Signal2 Changed; + PBD::Signal Changed; int set_state (const XMLNode&, int version); virtual XMLNode& get_state () const; @@ -154,7 +154,7 @@ public: std::string name() const { return _name; } bool touching () const { return _touching; } - PBD::Signal0 TouchChanged; + PBD::Signal TouchChanged; bool is_toggle() const { return _flags & Toggle; } bool is_gain_like() const { return _flags & GainLike; } diff --git a/libs/pbd/pbd/destructible.h b/libs/pbd/pbd/destructible.h index d58db24b72..778ea3738e 100644 --- a/libs/pbd/pbd/destructible.h +++ b/libs/pbd/pbd/destructible.h @@ -27,8 +27,8 @@ class LIBPBD_API Destructible { public: virtual ~Destructible () { Destroyed(); } - PBD::Signal0 Destroyed; - PBD::Signal0 DropReferences; + PBD::Signal Destroyed; + PBD::Signal DropReferences; virtual void drop_references () { DropReferences(); } }; diff --git a/libs/pbd/pbd/inflater.h b/libs/pbd/pbd/inflater.h index 22e9579124..db232e99fa 100644 --- a/libs/pbd/pbd/inflater.h +++ b/libs/pbd/pbd/inflater.h @@ -40,7 +40,7 @@ class LIBPBD_API Inflater : public PBD::FileArchive , public PBD::Progress bool running() const { return thread != 0; } int status() const { return _status; } - PBD::Signal1 Progress; + PBD::Signal Progress; private: PBD::Thread* thread; diff --git a/libs/pbd/pbd/pthread_utils.h b/libs/pbd/pbd/pthread_utils.h index 181dcf9ca8..757278851c 100644 --- a/libs/pbd/pbd/pthread_utils.h +++ b/libs/pbd/pbd/pthread_utils.h @@ -99,7 +99,7 @@ LIBPBD_API bool pbd_mach_set_realtime_policy (pthread_t thread_id, double period namespace PBD { LIBPBD_API extern void notify_event_loops_about_thread_creation (pthread_t, const std::string&, int requests = 256); - LIBPBD_API extern PBD::Signal3 ThreadCreatedWithRequestSize; + LIBPBD_API extern PBD::Signal ThreadCreatedWithRequestSize; class LIBPBD_API Thread { public: diff --git a/libs/pbd/pbd/stateful.h b/libs/pbd/pbd/stateful.h index 9d10079759..8bb10b2cbc 100644 --- a/libs/pbd/pbd/stateful.h +++ b/libs/pbd/pbd/stateful.h @@ -96,7 +96,7 @@ class LIBPBD_API Stateful { virtual PropertyList* property_factory (const XMLNode&) const; /* How stateful's notify of changes to their properties */ - PBD::Signal1 PropertyChanged; + PBD::Signal PropertyChanged; static int current_state_version; static int loading_state_version; diff --git a/libs/pbd/pbd/system_exec.h b/libs/pbd/pbd/system_exec.h index e7fec70f5d..2f10abfa8d 100644 --- a/libs/pbd/pbd/system_exec.h +++ b/libs/pbd/pbd/system_exec.h @@ -202,14 +202,14 @@ class LIBPBD_API SystemExec #ifdef NOPBD /* outside ardour */ sigc::signal ReadStdout; #else - PBD::Signal2 ReadStdout; + PBD::Signal ReadStdout; #endif /** The Terminated signal is emitted when application terminates. */ #ifdef NOPBD /* outside ardour */ sigc::signal Terminated; #else - PBD::Signal0 Terminated; + PBD::Signal Terminated; #endif /** interposer to emit signal for writes to STDOUT/ERR. diff --git a/libs/pbd/pbd/transmitter.h b/libs/pbd/pbd/transmitter.h index 47ee6daa3a..5d4c368d7e 100644 --- a/libs/pbd/pbd/transmitter.h +++ b/libs/pbd/pbd/transmitter.h @@ -40,7 +40,7 @@ class LIBPBD_API Transmitter : public std::stringstream Transmitter (Channel); - PBD::Signal2 &sender() { + PBD::Signal &sender() { return *send; } @@ -52,13 +52,13 @@ class LIBPBD_API Transmitter : public std::stringstream private: Channel channel; - PBD::Signal2 *send; + PBD::Signal *send; - PBD::Signal2 debug; - PBD::Signal2 info; - PBD::Signal2 warning; - PBD::Signal2 error; - PBD::Signal2 fatal; + PBD::Signal debug; + PBD::Signal info; + PBD::Signal warning; + PBD::Signal error; + PBD::Signal fatal; }; /* for EGCS 2.91.66, if this function is not compiled within the same diff --git a/libs/pbd/pbd/undo.h b/libs/pbd/pbd/undo.h index 1eb75c89c5..5d93d451ac 100644 --- a/libs/pbd/pbd/undo.h +++ b/libs/pbd/pbd/undo.h @@ -130,9 +130,9 @@ public: void set_depth (uint32_t); - PBD::Signal0 Changed; - PBD::Signal0 BeginUndoRedo; - PBD::Signal0 EndUndoRedo; + PBD::Signal Changed; + PBD::Signal BeginUndoRedo; + PBD::Signal EndUndoRedo; private: bool _clearing; diff --git a/libs/pbd/pthread_utils.cc b/libs/pbd/pthread_utils.cc index 6a72a284ca..3e007e1208 100644 --- a/libs/pbd/pthread_utils.cc +++ b/libs/pbd/pthread_utils.cc @@ -106,7 +106,7 @@ set_win_set_realtime_policy (pthread_t thread, int priority) namespace PBD { - PBD::Signal3 ThreadCreatedWithRequestSize; + PBD::Signal ThreadCreatedWithRequestSize; } using namespace PBD; diff --git a/libs/pbd/test/signals_test.cc b/libs/pbd/test/signals_test.cc index ab70388760..2a7b343e86 100644 --- a/libs/pbd/test/signals_test.cc +++ b/libs/pbd/test/signals_test.cc @@ -21,7 +21,7 @@ public: Fred (); } - PBD::Signal0 Fred; + PBD::Signal Fred; }; static int N = 0; diff --git a/libs/surfaces/cc121/cc121.h b/libs/surfaces/cc121/cc121.h index 6ef881700e..fbb0bacc7e 100644 --- a/libs/surfaces/cc121/cc121.h +++ b/libs/surfaces/cc121/cc121.h @@ -101,7 +101,7 @@ class CC121 : public ARDOUR::ControlProtocol, public AbstractUI { void thread_init (); - PBD::Signal0 ConnectionChange; + PBD::Signal ConnectionChange; std::shared_ptr input_port(); std::shared_ptr output_port(); diff --git a/libs/surfaces/console1/c1_control.h b/libs/surfaces/console1/c1_control.h index 4dca1f66c9..0b060230e4 100644 --- a/libs/surfaces/console1/c1_control.h +++ b/libs/surfaces/console1/c1_control.h @@ -202,7 +202,7 @@ class Encoder : public Controller boost::function plugin_action; boost::function plugin_shift_action; - PBD::Signal1* plugin_signal; + PBD::Signal* plugin_signal; }; } diff --git a/libs/surfaces/console1/console1.h b/libs/surfaces/console1/console1.h index c13a81b0ff..006ce20625 100644 --- a/libs/surfaces/console1/console1.h +++ b/libs/surfaces/console1/console1.h @@ -116,16 +116,16 @@ public: bool swap_solo_mute; bool create_mapping_stubs; - PBD::Signal0 ConnectionChange; + PBD::Signal ConnectionChange; /* Timer Events */ - PBD::Signal1 BlinkIt; - PBD::Signal0 Periodic; + PBD::Signal BlinkIt; + PBD::Signal Periodic; /* Local Signals */ - PBD::Signal0 BankChange; - PBD::Signal1 ShiftChange; - PBD::Signal1 PluginStateChange; + PBD::Signal BankChange; + PBD::Signal ShiftChange; + PBD::Signal PluginStateChange; enum ControllerID { diff --git a/libs/surfaces/contourdesign/contourdesign.h b/libs/surfaces/contourdesign/contourdesign.h index c8cf2774a4..57ebb5f765 100644 --- a/libs/surfaces/contourdesign/contourdesign.h +++ b/libs/surfaces/contourdesign/contourdesign.h @@ -126,8 +126,8 @@ public: return _shuttle_speeds[index]; } - PBD::Signal1 ButtonPress; - PBD::Signal1 ButtonRelease; + PBD::Signal ButtonPress; + PBD::Signal ButtonRelease; CONTROL_PROTOCOL_THREADS_NEED_TEMPO_MAP_DECL(); diff --git a/libs/surfaces/faderport8/faderport8.h b/libs/surfaces/faderport8/faderport8.h index 99a2f39c35..ffc79b5945 100644 --- a/libs/surfaces/faderport8/faderport8.h +++ b/libs/surfaces/faderport8/faderport8.h @@ -78,7 +78,7 @@ public: bool has_editor () const { return true; } void* get_gui () const; void tear_down_gui (); - PBD::Signal0 ConnectionChange; + PBD::Signal ConnectionChange; void set_button_action (FP8Controls::ButtonId, bool, std::string const&); std::string get_button_action (FP8Controls::ButtonId, bool); diff --git a/libs/surfaces/faderport8/fp8_base.h b/libs/surfaces/faderport8/fp8_base.h index d793f7143e..210d0ca25c 100644 --- a/libs/surfaces/faderport8/fp8_base.h +++ b/libs/surfaces/faderport8/fp8_base.h @@ -123,12 +123,12 @@ public: } /* modifier keys */ - PBD::Signal1 ShiftButtonChange; - PBD::Signal1 ARMButtonChange; + PBD::Signal ShiftButtonChange; + PBD::Signal ARMButtonChange; /* timer events */ - PBD::Signal1 BlinkIt; - PBD::Signal0 Periodic; + PBD::Signal BlinkIt; + PBD::Signal Periodic; private: void sysexhdr (std::vector& d) diff --git a/libs/surfaces/faderport8/fp8_button.h b/libs/surfaces/faderport8/fp8_button.h index cf3bfe5225..40960f9537 100644 --- a/libs/surfaces/faderport8/fp8_button.h +++ b/libs/surfaces/faderport8/fp8_button.h @@ -36,8 +36,8 @@ public: virtual ~FP8ButtonInterface () {} /* user API */ - PBD::Signal0 pressed; - PBD::Signal0 released; + PBD::Signal pressed; + PBD::Signal released; virtual bool is_pressed () const { return false; } virtual bool is_active () const { return false; } @@ -197,8 +197,8 @@ public: : FP8ButtonBase (b) {} - PBD::Signal1 ActiveChanged; - PBD::Signal0 ColourChanged; + PBD::Signal ActiveChanged; + PBD::Signal ColourChanged; uint32_t color () const { return _rgba; } @@ -373,7 +373,7 @@ public: _hold_connection.disconnect (); } - PBD::Signal1 StateChange; + PBD::Signal StateChange; void set_active (bool a) { diff --git a/libs/surfaces/faderport8/fp8_controls.h b/libs/surfaces/faderport8/fp8_controls.h index f204398385..821f563f1e 100644 --- a/libs/surfaces/faderport8/fp8_controls.h +++ b/libs/surfaces/faderport8/fp8_controls.h @@ -132,8 +132,8 @@ public: bool button_name_to_enum (std::string const&, ButtonId&) const; bool button_enum_to_name (ButtonId, std::string&) const; - PBD::Signal0 FaderModeChanged; - PBD::Signal0 MixModeChanged; + PBD::Signal FaderModeChanged; + PBD::Signal MixModeChanged; #ifdef FADERPORT2 FP8Types::FaderMode fader_mode () const { return FP8Types::ModeTrack; } diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h index e2ae9267e1..80a8b3210a 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h @@ -130,7 +130,7 @@ public: void toggle_rid_selection (int rid); void remove_rid_from_selection (int rid); - PBD::Signal0 ConnectionChange; + PBD::Signal ConnectionChange; CONTROL_PROTOCOL_THREADS_NEED_TEMPO_MAP_DECL(); diff --git a/libs/surfaces/launch_control_xl/launch_control_xl.h b/libs/surfaces/launch_control_xl/launch_control_xl.h index 9205b9eb57..260045249b 100644 --- a/libs/surfaces/launch_control_xl/launch_control_xl.h +++ b/libs/surfaces/launch_control_xl/launch_control_xl.h @@ -367,7 +367,7 @@ public: XMLNode& get_state() const; int set_state(const XMLNode &node, int version); - PBD::Signal0 ConnectionChange; + PBD::Signal ConnectionChange; std::shared_ptr input_port(); std::shared_ptr output_port(); diff --git a/libs/surfaces/mackie/mackie_control_protocol.h b/libs/surfaces/mackie/mackie_control_protocol.h index 9a8011c68b..362e02902e 100644 --- a/libs/surfaces/mackie/mackie_control_protocol.h +++ b/libs/surfaces/mackie/mackie_control_protocol.h @@ -113,8 +113,8 @@ class MackieControlProtocol const MACKIE_NAMESPACE::DeviceInfo& device_info() const { return _device_info; } MACKIE_NAMESPACE::DeviceProfile& device_profile() { return _device_profile; } - PBD::Signal0 DeviceChanged; - PBD::Signal1 > ConnectionChange; + PBD::Signal DeviceChanged; + PBD::Signal )> ConnectionChange; void device_ready (); diff --git a/libs/surfaces/maschine2/m2_button.h b/libs/surfaces/maschine2/m2_button.h index d8b6f1e9a5..ae838dde69 100644 --- a/libs/surfaces/maschine2/m2_button.h +++ b/libs/surfaces/maschine2/m2_button.h @@ -32,9 +32,9 @@ class M2ButtonInterface virtual ~M2ButtonInterface () {} /* user API */ - PBD::Signal1 changed; - PBD::Signal0 pressed; - PBD::Signal0 released; + PBD::Signal changed; + PBD::Signal pressed; + PBD::Signal released; virtual void set_blinking (bool) {} virtual void set_color (uint32_t rgba) {} @@ -159,7 +159,7 @@ class M2ToggleButton : public M2Button changed.connect_same_thread (changed_connection, boost::bind (&M2ToggleButton::change_event, this, _1)); } - PBD::Signal1 toggled; + PBD::Signal toggled; bool active () const { return _active; } protected: @@ -185,7 +185,7 @@ class M2ToggleHoldButton : public M2Button changed.connect_same_thread (changed_connection, boost::bind (&M2ToggleHoldButton::change_event, this, _1)); } - PBD::Signal1 toggled; + PBD::Signal toggled; bool active () const { return _active; } void unset_active_on_release () { if (is_pressed ()) { _active_on_release = false; } } diff --git a/libs/surfaces/maschine2/m2_encoder.h b/libs/surfaces/maschine2/m2_encoder.h index 1a615e7398..f8f130fa07 100644 --- a/libs/surfaces/maschine2/m2_encoder.h +++ b/libs/surfaces/maschine2/m2_encoder.h @@ -31,7 +31,7 @@ class M2EncoderInterface virtual ~M2EncoderInterface () {} /* user API */ - PBD::Signal1 changed; + PBD::Signal changed; virtual float value () const { return 0.f; } virtual float range () const { return 0.f; } diff --git a/libs/surfaces/maschine2/m2_pad.h b/libs/surfaces/maschine2/m2_pad.h index ec56e7a48f..e93084ad34 100644 --- a/libs/surfaces/maschine2/m2_pad.h +++ b/libs/surfaces/maschine2/m2_pad.h @@ -31,11 +31,11 @@ class M2PadInterface virtual ~M2PadInterface () {} /* user API */ - PBD::Signal1 pressed; - PBD::Signal0 released; - PBD::Signal1 aftertouch; - PBD::Signal2 event; - PBD::Signal1 changed; + PBD::Signal pressed; + PBD::Signal released; + PBD::Signal aftertouch; + PBD::Signal event; + PBD::Signal changed; virtual uint16_t value () const { return 0; } virtual float pressure () const { return 0.f; } diff --git a/libs/surfaces/maschine2/m2device.h b/libs/surfaces/maschine2/m2device.h index b52383213b..0690325049 100644 --- a/libs/surfaces/maschine2/m2device.h +++ b/libs/surfaces/maschine2/m2device.h @@ -58,7 +58,7 @@ class M2Device virtual void write (hid_device*, M2Contols*) = 0; virtual Cairo::RefPtr surface () = 0; - PBD::Signal0 vblank; + PBD::Signal vblank; protected: void bump_blink () { diff --git a/libs/surfaces/maschine2/ui_menu.h b/libs/surfaces/maschine2/ui_menu.h index 157d8d1653..e71a38c5d6 100644 --- a/libs/surfaces/maschine2/ui_menu.h +++ b/libs/surfaces/maschine2/ui_menu.h @@ -55,7 +55,7 @@ class Maschine2Menu : public ArdourCanvas::Container uint32_t active () const { return _active; } uint32_t items() const { return _displays.size(); } - PBD::Signal0 ActiveChanged; + PBD::Signal ActiveChanged; void render (ArdourCanvas::Rect const &, Cairo::RefPtr) const; diff --git a/libs/surfaces/push2/menu.h b/libs/surfaces/push2/menu.h index c81fe312b0..c3c1b87f6c 100644 --- a/libs/surfaces/push2/menu.h +++ b/libs/surfaces/push2/menu.h @@ -66,8 +66,8 @@ class Push2Menu : public ArdourCanvas::Container enum Direction { DirectionUp, DirectionDown, DirectionLeft, DirectionRight }; void scroll (Direction, bool page = false); - PBD::Signal0 ActiveChanged; - PBD::Signal0 Rearranged; + PBD::Signal ActiveChanged; + PBD::Signal Rearranged; private: std::vector _displays; diff --git a/libs/surfaces/push2/push2.h b/libs/surfaces/push2/push2.h index 7342b0ba62..f7eb31e31c 100644 --- a/libs/surfaces/push2/push2.h +++ b/libs/surfaces/push2/push2.h @@ -312,7 +312,7 @@ class Push2 : public MIDISurface int set_state (const XMLNode & node, int version); int pad_note (int row, int col) const; - PBD::Signal0 PadChange; + PBD::Signal PadChange; void update_selection_color (); @@ -406,7 +406,7 @@ class Push2 : public MIDISurface RowInterval row_interval, bool inkey); - PBD::Signal0 ScaleChange; + PBD::Signal ScaleChange; MusicalMode::Type mode() const { return _mode; } NoteGridOrigin note_grid_origin() { return _note_grid_origin; } @@ -438,7 +438,7 @@ class Push2 : public MIDISurface PressureMode pressure_mode () const { return _pressure_mode; } void set_pressure_mode (PressureMode); - PBD::Signal1 PressureModeChange; + PBD::Signal PressureModeChange; libusb_device_handle* usb_handle() const { return _handle; } diff --git a/libs/surfaces/us2400/us2400_control_protocol.h b/libs/surfaces/us2400/us2400_control_protocol.h index e45465eb91..208fa296af 100644 --- a/libs/surfaces/us2400/us2400_control_protocol.h +++ b/libs/surfaces/us2400/us2400_control_protocol.h @@ -98,8 +98,8 @@ class US2400Protocol const US2400::DeviceInfo& device_info() const { return _device_info; } US2400::DeviceProfile& device_profile() { return _device_profile; } - PBD::Signal0 DeviceChanged; - PBD::Signal1 > ConnectionChange; + PBD::Signal DeviceChanged; + PBD::Signal )> ConnectionChange; void device_ready (); diff --git a/libs/temporal/tempo.cc b/libs/temporal/tempo.cc index f2099ec66f..e607a27ed7 100644 --- a/libs/temporal/tempo.cc +++ b/libs/temporal/tempo.cc @@ -49,7 +49,7 @@ std::string Meter::xml_node_name = X_("Meter"); SerializedRCUManager TempoMap::_map_mgr (0); thread_local TempoMap::SharedPtr TempoMap::_tempo_map_p; -PBD::Signal0 TempoMap::MapChanged; +PBD::Signal TempoMap::MapChanged; #ifndef NDEBUG #define TEMPO_MAP_ASSERT(expr) TempoMap::map_assert(expr, #expr, __FILE__, __LINE__) diff --git a/libs/temporal/temporal/domain_provider.h b/libs/temporal/temporal/domain_provider.h index 3ac46c76c5..cf964c8136 100644 --- a/libs/temporal/temporal/domain_provider.h +++ b/libs/temporal/temporal/domain_provider.h @@ -75,7 +75,7 @@ class TimeDomainProvider { } } - mutable PBD::Signal0 TimeDomainChanged; + mutable PBD::Signal TimeDomainChanged; virtual void time_domain_changed() { /* Forward a time domain change to children */ diff --git a/libs/temporal/temporal/tempo.h b/libs/temporal/temporal/tempo.h index 7454d4f82d..d28066484a 100644 --- a/libs/temporal/temporal/tempo.h +++ b/libs/temporal/temporal/tempo.h @@ -982,7 +982,7 @@ class /*LIBTEMPORAL_API*/ TempoMap : public PBD::StatefulDestructible LIBTEMPORAL_API void dump (std::ostream&) const; - LIBTEMPORAL_API static PBD::Signal0 MapChanged; + LIBTEMPORAL_API static PBD::Signal MapChanged; LIBTEMPORAL_API XMLNode& get_state() const; diff --git a/libs/waveview/wave_view.cc b/libs/waveview/wave_view.cc index af619a8de5..bc97d922c5 100644 --- a/libs/waveview/wave_view.cc +++ b/libs/waveview/wave_view.cc @@ -68,8 +68,8 @@ WaveView::Shape WaveView::_global_shape = WaveView::Normal; bool WaveView::_global_show_waveform_clipping = true; double WaveView::_global_clip_level = 0.98853; -PBD::Signal0 WaveView::VisualPropertiesChanged; -PBD::Signal0 WaveView::ClipLevelChanged; +PBD::Signal WaveView::VisualPropertiesChanged; +PBD::Signal WaveView::ClipLevelChanged; /* NO_THREAD_WAVEVIEWS is defined by the top level wscript * if --no-threaded-waveviws is provided at the configure step. diff --git a/libs/waveview/waveview/wave_view.h b/libs/waveview/waveview/wave_view.h index c3210173fb..f9b7175039 100644 --- a/libs/waveview/waveview/wave_view.h +++ b/libs/waveview/waveview/wave_view.h @@ -139,7 +139,7 @@ public: double amplitude_above_axis () const; static void set_clip_level (double dB); - static PBD::Signal0 ClipLevelChanged; + static PBD::Signal ClipLevelChanged; static void start_drawing_thread (); static void stop_drawing_thread (); @@ -204,7 +204,7 @@ private: static bool _global_show_waveform_clipping; static double _global_clip_level; - static PBD::Signal0 VisualPropertiesChanged; + static PBD::Signal VisualPropertiesChanged; void handle_visual_property_change (); void handle_clip_level_change ();