#include <glibmm.h>
#include "pbd/cartesian.h"
-#include "pbd/boost_debug.h"
#include "pbd/convert.h"
#include "pbd/error.h"
#include "pbd/failed_constructor.h"
#include "ardour/audio_buffer.h"
#include "ardour/audioengine.h"
+#include "ardour/boost_debug.h"
#include "ardour/buffer_set.h"
#include "ardour/debug.h"
#include "ardour/pannable.h"
#include "ardour/session.h"
#include "ardour/speakers.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
#include "pbd/mathfix.h"
{
XMLNode* node = new XMLNode ("PannerShell");
- node->add_property (X_("bypassed"), _bypassed ? X_("yes") : X_("no"));
- node->add_property (X_("user-panner"), _user_selected_panner_uri);
- node->add_property (X_("linked-to-route"), _panlinked ? X_("yes") : X_("no"));
+ node->set_property (X_("bypassed"), _bypassed);
+ node->set_property (X_("user-panner"), _user_selected_panner_uri);
+ node->set_property (X_("linked-to-route"), _panlinked);
if (_panner && _is_send) {
node->add_child_nocopy (_panner->get_state ());
{
XMLNodeList nlist = node.children ();
XMLNodeConstIterator niter;
- XMLProperty const * prop;
- LocaleGuard lg;
+ bool yn;
+ std::string str;
- if ((prop = node.property (X_("bypassed"))) != 0) {
- set_bypassed (string_is_affirmative (prop->value ()));
+ if (node.get_property (X_("bypassed"), yn)) {
+ set_bypassed (yn);
}
- if ((prop = node.property (X_("linked-to-route"))) != 0) {
+ if (node.get_property (X_("linked-to-route"), yn)) {
if (!ARDOUR::Profile->get_mixbus()) {
- _panlinked = string_is_affirmative (prop->value ());
+ _panlinked = yn;
}
}
- if ((prop = node.property (X_("user-panner"))) != 0) {
- _user_selected_panner_uri = prop->value ();
- }
+ node.get_property (X_("user-panner"), _user_selected_panner_uri);
_panner.reset ();
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
if ((*niter)->name() == X_("Panner")) {
-
- if ((prop = (*niter)->property (X_("uri")))) {
- PannerInfo* p = PannerManager::instance().get_by_uri(prop->value());
+ if ((*niter)->get_property (X_("uri"), str)) {
+ PannerInfo* p = PannerManager::instance().get_by_uri(str);
if (p) {
_panner.reset (p->descriptor.factory (
_is_send ? _pannable_internal : _pannable_route, _session.get_speakers ()));
}
else /* backwards compatibility */
- if ((prop = (*niter)->property (X_("type")))) {
+ if ((*niter)->get_property (X_("type"), str)) {
list<PannerInfo*>::iterator p;
PannerManager& pm (PannerManager::instance());
for (p = pm.panner_info.begin(); p != pm.panner_info.end(); ++p) {
- if (prop->value() == (*p)->descriptor.name) {
+ if (str == (*p)->descriptor.name) {
/* note that we assume that all the stream panners
are of the same type. pretty good
if (p == pm.panner_info.end()) {
error << string_compose (_("Unknown panner plugin \"%1\" found in pan state - ignored"),
- prop->value())
+ str)
<< endmsg;
}
}
void
-PannerShell::run (BufferSet& inbufs, BufferSet& outbufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes)
+PannerShell::run (BufferSet& inbufs, BufferSet& outbufs, samplepos_t start_sample, samplepos_t end_sample, pframes_t nframes)
{
if (inbufs.count().n_audio() == 0) {
/* Input has no audio buffers (e.g. Aux Send in a MIDI track at a
// If we shouldn't play automation defer to distribute_no_automation
- if (!(as & Play || ((as & Touch) && !_panner->touching()))) {
+ if (!((as & Play) || ((as & (Touch | Latch)) && !_panner->touching()))) {
distribute_no_automation (inbufs, outbufs, nframes, 1.0);
i->silence(nframes);
}
- _panner->distribute_automated (inbufs, outbufs, start_frame, end_frame, nframes, _session.pan_automation_buffer());
+ _panner->distribute_automated (inbufs, outbufs, start_sample, end_sample, nframes, _session.pan_automation_buffer());
}
}