ardour/livetrax
13
0
Fork 0
Code

Replace PBD::Signals (2/2)

Browse Source
This commit is contained in:
Robin Gareus 2024-10-18 18:03:28 +02:00
parent 2d7cce44f1
commit 2339b4dfdc
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
49 changed files with 76 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
gtk2_ardour/ardour_ui.h
View File

@ -257,7 +257,7 @@ public:
need to respond to Escape in some way (e.g. break drag, clear need to respond to Escape in some way (e.g. break drag, clear
selection, etc) should connect to and handle this. selection, etc) should connect to and handle this.
*/ */
PBD::Signal0<void> Escape; PBD::Signal<void()> Escape;
PublicEditor& the_editor() { return *editor;} PublicEditor& the_editor() { return *editor;}
Mixer_UI* the_mixer() { return mixer; } Mixer_UI* the_mixer() { return mixer; }

2
gtk2_ardour/audio_region_editor.h
View File

@ -100,7 +100,7 @@ private:
void signal_peak_thread (); void signal_peak_thread ();
pthread_t _peak_amplitude_thread_handle; pthread_t _peak_amplitude_thread_handle;
void peak_amplitude_found (double); void peak_amplitude_found (double);
PBD::Signal1<void, double> PeakAmplitudeFound; PBD::Signal<void(double)> PeakAmplitudeFound;
PBD::ScopedConnection _peak_amplitude_connection; PBD::ScopedConnection _peak_amplitude_connection;
CrossThreadChannel _peak_channel; CrossThreadChannel _peak_channel;
}; };

2
gtk2_ardour/control_point.cc
View File

@ -31,7 +31,7 @@ using namespace std;
using namespace ARDOUR; using namespace ARDOUR;
using namespace PBD; using namespace PBD;
PBD::Signal1<void, ControlPoint *> ControlPoint::CatchDeletion; PBD::Signal<void(ControlPoint *)> ControlPoint::CatchDeletion;
ControlPoint::ControlPoint (AutomationLine& al) ControlPoint::ControlPoint (AutomationLine& al)
: _line (al) : _line (al)

2
gtk2_ardour/control_point.h
View File

@ -85,7 +85,7 @@ public:
ARDOUR::AutomationList::iterator model() const { return _model; } ARDOUR::AutomationList::iterator model() const { return _model; }
AutomationLine& line() const { return _line; } AutomationLine& line() const { return _line; }
static PBD::Signal1<void, ControlPoint *> CatchDeletion; static PBD::Signal<void(ControlPoint *)> CatchDeletion;
private: private:
ArdourCanvas::Rectangle * _item; ArdourCanvas::Rectangle * _item;

2
gtk2_ardour/crossfade_view.h
View File

@ -59,7 +59,7 @@ public:
bool visible() const { return _visible; } bool visible() const { return _visible; }
void set_valid (bool yn); void set_valid (bool yn);
static PBD::Signal1<void,CrossfadeView*> CatchDeletion; static PBD::Signal<void(CrossfadeView*)> CatchDeletion;
void fake_hide (); void fake_hide ();
void hide (); void hide ();

4
gtk2_ardour/editing_context.h
View File

@ -353,8 +353,8 @@ class EditingContext : public ARDOUR::SessionHandlePtr, public AxisViewProvider
static sigc::signal<void> DropDownKeys; static sigc::signal<void> DropDownKeys;
PBD::Signal0<void> SnapChanged; PBD::Signal<void()> SnapChanged;
PBD::Signal0<void> MouseModeChanged; PBD::Signal<void()> MouseModeChanged;
/* MIDI actions, proxied to selected MidiRegionView(s) */ /* MIDI actions, proxied to selected MidiRegionView(s) */
ARDOUR::Quantize* get_quantize_op (); ARDOUR::Quantize* get_quantize_op ();

8
gtk2_ardour/editor.h
View File

