allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

add VCAStatusChange message to GainControl

Browse Source
This commit is contained in:
Paul Davis
2016-03-02 12:41:27 -05:00
parent 3be9d6dccc
commit a879310349
2 changed files with 22 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/ardour/gain_control.h
View File

@@ -60,6 +60,8 @@ class LIBARDOUR_API GainControl : public AutomationControl {
bool slaved_to (boost::shared_ptr<VCA>) const;
std::vector<uint32_t> masters () const;
PBD::Signal0<void> VCAStatusChange;
int set_state (XMLNode const&, int);
XMLNode& get_state();

22
libs/ardour/gain_control.cc
View File

@@ -133,11 +133,12 @@ GainControl::add_master (boost::shared_ptr<VCA> vca)
{
gain_t old_master_val;
gain_t new_master_val;
std::pair<set<boost::shared_ptr<GainControl> >::iterator,bool> res;
{
Glib::Threads::Mutex::Lock lm (master_lock);
old_master_val = get_master_gain_locked ();
_masters.insert (vca->control());
res = _masters.insert (vca->control());
_masters_numbers.insert (vca->number());
new_master_val = get_master_gain_locked ();
@@ -153,6 +154,10 @@ GainControl::add_master (boost::shared_ptr<VCA> vca)
if (old_master_val != new_master_val) {
Changed(); /* EMIT SIGNAL */
}
if (res.second) {
VCAStatusChange (); /* EMIT SIGNAL */
}
}
void
@@ -169,11 +174,12 @@ GainControl::remove_master (boost::shared_ptr<VCA> vca)
{
gain_t old_master_val;
gain_t new_master_val;
set<boost::shared_ptr<GainControl> >::size_type erased = 0;
{
Glib::Threads::Mutex::Lock lm (master_lock);
old_master_val = get_master_gain_locked ();
_masters.erase (vca->control());
erased = _masters.erase (vca->control());
_masters_numbers.erase (vca->number());
new_master_val = get_master_gain_locked ();
}
@@ -181,6 +187,10 @@ GainControl::remove_master (boost::shared_ptr<VCA> vca)
if (old_master_val != new_master_val) {
Changed(); /* EMIT SIGNAL */
}
if (erased) {
VCAStatusChange (); /* EMIT SIGNAL */
}
}
void
@@ -188,10 +198,14 @@ GainControl::clear_masters ()
{
gain_t old_master_val;
gain_t new_master_val;
bool had_masters = false;
{
Glib::Threads::Mutex::Lock lm (master_lock);
old_master_val = get_master_gain_locked ();
if (!_masters.empty()) {
had_masters = true;
}
_masters.clear ();
_masters_numbers.clear ();
new_master_val = get_master_gain_locked ();
@@ -200,6 +214,10 @@ GainControl::clear_masters ()
if (old_master_val != new_master_val) {
Changed(); /* EMIT SIGNAL */
}
if (had_masters) {
VCAStatusChange (); /* EMIT SIGNAL */
}
}
bool