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

consolidate BundleAdded/Remove signal

Browse Source 
The only user (matrix) does not care which bundles are added/removed.
This simplification will make it a lot easier to keep bundles
in sync with actual hardware ports.
This commit is contained in:
Robin Gareus
2015-03-08 22:38:55 +01:00
parent 9107a4b7fe
commit 0582221353
2 changed files with 7 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
libs/ardour/ardour/session.h
View File

@@ -716,12 +716,11 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
/* I/O bundles */ /* I/O bundles */
void add_bundle (boost::shared_ptr<Bundle>); void add_bundle (boost::shared_ptr<Bundle>, bool emit_signal = true);
void remove_bundle (boost::shared_ptr<Bundle>); void remove_bundle (boost::shared_ptr<Bundle>);
boost::shared_ptr<Bundle> bundle_by_name (std::string) const; boost::shared_ptr<Bundle> bundle_by_name (std::string) const;
PBD::Signal1<void,boost::shared_ptr<Bundle> > BundleAdded; PBD::Signal0<void> BundleAddedOrRemoved;
PBD::Signal1<void,boost::shared_ptr<Bundle> > BundleRemoved;
void midi_panic (); void midi_panic ();

8
libs/ardour/session.cc
View File

@@ -4129,7 +4129,7 @@ Session::available_capture_duration ()
} }
void void
Session::add_bundle (boost::shared_ptr<Bundle> bundle) Session::add_bundle (boost::shared_ptr<Bundle> bundle, bool emit_signal)
{ {
{ {
RCUWriter<BundleList> writer (_bundles); RCUWriter<BundleList> writer (_bundles);
@@ -4137,7 +4137,9 @@ Session::add_bundle (boost::shared_ptr<Bundle> bundle)
b->push_back (bundle); b->push_back (bundle);
} }
BundleAdded (bundle); /* EMIT SIGNAL */ if (emit_signal) {
BundleAddedOrRemoved (); /* EMIT SIGNAL */
}
set_dirty(); set_dirty();
} }
@@ -4159,7 +4161,7 @@ Session::remove_bundle (boost::shared_ptr<Bundle> bundle)
} }
if (removed) { if (removed) {
BundleRemoved (bundle); /* EMIT SIGNAL */ BundleAddedOrRemoved (); /* EMIT SIGNAL */
} }
set_dirty(); set_dirty();