projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Introduce a macro for imprecise configurations
[ardour.git]
/
libs
/
ardour
/
vca_manager.cc
diff --git
a/libs/ardour/vca_manager.cc
b/libs/ardour/vca_manager.cc
index 71c3fe8029a31957fbf51531f461f5983145bb86..20e9e38ca2aaf0b7e0bc7ec73f7a15df04fee546 100644
(file)
--- a/
libs/ardour/vca_manager.cc
+++ b/
libs/ardour/vca_manager.cc
@@
-18,15
+18,20
@@
*/
#include "pbd/convert.h"
*/
#include "pbd/convert.h"
+#include "pbd/error.h"
#include "pbd/replace_all.h"
#include "pbd/replace_all.h"
+#include "ardour/boost_debug.h"
+#include "ardour/session.h"
+#include "ardour/slavable.h"
#include "ardour/vca.h"
#include "ardour/vca_manager.h"
#include "ardour/vca.h"
#include "ardour/vca_manager.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace ARDOUR;
using namespace Glib::Threads;
using namespace ARDOUR;
using namespace Glib::Threads;
+using namespace PBD;
using std::string;
string VCAManager::xml_node_name (X_("VCAManager"));
using std::string;
string VCAManager::xml_node_name (X_("VCAManager"));
@@
-46,6
+51,9
@@
void
VCAManager::clear ()
{
Mutex::Lock lm (lock);
VCAManager::clear ()
{
Mutex::Lock lm (lock);
+ for (VCAList::const_iterator i = _vcas.begin(); i != _vcas.end(); ++i) {
+ (*i)->DropReferences ();
+ }
_vcas.clear ();
}
_vcas.clear ();
}
@@
-75,6
+83,9
@@
VCAManager::create_vca (uint32_t howmany, std::string const & name_template)
}
boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, num, name));
}
boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, num, name));
+ BOOST_MARK_VCA (vca);
+
+ vca->init ();
_vcas.push_back (vca);
vcal.push_back (vca);
_vcas.push_back (vca);
vcal.push_back (vca);
@@
-83,6
+94,8
@@
VCAManager::create_vca (uint32_t howmany, std::string const & name_template)
VCAAdded (vcal); /* EMIT SIGNAL */
VCAAdded (vcal); /* EMIT SIGNAL */
+ _session.set_dirty ();
+
return 0;
}
return 0;
}
@@
-95,14
+108,15
@@
VCAManager::remove_vca (boost::shared_ptr<VCA> vca)
_vcas.remove (vca);
}
_vcas.remove (vca);
}
- VCAList vcal;
- vcal.push_back (vca);
+ /* this should cause deassignment and deletion */
+
+ vca->DropReferences ();
- VCARemoved (vcal); /* EMIT SIGNAL */
+ _session.set_dirty ();
}
boost::shared_ptr<VCA>
}
boost::shared_ptr<VCA>
-VCAManager::vca_by_number (
u
int32_t n) const
+VCAManager::vca_by_number (int32_t n) const
{
Mutex::Lock lm (lock);
{
Mutex::Lock lm (lock);
@@
-145,7
+159,13
@@
VCAManager::set_state (XMLNode const& node, int version)
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
if ((*i)->name() == VCA::xml_node_name) {
for (XMLNodeList::const_iterator i = children.begin(); i != children.end(); ++i) {
if ((*i)->name() == VCA::xml_node_name) {
- boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, **i, version));
+ boost::shared_ptr<VCA> vca = boost::shared_ptr<VCA> (new VCA (_session, 0, X_("tobereset")));
+ BOOST_MARK_VCA (vca);
+
+ if (vca->init() || vca->set_state (**i, version)) {
+ error << _("Cannot set state of a VCA") << endmsg;
+ return -1;
+ }
/* can't hold the lock for the entire loop,
* because the new VCA maybe slaved and needs
/* can't hold the lock for the entire loop,
* because the new VCA maybe slaved and needs
@@
-163,8
+183,17
@@
VCAManager::set_state (XMLNode const& node, int version)
_vcas_loaded = true;
_vcas_loaded = true;
- VCAsLoaded (); /* EMIT SIGNAL */
VCAAdded (vcal); /* EMIT SIGNAL */
return 0;
}
VCAAdded (vcal); /* EMIT SIGNAL */
return 0;
}
+
+void
+VCAManager::clear_all_solo_state ()
+{
+ Mutex::Lock lm (lock);
+
+ for (VCAList::const_iterator i = _vcas.begin(); i != _vcas.end(); ++i) {
+ (*i)->clear_all_solo_state ();
+ }
+}