@ -1540,8 +1540,8 @@ private:
return _track_selection_change_without_scroll; return _track_selection_change_without_scroll;
} }
PBD::Signal0<void> EditorFreeze; PBD::Signal<void()> EditorFreeze;
PBD::Signal0<void> EditorThaw; PBD::Signal<void()> EditorThaw;
Temporal::TempoMap::WritableSharedPtr begin_tempo_map_edit (); Temporal::TempoMap::WritableSharedPtr begin_tempo_map_edit ();
void abort_tempo_map_edit (); void abort_tempo_map_edit ();
@ -2304,8 +2304,8 @@ private:
void update_mark_and_range_visibility (); void update_mark_and_range_visibility ();
void show_marker_type (MarkerBarType); void show_marker_type (MarkerBarType);
void show_range_type (RangeBarType); void show_range_type (RangeBarType);
PBD::Signal0<void> VisibleMarkersChanged; PBD::Signal<void()> VisibleMarkersChanged;
PBD::Signal0<void> VisibleRangesChanged; PBD::Signal<void()> VisibleRangesChanged;
friend class RegionMoveDrag; friend class RegionMoveDrag;
friend class TrimDrag; friend class TrimDrag;

2
gtk2_ardour/editor_cursors.h
View File

@ -53,7 +53,7 @@ public:
return *_canvas_item; return *_canvas_item;
} }
PBD::Signal1<void, samplepos_t> PositionChanged; PBD::Signal<void(samplepos_t)> PositionChanged;
private: private:
EditingContext& _editor; EditingContext& _editor;

2
gtk2_ardour/foldback_strip.cc
View File

@ -370,7 +370,7 @@ FoldbackSend::remove_me ()
/* ****************************************************************************/ /* ****************************************************************************/
PBD::Signal1<void, FoldbackStrip*> FoldbackStrip::CatchDeletion; PBD::Signal<void(FoldbackStrip*)> FoldbackStrip::CatchDeletion;
FoldbackStrip::FoldbackStrip (Mixer_UI& mx, Session* sess, std::shared_ptr<Route> rt) FoldbackStrip::FoldbackStrip (Mixer_UI& mx, Session* sess, std::shared_ptr<Route> rt)
: SessionHandlePtr (sess) : SessionHandlePtr (sess)

4
gtk2_ardour/foldback_strip.h
View File

@ -139,9 +139,9 @@ public:
} }
/** The delivery that we are handling the level for with our fader has changed */ /** The delivery that we are handling the level for with our fader has changed */
PBD::Signal1<void, std::weak_ptr<ARDOUR::Delivery> > DeliveryChanged; PBD::Signal<void(std::weak_ptr<ARDOUR::Delivery> )> DeliveryChanged;
static PBD::Signal1<void, FoldbackStrip*> CatchDeletion; static PBD::Signal<void(FoldbackStrip*)> CatchDeletion;
void route_active_changed (); void route_active_changed ();

2
gtk2_ardour/gain_meter.h
View File

@ -113,7 +113,7 @@ public:
/** Emitted in the GUI thread when a button is pressed over the level meter; /** Emitted in the GUI thread when a button is pressed over the level meter;
* return true if the event is handled. * return true if the event is handled.
*/ */
PBD::Signal1<bool, GdkEventButton *> LevelMeterButtonPress; PBD::Signal<bool(GdkEventButton *)> LevelMeterButtonPress;
static std::string meterpt_string (ARDOUR::MeterPoint); static std::string meterpt_string (ARDOUR::MeterPoint);
static std::string astate_string (ARDOUR::AutoState); static std::string astate_string (ARDOUR::AutoState);

4
gtk2_ardour/level_meter.h
View File

@ -66,8 +66,8 @@ public:
void set_max_audio_meter_count (uint32_t cnt = 0); void set_max_audio_meter_count (uint32_t cnt = 0);
/** Emitted in the GUI thread when a button is pressed over the meter */ /** Emitted in the GUI thread when a button is pressed over the meter */
PBD::Signal1<bool, GdkEventButton *> ButtonPress; PBD::Signal<bool(GdkEventButton *)> ButtonPress;
PBD::Signal1<bool, GdkEventButton *> ButtonRelease; PBD::Signal<bool(GdkEventButton *)> ButtonRelease;
protected: protected:
virtual void mtr_pack(Gtk::Widget &w) = 0; virtual void mtr_pack(Gtk::Widget &w) = 0;

8
gtk2_ardour/luainstance.cc
View File

