projects
/
ardour.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix more cut-n-paste coding errors
[ardour.git]
/
libs
/
ardour
/
element_importer.cc
diff --git
a/libs/ardour/element_importer.cc
b/libs/ardour/element_importer.cc
index 4f635f1693ccef28b51afc745a23a98e37e84f99..ace517f0709893951752b1f16aa3c26c65f26856 100644
(file)
--- a/
libs/ardour/element_importer.cc
+++ b/
libs/ardour/element_importer.cc
@@
-23,10
+23,10
@@
#include <sstream>
#include <iomanip>
#include <sstream>
#include <iomanip>
-#include "pbd/convert.h"
+#include "pbd/
string_
convert.h"
#include "ardour/session.h"
#include "ardour/session.h"
-#include "i18n.h"
+#include "
pbd/
i18n.h"
using namespace std;
using namespace PBD;
using namespace std;
using namespace PBD;
@@
-41,13
+41,7
@@
ElementImporter::ElementImporter (XMLTree const & source, ARDOUR::Session & sess
_queued (false),
_broken (false)
{
_queued (false),
_broken (false)
{
- // Get samplerate
- XMLProperty *prop;
- prop = source.root()->property ("sample-rate");
- if (prop) {
- std::istringstream iss (prop->value());
- iss >> sample_rate;
- }
+ source.root()->get_property ("sample-rate", sample_rate);
}
ElementImporter::~ElementImporter ()
}
ElementImporter::~ElementImporter ()
@@
-95,19
+89,19
@@
ElementImporter::timecode_to_string(Timecode::Time & time) const
return oss.str();
}
return oss.str();
}
-
fram
ecnt_t
-ElementImporter::rate_convert_samples (
fram
ecnt_t samples) const
+
sampl
ecnt_t
+ElementImporter::rate_convert_samples (
sampl
ecnt_t samples) const
{
{
- if (sample_rate == session.
fram
e_rate()) {
+ if (sample_rate == session.
sampl
e_rate()) {
return samples;
}
// +0.5 for proper rounding
return samples;
}
// +0.5 for proper rounding
- return static_cast<
framecnt_t> (samples * (static_cast<double> (session.nominal_fram
e_rate()) / sample_rate) + 0.5);
+ return static_cast<
samplecnt_t> (samples * (static_cast<double> (session.nominal_sampl
e_rate()) / sample_rate) + 0.5);
}
string
ElementImporter::rate_convert_samples (string const & samples) const
{
}
string
ElementImporter::rate_convert_samples (string const & samples) const
{
- return to_string (rate_convert_samples (
atoi (samples)), std::dec
);
+ return to_string (rate_convert_samples (
string_to<uint32_t>(samples))
);
}
}