smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-28 09:27:39 +01:00
Code Issues Projects Releases Wiki Activity

Make a few things private in Delivery; couple of minor

Browse source 
cleanups.


git-svn-id: svn://localhost/ardour2/branches/3.0@10715 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2011-11-20 17:49:25 +00:00
parent 9a0d7cafeb
commit fa40fb2d98
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libs/ardour/ardour/delivery.h
View file

@ -107,19 +107,22 @@ public:
Role _role;
BufferSet* _output_buffers;
gain_t _current_gain;
bool _no_outs_cuz_we_no_monitor;
boost::shared_ptr<MuteMaster> _mute_master;
bool no_panner_reset;
boost::shared_ptr<PannerShell> _panshell;
gain_t target_gain ();
private:
bool _no_outs_cuz_we_no_monitor;
boost::shared_ptr<MuteMaster> _mute_master;
static bool panners_legal;
static PBD::Signal0<int> PannersLegal;
static PBD::Signal0<int> PannersLegal;
int panners_became_legal ();
PBD::ScopedConnection panner_legal_c;
void output_changed (IOChange, void*);
gain_t target_gain ();
bool _no_panner_reset;
};

12
libs/ardour/delivery.cc
View file

@ -61,7 +61,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr<IO> io, boost::shared_ptr<Pann
, _current_gain (1.0)
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
, no_panner_reset (false)
, _no_panner_reset (false)
{
if (pannable) {
_panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable));
@ -85,7 +85,7 @@ Delivery::Delivery (Session& s, boost::shared_ptr<Pannable> pannable, boost::sha
, _current_gain (1.0)
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
, no_panner_reset (false)
, _no_panner_reset (false)
{
if (pannable) {
_panshell = boost::shared_ptr<PannerShell>(new PannerShell (_name, _session, pannable));
@ -387,7 +387,7 @@ void
Delivery::reset_panner ()
{
if (panners_legal) {
if (!no_panner_reset) {
if (!_no_panner_reset) {
if (_panshell) {
_panshell->configure_io (ChanCount (DataType::AUDIO, pans_required()), ChanCount (DataType::AUDIO, pan_outs()));
@ -422,19 +422,19 @@ Delivery::panners_became_legal ()
void
Delivery::defer_pan_reset ()
{
no_panner_reset = true;
_no_panner_reset = true;
}
void
Delivery::allow_pan_reset ()
{
no_panner_reset = false;
_no_panner_reset = false;
reset_panner ();
}
int
Delivery::disable_panners (void)
Delivery::disable_panners ()
{
panners_legal = false;
return 0;