@ -537,10 +537,10 @@ lua_translate_order (RouteDialogs::InsertAt place)
using namespace ARDOUR; using namespace ARDOUR;
PBD::Signal0<void> LuaInstance::LuaTimerS; PBD::Signal<void()> LuaInstance::LuaTimerS;
PBD::Signal0<void> LuaInstance::LuaTimerDS; PBD::Signal<void()> LuaInstance::LuaTimerDS;
PBD::Signal0<void> LuaInstance::SetSession; PBD::Signal<void()> LuaInstance::SetSession;
PBD::Signal0<void> LuaInstance::SelectionChanged; PBD::Signal<void()> LuaInstance::SelectionChanged;
void void
LuaInstance::register_hooks (lua_State* L) LuaInstance::register_hooks (lua_State* L)

10
gtk2_ardour/luainstance.h
View File

@ -59,7 +59,7 @@ public:
const std::string& name () const { return _name; } const std::string& name () const { return _name; }
ActionHook signals () const { return _signals; } ActionHook signals () const { return _signals; }
bool lua_slot (std::string&, std::string&, ActionHook&, ARDOUR::LuaScriptParamList&); bool lua_slot (std::string&, std::string&, ActionHook&, ARDOUR::LuaScriptParamList&);
PBD::Signal0<void> drop_callback; PBD::Signal<void()> drop_callback;
protected: protected:
void session_going_away (); void session_going_away ();
@ -138,10 +138,10 @@ public:
bool lua_slot (const PBD::ID&, std::string&, std::string&, ActionHook&, ARDOUR::LuaScriptParamList&); bool lua_slot (const PBD::ID&, std::string&, std::string&, ActionHook&, ARDOUR::LuaScriptParamList&);
sigc::signal<void,PBD::ID,std::string,ActionHook> SlotChanged; sigc::signal<void,PBD::ID,std::string,ActionHook> SlotChanged;
static PBD::Signal0<void> LuaTimerS; // deci-seconds (Timer every 1s) static PBD::Signal<void()> LuaTimerS; // deci-seconds (Timer every 1s)
static PBD::Signal0<void> LuaTimerDS; // deci-seconds (Timer every .1s) static PBD::Signal<void()> LuaTimerDS; // deci-seconds (Timer every .1s)
static PBD::Signal0<void> SetSession; // emitted when a session is loaded static PBD::Signal<void()> SetSession; // emitted when a session is loaded
static PBD::Signal0<void> SelectionChanged; // emitted when editor selection changes static PBD::Signal<void()> SelectionChanged; // emitted when editor selection changes
private: private:
LuaInstance(); LuaInstance();

2
gtk2_ardour/marker.cc
View File

@ -64,7 +64,7 @@ using namespace ARDOUR;
using namespace ARDOUR_UI_UTILS; using namespace ARDOUR_UI_UTILS;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
PBD::Signal1<void,ArdourMarker*> ArdourMarker::CatchDeletion; PBD::Signal<void(ArdourMarker*)> ArdourMarker::CatchDeletion;
static double marker_height = 13.0; static double marker_height = 13.0;

2
gtk2_ardour/marker.h
View File

@ -80,7 +80,7 @@ public:
virtual ~ArdourMarker (); virtual ~ArdourMarker ();
static PBD::Signal1<void,ArdourMarker*> CatchDeletion; static PBD::Signal<void(ArdourMarker*)> CatchDeletion;
static void setup_sizes (const double timebar_height); static void setup_sizes (const double timebar_height);

6
gtk2_ardour/meter_strip.cc
View File

@ -61,9 +61,9 @@ using namespace Gtkmm2ext;
using namespace std; using namespace std;
using namespace ArdourMeter; using namespace ArdourMeter;
PBD::Signal1<void,MeterStrip*> MeterStrip::CatchDeletion; PBD::Signal<void(MeterStrip*)> MeterStrip::CatchDeletion;
PBD::Signal0<void> MeterStrip::MetricChanged; PBD::Signal<void()> MeterStrip::MetricChanged;
PBD::Signal0<void> MeterStrip::ConfigurationChanged; PBD::Signal<void()> MeterStrip::ConfigurationChanged;
#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale())) #define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * UIConfiguration::instance().get_ui_scale()))

