projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
lib
/
resampler.cc
diff --git
a/src/lib/resampler.cc
b/src/lib/resampler.cc
index 553180f0832c7a26852b2354bec045b1263faa01..60eb7f5052a3e5ca4e47a14f850a83f762f75a05 100644
(file)
--- a/
src/lib/resampler.cc
+++ b/
src/lib/resampler.cc
@@
-33,7
+33,7
@@
using std::cout;
using std::pair;
using std::make_pair;
using std::runtime_error;
using std::pair;
using std::make_pair;
using std::runtime_error;
-using
boost
::shared_ptr;
+using
std
::shared_ptr;
/** @param in Input sampling rate (Hz)
* @param out Output sampling rate (Hz)
/** @param in Input sampling rate (Hz)
* @param out Output sampling rate (Hz)
@@
-53,13
+53,17
@@
Resampler::Resampler (int in, int out, int channels)
Resampler::~Resampler ()
{
Resampler::~Resampler ()
{
- src_delete (_src);
+ if (_src) {
+ src_delete (_src);
+ }
}
void
Resampler::set_fast ()
{
src_delete (_src);
}
void
Resampler::set_fast ()
{
src_delete (_src);
+ _src = 0;
+
int error;
_src = src_new (SRC_LINEAR, _channels, &error);
if (!_src) {
int error;
_src = src_new (SRC_LINEAR, _channels, &error);
if (!_src) {