From 2339b4dfdc3368673a7815e5de63af8897d81b8c Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Fri, 18 Oct 2024 18:03:28 +0200 Subject: [PATCH] Replace PBD::Signals (2/2) --- gtk2_ardour/ardour_ui.h | 2 +- gtk2_ardour/audio_region_editor.h | 2 +- gtk2_ardour/control_point.cc | 2 +- gtk2_ardour/control_point.h | 2 +- gtk2_ardour/crossfade_view.h | 2 +- gtk2_ardour/editing_context.h | 4 ++-- gtk2_ardour/editor.h | 8 ++++---- gtk2_ardour/editor_cursors.h | 2 +- gtk2_ardour/foldback_strip.cc | 2 +- gtk2_ardour/foldback_strip.h | 4 ++-- gtk2_ardour/gain_meter.h | 2 +- gtk2_ardour/level_meter.h | 4 ++-- gtk2_ardour/luainstance.cc | 8 ++++---- gtk2_ardour/luainstance.h | 10 +++++----- gtk2_ardour/marker.cc | 2 +- gtk2_ardour/marker.h | 2 +- gtk2_ardour/meter_strip.cc | 6 +++--- gtk2_ardour/meter_strip.h | 6 +++--- gtk2_ardour/midi_view_background.h | 2 +- gtk2_ardour/mixer_strip.cc | 2 +- gtk2_ardour/mixer_strip.h | 4 ++-- gtk2_ardour/port_group.h | 8 ++++---- gtk2_ardour/region_view.cc | 2 +- gtk2_ardour/region_view.h | 2 +- gtk2_ardour/route_ui.cc | 2 +- gtk2_ardour/route_ui.h | 2 +- gtk2_ardour/sfdb_freesound_mootcher.h | 4 ++-- gtk2_ardour/strip_silence_dialog.h | 2 +- gtk2_ardour/surround_strip.cc | 2 +- gtk2_ardour/surround_strip.h | 2 +- gtk2_ardour/template_dialog.cc | 2 +- gtk2_ardour/tempo_curve.cc | 2 +- gtk2_ardour/tempo_curve.h | 2 +- gtk2_ardour/tempo_dialog.h | 2 +- gtk2_ardour/time_axis_view.cc | 2 +- gtk2_ardour/time_axis_view.h | 2 +- gtk2_ardour/track_record_axis.cc | 4 ++-- gtk2_ardour/track_record_axis.h | 4 ++-- gtk2_ardour/transcode_ffmpeg.h | 4 ++-- gtk2_ardour/transcode_video_dialog.h | 2 +- gtk2_ardour/trigger_strip.cc | 2 +- gtk2_ardour/trigger_strip.h | 2 +- gtk2_ardour/vca_master_strip.cc | 2 +- gtk2_ardour/vca_master_strip.h | 2 +- gtk2_ardour/video_image_frame.h | 2 +- gtk2_ardour/video_monitor.h | 4 ++-- gtk2_ardour/video_timeline.h | 4 ++-- gtk2_ardour/virtual_keyboard_window.h | 2 +- gtk2_ardour/visibility_group.h | 2 +- 49 files changed, 76 insertions(+), 76 deletions(-) diff --git a/gtk2_ardour/ardour_ui.h b/gtk2_ardour/ardour_ui.h index f73aeb3b5c..9a74e818a3 100644 --- a/gtk2_ardour/ardour_ui.h +++ b/gtk2_ardour/ardour_ui.h @@ -257,7 +257,7 @@ public: need to respond to Escape in some way (e.g. break drag, clear selection, etc) should connect to and handle this. */ - PBD::Signal0 Escape; + PBD::Signal Escape; PublicEditor& the_editor() { return *editor;} Mixer_UI* the_mixer() { return mixer; } diff --git a/gtk2_ardour/audio_region_editor.h b/gtk2_ardour/audio_region_editor.h index 095da2c19f..ec94e6fb52 100644 --- a/gtk2_ardour/audio_region_editor.h +++ b/gtk2_ardour/audio_region_editor.h @@ -100,7 +100,7 @@ private: void signal_peak_thread (); pthread_t _peak_amplitude_thread_handle; void peak_amplitude_found (double); - PBD::Signal1 PeakAmplitudeFound; + PBD::Signal PeakAmplitudeFound; PBD::ScopedConnection _peak_amplitude_connection; CrossThreadChannel _peak_channel; }; diff --git a/gtk2_ardour/control_point.cc b/gtk2_ardour/control_point.cc index 26e0ea56cf..581e922f81 100644 --- a/gtk2_ardour/control_point.cc +++ b/gtk2_ardour/control_point.cc @@ -31,7 +31,7 @@ using namespace std; using namespace ARDOUR; using namespace PBD; -PBD::Signal1 ControlPoint::CatchDeletion; +PBD::Signal ControlPoint::CatchDeletion; ControlPoint::ControlPoint (AutomationLine& al) : _line (al) diff --git a/gtk2_ardour/control_point.h b/gtk2_ardour/control_point.h index 0a13ecdcd5..de711556e5 100644 --- a/gtk2_ardour/control_point.h +++ b/gtk2_ardour/control_point.h @@ -85,7 +85,7 @@ public: ARDOUR::AutomationList::iterator model() const { return _model; } AutomationLine& line() const { return _line; } - static PBD::Signal1 CatchDeletion; + static PBD::Signal CatchDeletion; private: ArdourCanvas::Rectangle * _item; diff --git a/gtk2_ardour/crossfade_view.h b/gtk2_ardour/crossfade_view.h index 60c3d0a5a6..95a3883aec 100644 --- a/gtk2_ardour/crossfade_view.h +++ b/gtk2_ardour/crossfade_view.h @@ -59,7 +59,7 @@ public: bool visible() const { return _visible; } void set_valid (bool yn); - static PBD::Signal1 CatchDeletion; + static PBD::Signal CatchDeletion; void fake_hide (); void hide (); diff --git a/gtk2_ardour/editing_context.h b/gtk2_ardour/editing_context.h index 6487ca6367..b5742f9770 100644 --- a/gtk2_ardour/editing_context.h +++ b/gtk2_ardour/editing_context.h @@ -353,8 +353,8 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider static sigc::signal DropDownKeys; - PBD::Signal0 SnapChanged; - PBD::Signal0 MouseModeChanged; + PBD::Signal SnapChanged; + PBD::Signal MouseModeChanged; /* MIDI actions, proxied to selected MidiRegionView(s) */ ARDOUR::Quantize* get_quantize_op (); diff --git a/gtk2_ardour/editor.h b/gtk2_ardour/editor.h index 420a9454b1..a4622935c2 100644 --- a/gtk2_ardour/editor.h +++ b/gtk2_ardour/editor.h @@ -1540,8 +1540,8 @@ private: return _track_selection_change_without_scroll; } - PBD::Signal0 EditorFreeze; - PBD::Signal0 EditorThaw; + PBD::Signal EditorFreeze; + PBD::Signal EditorThaw; Temporal::TempoMap::WritableSharedPtr begin_tempo_map_edit (); void abort_tempo_map_edit (); @@ -2304,8 +2304,8 @@ private: void update_mark_and_range_visibility (); void show_marker_type (MarkerBarType); void show_range_type (RangeBarType); - PBD::Signal0 VisibleMarkersChanged; - PBD::Signal0 VisibleRangesChanged; + PBD::Signal VisibleMarkersChanged; + PBD::Signal VisibleRangesChanged; friend class RegionMoveDrag; friend class TrimDrag; diff --git a/gtk2_ardour/editor_cursors.h b/gtk2_ardour/editor_cursors.h index e64f8b39f9..af21193338 100644 --- a/gtk2_ardour/editor_cursors.h +++ b/gtk2_ardour/editor_cursors.h @@ -53,7 +53,7 @@ public: return *_canvas_item; } - PBD::Signal1 PositionChanged; + PBD::Signal PositionChanged; private: EditingContext& _editor; diff --git a/gtk2_ardour/foldback_strip.cc b/gtk2_ardour/foldback_strip.cc index 1c71c817da..c217521aad 100644 --- a/gtk2_ardour/foldback_strip.cc +++ b/gtk2_ardour/foldback_strip.cc @@ -370,7 +370,7 @@ FoldbackSend::remove_me () /* ****************************************************************************/ -PBD::Signal1 FoldbackStrip::CatchDeletion; +PBD::Signal FoldbackStrip::CatchDeletion; FoldbackStrip::FoldbackStrip (Mixer_UI& mx, Session* sess, std::shared_ptr rt) : SessionHandlePtr (sess) diff --git a/gtk2_ardour/foldback_strip.h b/gtk2_ardour/foldback_strip.h index d86cc6e4c0..5eda92c615 100644 --- a/gtk2_ardour/foldback_strip.h +++ b/gtk2_ardour/foldback_strip.h @@ -139,9 +139,9 @@ public: } /** The delivery that we are handling the level for with our fader has changed */ - PBD::Signal1 > DeliveryChanged; + PBD::Signal )> DeliveryChanged; - static PBD::Signal1 CatchDeletion; + static PBD::Signal CatchDeletion; void route_active_changed (); diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index bb24236784..b80f8da828 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -113,7 +113,7 @@ public: /** Emitted in the GUI thread when a button is pressed over the level meter; * return true if the event is handled. */ - PBD::Signal1 LevelMeterButtonPress; + PBD::Signal LevelMeterButtonPress; static std::string meterpt_string (ARDOUR::MeterPoint); static std::string astate_string (ARDOUR::AutoState); diff --git a/gtk2_ardour/level_meter.h b/gtk2_ardour/level_meter.h index 2cdc1db642..a202e40eb3 100644 --- a/gtk2_ardour/level_meter.h +++ b/gtk2_ardour/level_meter.h @@ -66,8 +66,8 @@ public: void set_max_audio_meter_count (uint32_t cnt = 0); /** Emitted in the GUI thread when a button is pressed over the meter */ - PBD::Signal1 ButtonPress; - PBD::Signal1 ButtonRelease; + PBD::Signal ButtonPress; + PBD::Signal ButtonRelease; protected: virtual void mtr_pack(Gtk::Widget &w) = 0; diff --git a/gtk2_ardour/luainstance.cc b/gtk2_ardour/luainstance.cc index da412c4f0c..a9a6de43a2 100644 --- a/gtk2_ardour/luainstance.cc +++ b/gtk2_ardour/luainstance.cc @@ -537,10 +537,10 @@ lua_translate_order (RouteDialogs::InsertAt place) using namespace ARDOUR; -PBD::Signal0 LuaInstance::LuaTimerS; -PBD::Signal0 LuaInstance::LuaTimerDS; -PBD::Signal0 LuaInstance::SetSession; -PBD::Signal0 LuaInstance::SelectionChanged; +PBD::Signal LuaInstance::LuaTimerS; +PBD::Signal LuaInstance::LuaTimerDS; +PBD::Signal LuaInstance::SetSession; +PBD::Signal LuaInstance::SelectionChanged; void LuaInstance::register_hooks (lua_State* L) diff --git a/gtk2_ardour/luainstance.h b/gtk2_ardour/luainstance.h index ea33cae5c7..8453f81daf 100644 --- a/gtk2_ardour/luainstance.h +++ b/gtk2_ardour/luainstance.h @@ -59,7 +59,7 @@ public: const std::string& name () const { return _name; } ActionHook signals () const { return _signals; } bool lua_slot (std::string&, std::string&, ActionHook&, ARDOUR::LuaScriptParamList&); - PBD::Signal0 drop_callback; + PBD::Signal drop_callback; protected: void session_going_away (); @@ -138,10 +138,10 @@ public: bool lua_slot (const PBD::ID&, std::string&, std::string&, ActionHook&, ARDOUR::LuaScriptParamList&); sigc::signal SlotChanged; - static PBD::Signal0 LuaTimerS; // deci-seconds (Timer every 1s) - static PBD::Signal0 LuaTimerDS; // deci-seconds (Timer every .1s) - static PBD::Signal0 SetSession; // emitted when a session is loaded - static PBD::Signal0 SelectionChanged; // emitted when editor selection changes + static PBD::Signal LuaTimerS; // deci-seconds (Timer every 1s) + static PBD::Signal LuaTimerDS; // deci-seconds (Timer every .1s) + static PBD::Signal SetSession; // emitted when a session is loaded + static PBD::Signal SelectionChanged; // emitted when editor selection changes private: LuaInstance(); diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 94e76ba045..e30d026a09 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -64,7 +64,7 @@ using namespace ARDOUR; using namespace ARDOUR_UI_UTILS; using namespace Gtkmm2ext; -PBD::Signal1 ArdourMarker::CatchDeletion; +PBD::Signal ArdourMarker::CatchDeletion; static double marker_height = 13.0; diff --git a/gtk2_ardour/marker.h b/gtk2_ardour/marker.h index 0c2bb0a39f..7c59c281d0 100644 --- a/gtk2_ardour/marker.h +++ b/gtk2_ardour/marker.h @@ -80,7 +80,7 @@ public: virtual ~ArdourMarker (); - static PBD::Signal1 CatchDeletion; + static PBD::Signal CatchDeletion; static void setup_sizes (const double timebar_height); diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index 362b1ce9d8..c1ca7d1f06 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -61,9 +61,9 @@ using namespace Gtkmm2ext; using namespace std; using namespace ArdourMeter; -PBD::Signal1 MeterStrip::CatchDeletion; -PBD::Signal0 MeterStrip::MetricChanged; -PBD::Signal0 MeterStrip::ConfigurationChanged; +PBD::Signal MeterStrip::CatchDeletion; +PBD::Signal MeterStrip::MetricChanged; +PBD::Signal MeterStrip::ConfigurationChanged; #define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale())) diff --git a/gtk2_ardour/meter_strip.h b/gtk2_ardour/meter_strip.h index ca1e43f3d8..1e072a59ec 100644 --- a/gtk2_ardour/meter_strip.h +++ b/gtk2_ardour/meter_strip.h @@ -62,9 +62,9 @@ public: void fast_update (); std::shared_ptr route() { return _route; } - static PBD::Signal1 CatchDeletion; - static PBD::Signal0 MetricChanged; - static PBD::Signal0 ConfigurationChanged; + static PBD::Signal CatchDeletion; + static PBD::Signal MetricChanged; + static PBD::Signal ConfigurationChanged; void reset_peak_display (); void reset_route_peak_display (ARDOUR::Route*); diff --git a/gtk2_ardour/midi_view_background.h b/gtk2_ardour/midi_view_background.h index 088a641457..77a7088574 100644 --- a/gtk2_ardour/midi_view_background.h +++ b/gtk2_ardour/midi_view_background.h @@ -100,7 +100,7 @@ class MidiViewBackground : public virtual ViewBackground virtual void record_layer_check (std::shared_ptr, samplepos_t) = 0; virtual void set_size (double w, double h) {} - PBD::Signal0 HeightChanged; + PBD::Signal HeightChanged; protected: bool _range_dirty; diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 3482c172e4..c8c3962b01 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -103,7 +103,7 @@ using namespace std; using namespace ArdourMeter; MixerStrip* MixerStrip::_entered_mixer_strip; -PBD::Signal1 MixerStrip::CatchDeletion; +PBD::Signal MixerStrip::CatchDeletion; #define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale())) diff --git a/gtk2_ardour/mixer_strip.h b/gtk2_ardour/mixer_strip.h index 203ad3919a..42cc7997af 100644 --- a/gtk2_ardour/mixer_strip.h +++ b/gtk2_ardour/mixer_strip.h @@ -135,9 +135,9 @@ public: sigc::signal WidthChanged; /** The delivery that we are handling the level for with our fader has changed */ - PBD::Signal1 > DeliveryChanged; + PBD::Signal )> DeliveryChanged; - static PBD::Signal1 CatchDeletion; + static PBD::Signal CatchDeletion; std::string state_id() const; diff --git a/gtk2_ardour/port_group.h b/gtk2_ardour/port_group.h index 690ee00f13..9b96af6f14 100644 --- a/gtk2_ardour/port_group.h +++ b/gtk2_ardour/port_group.h @@ -67,10 +67,10 @@ public: bool has_port (std::string const &) const; /** The bundle list has changed in some way; a bundle has been added or removed, or the list cleared etc. */ - PBD::Signal0 Changed; + PBD::Signal Changed; /** An individual bundle on our list has changed in some way */ - PBD::Signal1 BundleChanged; + PBD::Signal BundleChanged; struct BundleRecord { std::shared_ptr bundle; @@ -132,10 +132,10 @@ public: bool empty () const; /** The group list has changed in some way; a group has been added or removed, or the list cleared etc. */ - PBD::Signal0 Changed; + PBD::Signal Changed; /** A bundle in one of our groups has changed */ - PBD::Signal1 BundleChanged; + PBD::Signal BundleChanged; private: bool port_has_prefix (std::string const &, std::string const &) const; diff --git a/gtk2_ardour/region_view.cc b/gtk2_ardour/region_view.cc index bb8e550295..f7933a2a28 100644 --- a/gtk2_ardour/region_view.cc +++ b/gtk2_ardour/region_view.cc @@ -67,7 +67,7 @@ using namespace ArdourCanvas; static const int32_t sync_mark_width = 9; -PBD::Signal1 RegionView::RegionViewGoingAway; +PBD::Signal RegionView::RegionViewGoingAway; RegionView::RegionView (ArdourCanvas::Container* parent, TimeAxisView& tv, diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h index a0f18310d3..4a27eeef6b 100644 --- a/gtk2_ardour/region_view.h +++ b/gtk2_ardour/region_view.h @@ -127,7 +127,7 @@ public: virtual void update_coverage_frame (LayerDisplay); - static PBD::Signal1 RegionViewGoingAway; + static PBD::Signal RegionViewGoingAway; /** Called when a front trim is about to begin */ virtual void trim_front_starting () {} diff --git a/gtk2_ardour/route_ui.cc b/gtk2_ardour/route_ui.cc index 74b31bb227..a64f6f80f3 100644 --- a/gtk2_ardour/route_ui.cc +++ b/gtk2_ardour/route_ui.cc @@ -99,7 +99,7 @@ using namespace PBD; using namespace std; uint32_t RouteUI::_max_invert_buttons = 3; -PBD::Signal1 > RouteUI::BusSendDisplayChanged; +PBD::Signal )> RouteUI::BusSendDisplayChanged; std::weak_ptr RouteUI::_showing_sends_to; std::string RouteUI::program_port_prefix; diff --git a/gtk2_ardour/route_ui.h b/gtk2_ardour/route_ui.h index 4f93829f4e..de1a8c6dbe 100644 --- a/gtk2_ardour/route_ui.h +++ b/gtk2_ardour/route_ui.h @@ -345,7 +345,7 @@ private: * by a click on the `Sends' button. The parameter is the route that the sends are * to, or 0 if no route is now in this mode. */ - static PBD::Signal1 > BusSendDisplayChanged; + static PBD::Signal )> BusSendDisplayChanged; static std::weak_ptr _showing_sends_to; diff --git a/gtk2_ardour/sfdb_freesound_mootcher.h b/gtk2_ardour/sfdb_freesound_mootcher.h index ca534fdba8..f9a38c698e 100644 --- a/gtk2_ardour/sfdb_freesound_mootcher.h +++ b/gtk2_ardour/sfdb_freesound_mootcher.h @@ -86,9 +86,9 @@ public: /** signal emitted when mootcher reports progress updates during download. * The parameters are current and total numbers of bytes downloaded. */ - PBD::Signal2 Progress; + PBD::Signal Progress; /** signal emitted when the mootcher has finished downloading. */ - PBD::Signal0 Finished; + PBD::Signal Finished; private: diff --git a/gtk2_ardour/strip_silence_dialog.h b/gtk2_ardour/strip_silence_dialog.h index fcaafc5109..7d3409bf66 100644 --- a/gtk2_ardour/strip_silence_dialog.h +++ b/gtk2_ardour/strip_silence_dialog.h @@ -98,7 +98,7 @@ private: Glib::Threads::Mutex _lock; ///< lock held while the thread is doing work Glib::Threads::Cond _run_cond; ///< condition to wake the thread bool _thread_should_finish; ///< true if the thread should terminate - PBD::Signal0 Completed; ///< emitted when a silence detection has completed + PBD::Signal Completed; ///< emitted when a silence detection has completed PBD::ScopedConnection _completed_connection; ARDOUR::InterThreadInfo _interthread_info; diff --git a/gtk2_ardour/surround_strip.cc b/gtk2_ardour/surround_strip.cc index 0df96ba5bc..356a08015e 100644 --- a/gtk2_ardour/surround_strip.cc +++ b/gtk2_ardour/surround_strip.cc @@ -51,7 +51,7 @@ using namespace Gtk; #define PX_SCALE(px) std::max ((float)px, rintf ((float)px* UIConfiguration::instance ().get_ui_scale ())) -PBD::Signal1 SurroundStrip::CatchDeletion; +PBD::Signal SurroundStrip::CatchDeletion; SurroundStrip::SurroundStrip (Mixer_UI& mx, Session* s, std::shared_ptr r) : SessionHandlePtr (s) diff --git a/gtk2_ardour/surround_strip.h b/gtk2_ardour/surround_strip.h index 7730d2c11a..ab70af22b2 100644 --- a/gtk2_ardour/surround_strip.h +++ b/gtk2_ardour/surround_strip.h @@ -50,7 +50,7 @@ public: void fast_update (); void hide_spacer (bool); - static PBD::Signal1 CatchDeletion; + static PBD::Signal CatchDeletion; private: void init (); diff --git a/gtk2_ardour/template_dialog.cc b/gtk2_ardour/template_dialog.cc index 9e26a2ee18..dac3f59f5b 100644 --- a/gtk2_ardour/template_dialog.cc +++ b/gtk2_ardour/template_dialog.cc @@ -69,7 +69,7 @@ public: virtual void init () = 0; void handle_dirty_description (); - PBD::Signal0 TemplatesImported; + PBD::Signal TemplatesImported; protected: TemplateManager (); diff --git a/gtk2_ardour/tempo_curve.cc b/gtk2_ardour/tempo_curve.cc index f02372633e..76d3a1adf5 100644 --- a/gtk2_ardour/tempo_curve.cc +++ b/gtk2_ardour/tempo_curve.cc @@ -40,7 +40,7 @@ using namespace Temporal; -PBD::Signal1 TempoCurve::CatchDeletion; +PBD::Signal TempoCurve::CatchDeletion; static double curve_height = 13.0; diff --git a/gtk2_ardour/tempo_curve.h b/gtk2_ardour/tempo_curve.h index a86c067db3..f9c4785f91 100644 --- a/gtk2_ardour/tempo_curve.h +++ b/gtk2_ardour/tempo_curve.h @@ -42,7 +42,7 @@ public: TempoCurve (PublicEditor& editor, ArdourCanvas::Item &, guint32 rgba, Temporal::TempoPoint const & temp, bool handle_events , ArdourCanvas::Distance marker_width); ~TempoCurve (); - static PBD::Signal1 CatchDeletion; + static PBD::Signal CatchDeletion; static void setup_sizes (const double timebar_height); diff --git a/gtk2_ardour/tempo_dialog.h b/gtk2_ardour/tempo_dialog.h index ede442b1ec..3989b3f848 100644 --- a/gtk2_ardour/tempo_dialog.h +++ b/gtk2_ardour/tempo_dialog.h @@ -135,7 +135,7 @@ private: MidiPortCols _midi_port_cols; Glib::RefPtr _midi_port_list; - PBD::Signal1 _midi_tap_signal; + PBD::Signal _midi_tap_signal; std::shared_ptr _midi_tap_parser; std::shared_ptr _midi_tap_port; PBD::ScopedConnection _parser_connection; diff --git a/gtk2_ardour/time_axis_view.cc b/gtk2_ardour/time_axis_view.cc index 60bfd82b08..b5a29c09ba 100644 --- a/gtk2_ardour/time_axis_view.cc +++ b/gtk2_ardour/time_axis_view.cc @@ -88,7 +88,7 @@ uint32_t TimeAxisView::button_height = 0; uint32_t TimeAxisView::extra_height = 0; int const TimeAxisView::_max_order = 512; unsigned int TimeAxisView::name_width_px = 100; -PBD::Signal1 TimeAxisView::CatchDeletion; +PBD::Signal TimeAxisView::CatchDeletion; Glib::RefPtr TimeAxisView::controls_meters_size_group = Glib::RefPtr(); Glib::RefPtr TimeAxisView::midi_scroomer_size_group = Glib::RefPtr(); diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index b03570cffc..0b09a95e59 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -106,7 +106,7 @@ public: TimeAxisView(ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas); virtual ~TimeAxisView (); - static PBD::Signal1 CatchDeletion; + static PBD::Signal CatchDeletion; static void setup_sizes (); diff --git a/gtk2_ardour/track_record_axis.cc b/gtk2_ardour/track_record_axis.cc index 823236bdfe..b65aee0c0e 100644 --- a/gtk2_ardour/track_record_axis.cc +++ b/gtk2_ardour/track_record_axis.cc @@ -70,8 +70,8 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace std; -PBD::Signal1 TrackRecordAxis::CatchDeletion; -PBD::Signal2 TrackRecordAxis::EditNextName; +PBD::Signal TrackRecordAxis::CatchDeletion; +PBD::Signal TrackRecordAxis::EditNextName; #define PX_SCALE(pxmin, dflt) rint (std::max ((double)pxmin, (double)dflt* UIConfiguration::instance ().get_ui_scale ())) diff --git a/gtk2_ardour/track_record_axis.h b/gtk2_ardour/track_record_axis.h index 648377f441..920bf5c96b 100644 --- a/gtk2_ardour/track_record_axis.h +++ b/gtk2_ardour/track_record_axis.h @@ -78,8 +78,8 @@ public: int summary_xpos () const; int summary_width () const; - static PBD::Signal1 CatchDeletion; - static PBD::Signal2 EditNextName; + static PBD::Signal CatchDeletion; + static PBD::Signal EditNextName; protected: void self_delete (); diff --git a/gtk2_ardour/transcode_ffmpeg.h b/gtk2_ardour/transcode_ffmpeg.h index 725428b511..0f37d28ccb 100644 --- a/gtk2_ardour/transcode_ffmpeg.h +++ b/gtk2_ardour/transcode_ffmpeg.h @@ -167,10 +167,10 @@ public: * during \ref encode \ref transcode and \ref extract_audio * The parameters are current and last video-frame. */ - PBD::Signal2 Progress; + PBD::Signal Progress; /** signal emitted when the transcoder process terminates. */ - PBD::Signal1 Finished; + PBD::Signal Finished; protected: bool probe (); diff --git a/gtk2_ardour/transcode_video_dialog.h b/gtk2_ardour/transcode_video_dialog.h index 47d75ae1b9..4243f7d5ce 100644 --- a/gtk2_ardour/transcode_video_dialog.h +++ b/gtk2_ardour/transcode_video_dialog.h @@ -95,7 +95,7 @@ private: std::string infn; double m_aspect; - PBD::Signal0 StartNextStage; + PBD::Signal StartNextStage; TranscodeFfmpeg* transcoder; diff --git a/gtk2_ardour/trigger_strip.cc b/gtk2_ardour/trigger_strip.cc index 7f005e9553..739357590c 100644 --- a/gtk2_ardour/trigger_strip.cc +++ b/gtk2_ardour/trigger_strip.cc @@ -56,7 +56,7 @@ using namespace Gtk; using namespace Gtkmm2ext; using namespace std; -PBD::Signal1 TriggerStrip::CatchDeletion; +PBD::Signal TriggerStrip::CatchDeletion; TriggerStrip::TriggerStrip (Session* s, std::shared_ptr rt) : SessionHandlePtr (s) diff --git a/gtk2_ardour/trigger_strip.h b/gtk2_ardour/trigger_strip.h index cf0694aafe..2980d22cd3 100644 --- a/gtk2_ardour/trigger_strip.h +++ b/gtk2_ardour/trigger_strip.h @@ -64,7 +64,7 @@ public: void fast_update (); - static PBD::Signal1 CatchDeletion; + static PBD::Signal CatchDeletion; protected: void self_delete (); diff --git a/gtk2_ardour/vca_master_strip.cc b/gtk2_ardour/vca_master_strip.cc index ae19a02d3e..d0cd3d5623 100644 --- a/gtk2_ardour/vca_master_strip.cc +++ b/gtk2_ardour/vca_master_strip.cc @@ -49,7 +49,7 @@ using namespace Gtk; using namespace PBD; using std::string; -PBD::Signal1 VCAMasterStrip::CatchDeletion; +PBD::Signal VCAMasterStrip::CatchDeletion; static bool no_propagate (GdkEventButton*) { return false; } diff --git a/gtk2_ardour/vca_master_strip.h b/gtk2_ardour/vca_master_strip.h index 50569e674b..6af1293835 100644 --- a/gtk2_ardour/vca_master_strip.h +++ b/gtk2_ardour/vca_master_strip.h @@ -56,7 +56,7 @@ public: std::string state_id() const; std::shared_ptr vca() const { return _vca; } - static PBD::Signal1 CatchDeletion; + static PBD::Signal CatchDeletion; bool marked_for_display () const; bool set_marked_for_display (bool); diff --git a/gtk2_ardour/video_image_frame.h b/gtk2_ardour/video_image_frame.h index c2792b6ae7..5a348f7cef 100644 --- a/gtk2_ardour/video_image_frame.h +++ b/gtk2_ardour/video_image_frame.h @@ -59,7 +59,7 @@ class VideoImageFrame : public sigc::trackable std::string get_video_filename () {return video_filename;} void http_download_done (char *); - PBD::Signal0 ImgChanged; + PBD::Signal ImgChanged; protected: diff --git a/gtk2_ardour/video_monitor.h b/gtk2_ardour/video_monitor.h index d999b0aaad..1a6e50d84b 100644 --- a/gtk2_ardour/video_monitor.h +++ b/gtk2_ardour/video_monitor.h @@ -71,7 +71,7 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p bool synced_by_manual_seeks() { return sync_by_manual_seek; } sigc::signal Terminated; - PBD::Signal1 UiState; + PBD::Signal UiState; void send_cmd (int what, int param); #if 1 @@ -105,7 +105,7 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p int knownstate; int osdmode; - PBD::Signal1 XJKeyEvent; + PBD::Signal XJKeyEvent; #if 1 bool debug_enable; #endif diff --git a/gtk2_ardour/video_timeline.h b/gtk2_ardour/video_timeline.h index d6dfa516be..51a90fb35c 100644 --- a/gtk2_ardour/video_timeline.h +++ b/gtk2_ardour/video_timeline.h @@ -141,8 +141,8 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p VideoMonitor *vmonitor; bool reopen_vmonitor; - PBD::Signal0 VtlUpdate; - PBD::Signal1 GuiUpdate; + PBD::Signal VtlUpdate; + PBD::Signal GuiUpdate; void gui_update (const std::string &); PBD::ScopedConnection sessionsave; diff --git a/gtk2_ardour/virtual_keyboard_window.h b/gtk2_ardour/virtual_keyboard_window.h index c41fcd2565..0a53b39840 100644 --- a/gtk2_ardour/virtual_keyboard_window.h +++ b/gtk2_ardour/virtual_keyboard_window.h @@ -75,7 +75,7 @@ public: double upper () const { return _upper; } double normal () const { return _normal; } - PBD::Signal1 ValueChanged; + PBD::Signal ValueChanged; protected: double _lower; diff --git a/gtk2_ardour/visibility_group.h b/gtk2_ardour/visibility_group.h index 293db5d950..3d01fe58fa 100644 --- a/gtk2_ardour/visibility_group.h +++ b/gtk2_ardour/visibility_group.h @@ -52,7 +52,7 @@ public: std::string get_state_name () const; std::string get_state_value () const; - PBD::Signal0 VisibilityChanged; + PBD::Signal VisibilityChanged; static std::string remove_element (std::string const& from, std::string const& element); static std::string add_element (std::string const& from, std::string const& element);