6
gtk2_ardour/meter_strip.h
View File

@ -62,9 +62,9 @@ public:
void fast_update (); void fast_update ();
std::shared_ptr<ARDOUR::Route> route() { return _route; } std::shared_ptr<ARDOUR::Route> route() { return _route; }
static PBD::Signal1<void,MeterStrip*> CatchDeletion; static PBD::Signal<void(MeterStrip*)> CatchDeletion;
static PBD::Signal0<void> MetricChanged; static PBD::Signal<void()> MetricChanged;
static PBD::Signal0<void> ConfigurationChanged; static PBD::Signal<void()> ConfigurationChanged;
void reset_peak_display (); void reset_peak_display ();
void reset_route_peak_display (ARDOUR::Route*); void reset_route_peak_display (ARDOUR::Route*);

2
gtk2_ardour/midi_view_background.h
View File

@ -100,7 +100,7 @@ class MidiViewBackground : public virtual ViewBackground
virtual void record_layer_check (std::shared_ptr<ARDOUR::Region>, samplepos_t) = 0; virtual void record_layer_check (std::shared_ptr<ARDOUR::Region>, samplepos_t) = 0;
virtual void set_size (double w, double h) {} virtual void set_size (double w, double h) {}
PBD::Signal0<void> HeightChanged; PBD::Signal<void()> HeightChanged;
protected: protected:
bool _range_dirty; bool _range_dirty;

2
gtk2_ardour/mixer_strip.cc
View File

@ -103,7 +103,7 @@ using namespace std;
using namespace ArdourMeter; using namespace ArdourMeter;
MixerStrip* MixerStrip::_entered_mixer_strip; MixerStrip* MixerStrip::_entered_mixer_strip;
PBD::Signal1<void,MixerStrip*> MixerStrip::CatchDeletion; PBD::Signal<void(MixerStrip*)> MixerStrip::CatchDeletion;
#define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale())) #define PX_SCALE(px) std::max((float)px, rintf((float)px * UIConfiguration::instance().get_ui_scale()))

4
gtk2_ardour/mixer_strip.h
View File

@ -135,9 +135,9 @@ public:
sigc::signal<void> WidthChanged; sigc::signal<void> WidthChanged;
/** The delivery that we are handling the level for with our fader has changed */ /** The delivery that we are handling the level for with our fader has changed */
PBD::Signal1<void, std::weak_ptr<ARDOUR::Delivery> > DeliveryChanged; PBD::Signal<void(std::weak_ptr<ARDOUR::Delivery> )> DeliveryChanged;
static PBD::Signal1<void,MixerStrip*> CatchDeletion; static PBD::Signal<void(MixerStrip*)> CatchDeletion;
std::string state_id() const; std::string state_id() const;

8
gtk2_ardour/port_group.h
View File

