projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
set owner or disk-i/o processors
[ardour.git]
/
libs
/
ardour
/
ladspa_plugin.cc
diff --git
a/libs/ardour/ladspa_plugin.cc
b/libs/ardour/ladspa_plugin.cc
index 744293804f2487264c0e64afb8c607f981e094b3..570c5109ffe44dea075e29cacbf7d7dd43f879bf 100644
(file)
--- a/
libs/ardour/ladspa_plugin.cc
+++ b/
libs/ardour/ladspa_plugin.cc
@@
-41,6
+41,7
@@
#include "pbd/compose.h"
#include "pbd/error.h"
#include "pbd/compose.h"
#include "pbd/error.h"
+#include "pbd/locale_guard.h"
#include "pbd/xml++.h"
#include "pbd/stacktrace.h"
#include "pbd/xml++.h"
#include "pbd/stacktrace.h"
@@
-58,7
+59,7
@@
using namespace std;
using namespace ARDOUR;
using namespace PBD;
using namespace ARDOUR;
using namespace PBD;
-LadspaPlugin::LadspaPlugin (string module_path, AudioEngine& e, Session& session, uint32_t index,
fram
ecnt_t rate)
+LadspaPlugin::LadspaPlugin (string module_path, AudioEngine& e, Session& session, uint32_t index,
sampl
ecnt_t rate)
: Plugin (e, session)
{
init (module_path, index, rate);
: Plugin (e, session)
{
init (module_path, index, rate);
@@
-76,7
+77,7
@@
LadspaPlugin::LadspaPlugin (const LadspaPlugin &other)
}
void
}
void
-LadspaPlugin::init (string module_path, uint32_t index,
fram
ecnt_t rate)
+LadspaPlugin::init (string module_path, uint32_t index,
sampl
ecnt_t rate)
{
void* func;
LADSPA_Descriptor_Function dfunc;
{
void* func;
LADSPA_Descriptor_Function dfunc;
@@
-347,7
+348,6
@@
void
LadspaPlugin::add_state (XMLNode* root) const
{
XMLNode *child;
LadspaPlugin::add_state (XMLNode* root) const
{
XMLNode *child;
- LocaleGuard lg;
for (uint32_t i = 0; i < parameter_count(); ++i){
for (uint32_t i = 0; i < parameter_count(); ++i){
@@
-374,7
+374,6
@@
LadspaPlugin::set_state (const XMLNode& node, int version)
XMLNodeConstIterator iter;
XMLNode *child;
#endif
XMLNodeConstIterator iter;
XMLNode *child;
#endif
- LocaleGuard lg;
if (node.name() != state_node_name()) {
error << _("Bad node sent to LadspaPlugin::set_state") << endmsg;
if (node.name() != state_node_name()) {
error << _("Bad node sent to LadspaPlugin::set_state") << endmsg;
@@
-470,7
+469,7
@@
LadspaPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& des
if (LADSPA_IS_HINT_BOUNDED_BELOW(prh.HintDescriptor)) {
if (LADSPA_IS_HINT_SAMPLE_RATE(prh.HintDescriptor)) {
if (LADSPA_IS_HINT_BOUNDED_BELOW(prh.HintDescriptor)) {
if (LADSPA_IS_HINT_SAMPLE_RATE(prh.HintDescriptor)) {
- desc.lower = prh.LowerBound * _session.
fram
e_rate();
+ desc.lower = prh.LowerBound * _session.
sampl
e_rate();
} else {
desc.lower = prh.LowerBound;
}
} else {
desc.lower = prh.LowerBound;
}
@@
-481,7
+480,7
@@
LadspaPlugin::get_parameter_descriptor (uint32_t which, ParameterDescriptor& des
if (LADSPA_IS_HINT_BOUNDED_ABOVE(prh.HintDescriptor)) {
if (LADSPA_IS_HINT_SAMPLE_RATE(prh.HintDescriptor)) {
if (LADSPA_IS_HINT_BOUNDED_ABOVE(prh.HintDescriptor)) {
if (LADSPA_IS_HINT_SAMPLE_RATE(prh.HintDescriptor)) {
- desc.upper = prh.UpperBound * _session.
fram
e_rate();
+ desc.upper = prh.UpperBound * _session.
sampl
e_rate();
} else {
desc.upper = prh.UpperBound;
}
} else {
desc.upper = prh.UpperBound;
}
@@
-526,7
+525,7
@@
LadspaPlugin::describe_parameter (Evoral::Parameter which)
}
}
}
}
-ARDOUR::
fram
ecnt_t
+ARDOUR::
sampl
ecnt_t
LadspaPlugin::signal_latency () const
{
if (_user_latency) {
LadspaPlugin::signal_latency () const
{
if (_user_latency) {
@@
-534,7
+533,7
@@
LadspaPlugin::signal_latency () const
}
if (_latency_control_port) {
}
if (_latency_control_port) {
- return (
fram
ecnt_t) floor (*_latency_control_port);
+ return (
sampl
ecnt_t) floor (*_latency_control_port);
} else {
return 0;
}
} else {
return 0;
}
@@
-558,9
+557,9
@@
LadspaPlugin::automatable () const
int
LadspaPlugin::connect_and_run (BufferSet& bufs,
int
LadspaPlugin::connect_and_run (BufferSet& bufs,
-
framepos_t start, fram
epos_t end, double speed,
+
samplepos_t start, sampl
epos_t end, double speed,
ChanMapping in_map, ChanMapping out_map,
ChanMapping in_map, ChanMapping out_map,
- pframes_t nframes,
fram
ecnt_t offset)
+ pframes_t nframes,
sampl
ecnt_t offset)
{
Plugin::connect_and_run (bufs, start, end, speed, in_map, out_map, nframes, offset);
{
Plugin::connect_and_run (bufs, start, end, speed, in_map, out_map, nframes, offset);
@@
-686,7
+685,7
@@
LadspaPlugin::latency_compute_run ()
uint32_t port_index = 0;
uint32_t in_index = 0;
uint32_t out_index = 0;
uint32_t port_index = 0;
uint32_t in_index = 0;
uint32_t out_index = 0;
- const
fram
ecnt_t bufsize = 1024;
+ const
sampl
ecnt_t bufsize = 1024;
LADSPA_Data buffer[bufsize];
memset(buffer,0,sizeof(LADSPA_Data)*bufsize);
LADSPA_Data buffer[bufsize];
memset(buffer,0,sizeof(LADSPA_Data)*bufsize);
@@
-718,7
+717,7
@@
PluginPtr
LadspaPluginInfo::load (Session& session)
{
try {
LadspaPluginInfo::load (Session& session)
{
try {
- PluginPtr plugin (new LadspaPlugin (path, session.engine(), session, index, session.
fram
e_rate()));
+ PluginPtr plugin (new LadspaPlugin (path, session.engine(), session, index, session.
sampl
e_rate()));
plugin->set_info(PluginInfoPtr(new LadspaPluginInfo(*this)));
return plugin;
}
plugin->set_info(PluginInfoPtr(new LadspaPluginInfo(*this)));
return plugin;
}