diff options
| -rw-r--r-- | libs/ardour/ardour/delivery.h | 6 | ||||
| -rw-r--r-- | libs/ardour/delivery.cc | 9 |
2 files changed, 7 insertions, 8 deletions
diff --git a/libs/ardour/ardour/delivery.h b/libs/ardour/ardour/delivery.h index 4ee171c033..314b223538 100644 --- a/libs/ardour/ardour/delivery.h +++ b/libs/ardour/ardour/delivery.h @@ -89,7 +89,7 @@ public: /* Panning */ static int disable_panners (void); - static int reset_panners (void); + static void reset_panners (); boost::shared_ptr<PannerShell> panner_shell() const { return _panshell; } boost::shared_ptr<Panner> panner() const; @@ -115,9 +115,9 @@ public: boost::shared_ptr<MuteMaster> _mute_master; static bool panners_legal; - static PBD::Signal0<int> PannersLegal; + static PBD::Signal0<void> PannersLegal; - int panners_became_legal (); + void panners_became_legal (); PBD::ScopedConnection panner_legal_c; void output_changed (IOChange, void*); diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc index 2fc8d82e47..86ce419340 100644 --- a/libs/ardour/delivery.cc +++ b/libs/ardour/delivery.cc @@ -47,7 +47,7 @@ using namespace std; using namespace PBD; using namespace ARDOUR; -PBD::Signal0<int> Delivery::PannersLegal; +PBD::Signal0<void> Delivery::PannersLegal; bool Delivery::panners_legal = false; /* deliver to an existing IO object */ @@ -402,7 +402,7 @@ Delivery::reset_panner () } } -int +void Delivery::panners_became_legal () { if (_panshell) { @@ -414,7 +414,6 @@ Delivery::panners_became_legal () } panner_legal_c.disconnect (); - return 0; } void @@ -438,11 +437,11 @@ Delivery::disable_panners () return 0; } -int +void Delivery::reset_panners () { panners_legal = true; - return *PannersLegal (); + PannersLegal (); } void |