@ -67,10 +67,10 @@ public:
bool has_port (std::string const &) const; 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. */ /** The bundle list has changed in some way; a bundle has been added or removed, or the list cleared etc. */
PBD::Signal0<void> Changed; PBD::Signal<void()> Changed;
/** An individual bundle on our list has changed in some way */ /** An individual bundle on our list has changed in some way */
PBD::Signal1<void,ARDOUR::Bundle::Change> BundleChanged; PBD::Signal<void(ARDOUR::Bundle::Change)> BundleChanged;
struct BundleRecord { struct BundleRecord {
std::shared_ptr<ARDOUR::Bundle> bundle; std::shared_ptr<ARDOUR::Bundle> bundle;
@ -132,10 +132,10 @@ public:
bool empty () const; bool empty () const;
/** The group list has changed in some way; a group has been added or removed, or the list cleared etc. */ /** The group list has changed in some way; a group has been added or removed, or the list cleared etc. */
PBD::Signal0<void> Changed; PBD::Signal<void()> Changed;
/** A bundle in one of our groups has changed */ /** A bundle in one of our groups has changed */
PBD::Signal1<void,ARDOUR::Bundle::Change> BundleChanged; PBD::Signal<void(ARDOUR::Bundle::Change)> BundleChanged;
private: private:
bool port_has_prefix (std::string const &, std::string const &) const; bool port_has_prefix (std::string const &, std::string const &) const;

2
gtk2_ardour/region_view.cc
View File

@ -67,7 +67,7 @@ using namespace ArdourCanvas;
static const int32_t sync_mark_width = 9; static const int32_t sync_mark_width = 9;
PBD::Signal1<void,RegionView*> RegionView::RegionViewGoingAway; PBD::Signal<void(RegionView*)> RegionView::RegionViewGoingAway;
RegionView::RegionView (ArdourCanvas::Container* parent, RegionView::RegionView (ArdourCanvas::Container* parent,
TimeAxisView& tv, TimeAxisView& tv,

2
gtk2_ardour/region_view.h
View File

@ -127,7 +127,7 @@ public:
virtual void update_coverage_frame (LayerDisplay); virtual void update_coverage_frame (LayerDisplay);
static PBD::Signal1<void,RegionView*> RegionViewGoingAway; static PBD::Signal<void(RegionView*)> RegionViewGoingAway;
/** Called when a front trim is about to begin */ /** Called when a front trim is about to begin */
virtual void trim_front_starting () {} virtual void trim_front_starting () {}

2
gtk2_ardour/route_ui.cc
View File

@ -99,7 +99,7 @@ using namespace PBD;
using namespace std; using namespace std;
uint32_t RouteUI::_max_invert_buttons = 3; uint32_t RouteUI::_max_invert_buttons = 3;
PBD::Signal1<void, std::shared_ptr<Route> > RouteUI::BusSendDisplayChanged; PBD::Signal<void(std::shared_ptr<Route> )> RouteUI::BusSendDisplayChanged;
std::weak_ptr<Route> RouteUI::_showing_sends_to; std::weak_ptr<Route> RouteUI::_showing_sends_to;
std::string RouteUI::program_port_prefix; std::string RouteUI::program_port_prefix;

2
gtk2_ardour/route_ui.h
View File

@ -345,7 +345,7 @@ private:
* by a click on the `Sends' button. The parameter is the route that the sends are * 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. * to, or 0 if no route is now in this mode.
*/ */
static PBD::Signal1<void, std::shared_ptr<ARDOUR::Route> > BusSendDisplayChanged; static PBD::Signal<void(std::shared_ptr<ARDOUR::Route> )> BusSendDisplayChanged;
static std::weak_ptr<ARDOUR::Route> _showing_sends_to; static std::weak_ptr<ARDOUR::Route> _showing_sends_to;

4
gtk2_ardour/sfdb_freesound_mootcher.h
View File

@ -86,9 +86,9 @@ public:
/** signal emitted when mootcher reports progress updates during download. /** signal emitted when mootcher reports progress updates during download.
* The parameters are current and total numbers of bytes downloaded. * The parameters are current and total numbers of bytes downloaded.
*/ */
PBD::Signal2<void, double, double> Progress; PBD::Signal<void(double, double)> Progress;
/** signal emitted when the mootcher has finished downloading. */ /** signal emitted when the mootcher has finished downloading. */
PBD::Signal0<void> Finished; PBD::Signal<void()> Finished;
private: private:

2
gtk2_ardour/strip_silence_dialog.h
View File

@ -98,7 +98,7 @@ private:
Glib::Threads::Mutex _lock; ///< lock held while the thread is doing work Glib::Threads::Mutex _lock; ///< lock held while the thread is doing work
Glib::Threads::Cond _run_cond; ///< condition to wake the thread Glib::Threads::Cond _run_cond; ///< condition to wake the thread
bool _thread_should_finish; ///< true if the thread should terminate bool _thread_should_finish; ///< true if the thread should terminate
PBD::Signal0<void> Completed; ///< emitted when a silence detection has completed PBD::Signal<void()> Completed; ///< emitted when a silence detection has completed
PBD::ScopedConnection _completed_connection; PBD::ScopedConnection _completed_connection;
ARDOUR::InterThreadInfo _interthread_info; ARDOUR::InterThreadInfo _interthread_info;

2
gtk2_ardour/surround_strip.cc
View File

@ -51,7 +51,7 @@ using namespace Gtk;
#define PX_SCALE(px) std::max ((float)px, rintf ((float)px* UIConfiguration::instance ().get_ui_scale ())) #define PX_SCALE(px) std::max ((float)px, rintf ((float)px* UIConfiguration::instance ().get_ui_scale ()))
PBD::Signal1<void, SurroundStrip*> SurroundStrip::CatchDeletion; PBD::Signal<void(SurroundStrip*)> SurroundStrip::CatchDeletion;
SurroundStrip::SurroundStrip (Mixer_UI& mx, Session* s, std::shared_ptr<Route> r) SurroundStrip::SurroundStrip (Mixer_UI& mx, Session* s, std::shared_ptr<Route> r)
: SessionHandlePtr (s) : SessionHandlePtr (s)

2
gtk2_ardour/surround_strip.h
View File

@ -50,7 +50,7 @@ public:
void fast_update (); void fast_update ();
void hide_spacer (bool); void hide_spacer (bool);
static PBD::Signal1<void, SurroundStrip*> CatchDeletion; static PBD::Signal<void(SurroundStrip*)> CatchDeletion;
private: private:
void init (); void init ();

2
gtk2_ardour/template_dialog.cc
View File

@ -69,7 +69,7 @@ public:
virtual void init () = 0; virtual void init () = 0;
void handle_dirty_description (); void handle_dirty_description ();
PBD::Signal0<void> TemplatesImported; PBD::Signal<void()> TemplatesImported;
protected: protected:
TemplateManager (); TemplateManager ();

2
gtk2_ardour/tempo_curve.cc
View File

@ -40,7 +40,7 @@
using namespace Temporal; using namespace Temporal;
PBD::Signal1<void,TempoCurve*> TempoCurve::CatchDeletion; PBD::Signal<void(TempoCurve*)> TempoCurve::CatchDeletion;
static double curve_height = 13.0; static double curve_height = 13.0;

2
gtk2_ardour/tempo_curve.h
View File

@ -42,7 +42,7 @@ public:
TempoCurve (PublicEditor& editor, ArdourCanvas::Item &, guint32 rgba, Temporal::TempoPoint const & temp, bool handle_events , ArdourCanvas::Distance marker_width); TempoCurve (PublicEditor& editor, ArdourCanvas::Item &, guint32 rgba, Temporal::TempoPoint const & temp, bool handle_events , ArdourCanvas::Distance marker_width);
~TempoCurve (); ~TempoCurve ();
static PBD::Signal1<void,TempoCurve*> CatchDeletion; static PBD::Signal<void(TempoCurve*)> CatchDeletion;
static void setup_sizes (const double timebar_height); static void setup_sizes (const double timebar_height);

2
gtk2_ardour/tempo_dialog.h
View File

@ -135,7 +135,7 @@ private:
MidiPortCols _midi_port_cols; MidiPortCols _midi_port_cols;
Glib::RefPtr<Gtk::ListStore> _midi_port_list; Glib::RefPtr<Gtk::ListStore> _midi_port_list;
PBD::Signal1<void, int64_t> _midi_tap_signal; PBD::Signal<void(int64_t)> _midi_tap_signal;
std::shared_ptr<MIDI::Parser> _midi_tap_parser; std::shared_ptr<MIDI::Parser> _midi_tap_parser;
std::shared_ptr<ARDOUR::MidiPort> _midi_tap_port; std::shared_ptr<ARDOUR::MidiPort> _midi_tap_port;
PBD::ScopedConnection _parser_connection; PBD::ScopedConnection _parser_connection;

2
gtk2_ardour/time_axis_view.cc
View File

@ -88,7 +88,7 @@ uint32_t TimeAxisView::button_height = 0;
uint32_t TimeAxisView::extra_height = 0; uint32_t TimeAxisView::extra_height = 0;
int const TimeAxisView::_max_order = 512; int const TimeAxisView::_max_order = 512;
unsigned int TimeAxisView::name_width_px = 100; unsigned int TimeAxisView::name_width_px = 100;
PBD::Signal1<void,TimeAxisView*> TimeAxisView::CatchDeletion; PBD::Signal<void(TimeAxisView*)> TimeAxisView::CatchDeletion;
Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::controls_meters_size_group = Glib::RefPtr<Gtk::SizeGroup>(); Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::controls_meters_size_group = Glib::RefPtr<Gtk::SizeGroup>();
Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::midi_scroomer_size_group = Glib::RefPtr<Gtk::SizeGroup>(); Glib::RefPtr<Gtk::SizeGroup> TimeAxisView::midi_scroomer_size_group = Glib::RefPtr<Gtk::SizeGroup>();

2
gtk2_ardour/time_axis_view.h
View File

@ -106,7 +106,7 @@ public:
TimeAxisView(ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas); TimeAxisView(ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas);
virtual ~TimeAxisView (); virtual ~TimeAxisView ();
static PBD::Signal1<void,TimeAxisView*> CatchDeletion; static PBD::Signal<void(TimeAxisView*)> CatchDeletion;
static void setup_sizes (); static void setup_sizes ();

4
gtk2_ardour/track_record_axis.cc
View File

@ -70,8 +70,8 @@ using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
using namespace std; using namespace std;
PBD::Signal1<void, TrackRecordAxis*> TrackRecordAxis::CatchDeletion; PBD::Signal<void(TrackRecordAxis*)> TrackRecordAxis::CatchDeletion;
PBD::Signal2<void, TrackRecordAxis*, bool> TrackRecordAxis::EditNextName; PBD::Signal<void(TrackRecordAxis*, bool)> TrackRecordAxis::EditNextName;
#define PX_SCALE(pxmin, dflt) rint (std::max ((double)pxmin, (double)dflt* UIConfiguration::instance ().get_ui_scale ())) #define PX_SCALE(pxmin, dflt) rint (std::max ((double)pxmin, (double)dflt* UIConfiguration::instance ().get_ui_scale ()))

4
gtk2_ardour/track_record_axis.h
View File

@ -78,8 +78,8 @@ public:
int summary_xpos () const; int summary_xpos () const;
int summary_width () const; int summary_width () const;
static PBD::Signal1<void, TrackRecordAxis*> CatchDeletion; static PBD::Signal<void(TrackRecordAxis*)> CatchDeletion;
static PBD::Signal2<void, TrackRecordAxis*, bool> EditNextName; static PBD::Signal<void(TrackRecordAxis*, bool)> EditNextName;
protected: protected:
void self_delete (); void self_delete ();

4
gtk2_ardour/transcode_ffmpeg.h
View File

@ -167,10 +167,10 @@ public:
* during \ref encode \ref transcode and \ref extract_audio * during \ref encode \ref transcode and \ref extract_audio
* The parameters are current and last video-frame. * The parameters are current and last video-frame.
*/ */
PBD::Signal2<void, ARDOUR::samplecnt_t, ARDOUR::samplecnt_t> Progress; PBD::Signal<void(ARDOUR::samplecnt_t, ARDOUR::samplecnt_t)> Progress;
/** signal emitted when the transcoder process terminates. */ /** signal emitted when the transcoder process terminates. */
PBD::Signal1<void, int> Finished; PBD::Signal<void(int)> Finished;
protected: protected:
bool probe (); bool probe ();

2
gtk2_ardour/transcode_video_dialog.h
View File

@ -95,7 +95,7 @@ private:
std::string infn; std::string infn;
double m_aspect; double m_aspect;
PBD::Signal0<void> StartNextStage; PBD::Signal<void()> StartNextStage;
TranscodeFfmpeg* transcoder; TranscodeFfmpeg* transcoder;

2
gtk2_ardour/trigger_strip.cc
View File

@ -56,7 +56,7 @@ using namespace Gtk;
using namespace Gtkmm2ext; using namespace Gtkmm2ext;
using namespace std; using namespace std;
PBD::Signal1<void, TriggerStrip*> TriggerStrip::CatchDeletion; PBD::Signal<void(TriggerStrip*)> TriggerStrip::CatchDeletion;
TriggerStrip::TriggerStrip (Session* s, std::shared_ptr<ARDOUR::Route> rt) TriggerStrip::TriggerStrip (Session* s, std::shared_ptr<ARDOUR::Route> rt)
: SessionHandlePtr (s) : SessionHandlePtr (s)

2
gtk2_ardour/trigger_strip.h
View File

@ -64,7 +64,7 @@ public:
void fast_update (); void fast_update ();
static PBD::Signal1<void, TriggerStrip*> CatchDeletion; static PBD::Signal<void(TriggerStrip*)> CatchDeletion;
protected: protected:
void self_delete (); void self_delete ();

2
gtk2_ardour/vca_master_strip.cc
View File

@ -49,7 +49,7 @@ using namespace Gtk;
using namespace PBD; using namespace PBD;
using std::string; using std::string;
PBD::Signal1<void,VCAMasterStrip*> VCAMasterStrip::CatchDeletion; PBD::Signal<void(VCAMasterStrip*)> VCAMasterStrip::CatchDeletion;
static bool no_propagate (GdkEventButton*) { return false; } static bool no_propagate (GdkEventButton*) { return false; }

2
gtk2_ardour/vca_master_strip.h
View File

@ -56,7 +56,7 @@ public:
std::string state_id() const; std::string state_id() const;
std::shared_ptr<ARDOUR::VCA> vca() const { return _vca; } std::shared_ptr<ARDOUR::VCA> vca() const { return _vca; }
static PBD::Signal1<void,VCAMasterStrip*> CatchDeletion; static PBD::Signal<void(VCAMasterStrip*)> CatchDeletion;
bool marked_for_display () const; bool marked_for_display () const;
bool set_marked_for_display (bool); bool set_marked_for_display (bool);

2
gtk2_ardour/video_image_frame.h
View File

@ -59,7 +59,7 @@ class VideoImageFrame : public sigc::trackable
std::string get_video_filename () {return video_filename;} std::string get_video_filename () {return video_filename;}
void http_download_done (char *); void http_download_done (char *);
PBD::Signal0<void> ImgChanged; PBD::Signal<void()> ImgChanged;
protected: protected:

4
gtk2_ardour/video_monitor.h
View File

@ -71,7 +71,7 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
bool synced_by_manual_seeks() { return sync_by_manual_seek; } bool synced_by_manual_seeks() { return sync_by_manual_seek; }
sigc::signal<void> Terminated; sigc::signal<void> Terminated;
PBD::Signal1<void,std::string> UiState; PBD::Signal<void(std::string)> UiState;
void send_cmd (int what, int param); void send_cmd (int what, int param);
#if 1 #if 1
@ -105,7 +105,7 @@ class VideoMonitor : public sigc::trackable , public ARDOUR::SessionHandlePtr, p
int knownstate; int knownstate;
int osdmode; int osdmode;
PBD::Signal1<void, unsigned int> XJKeyEvent; PBD::Signal<void(unsigned int)> XJKeyEvent;
#if 1 #if 1
bool debug_enable; bool debug_enable;
#endif #endif

4
gtk2_ardour/video_timeline.h
View File

@ -141,8 +141,8 @@ class VideoTimeLine : public sigc::trackable, public ARDOUR::SessionHandlePtr, p
VideoMonitor *vmonitor; VideoMonitor *vmonitor;
bool reopen_vmonitor; bool reopen_vmonitor;
PBD::Signal0<void> VtlUpdate; PBD::Signal<void()> VtlUpdate;
PBD::Signal1<void,std::string> GuiUpdate; PBD::Signal<void(std::string)> GuiUpdate;
void gui_update (const std::string &); void gui_update (const std::string &);
PBD::ScopedConnection sessionsave; PBD::ScopedConnection sessionsave;

2
gtk2_ardour/virtual_keyboard_window.h
View File

@ -75,7 +75,7 @@ public:
double upper () const { return _upper; } double upper () const { return _upper; }
double normal () const { return _normal; } double normal () const { return _normal; }
PBD::Signal1<void, int> ValueChanged; PBD::Signal<void(int)> ValueChanged;
protected: protected:
double _lower; double _lower;

2
gtk2_ardour/visibility_group.h
View File

@ -52,7 +52,7 @@ public:
std::string get_state_name () const; std::string get_state_name () const;
std::string get_state_value () const; std::string get_state_value () const;
PBD::Signal0<void> VisibilityChanged; PBD::Signal<void()> VisibilityChanged;
static std::string remove_element (std::string const& from, std::string const& element); 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); static std::string add_element (std::string const& from, std::string const& element);