projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use make_shared<>.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder.cc
diff --git
a/src/lib/audio_decoder.cc
b/src/lib/audio_decoder.cc
index 7ceb9680bf95b3be487ed6d3dd42e7ce4ece58b3..fa9fe9711f2cf91692b1d3d140b7a799900240ed 100644
(file)
--- a/
src/lib/audio_decoder.cc
+++ b/
src/lib/audio_decoder.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-22,6
+23,7
@@
#include "audio_decoder_stream.h"
#include "audio_content.h"
#include <boost/foreach.hpp>
#include "audio_decoder_stream.h"
#include "audio_content.h"
#include <boost/foreach.hpp>
+#include <boost/make_shared.hpp>
#include <iostream>
#include "i18n.h"
#include <iostream>
#include "i18n.h"
@@
-29,27
+31,27
@@
using std::cout;
using std::map;
using boost::shared_ptr;
using std::cout;
using std::map;
using boost::shared_ptr;
+using boost::make_shared;
AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast, shared_ptr<Log> log)
AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast, shared_ptr<Log> log)
- : _audio_content (content)
- , _ignore_audio (false)
+ : _ignore (false)
, _fast (fast)
{
BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
, _fast (fast)
{
BOOST_FOREACH (AudioStreamPtr i, content->streams ()) {
- _streams[i] =
shared_ptr<AudioDecoderStream> (new AudioDecoderStream (_audio_content, i, parent, log)
);
+ _streams[i] =
make_shared<AudioDecoderStream> (content, i, parent, fast, log
);
}
}
ContentAudio
}
}
ContentAudio
-AudioDecoder::get
_audio
(AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
+AudioDecoder::get (AudioStreamPtr stream, Frame frame, Frame length, bool accurate)
{
return _streams[stream]->get (frame, length, accurate);
}
void
{
return _streams[stream]->get (frame, length, accurate);
}
void
-AudioDecoder::
audio
(AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
+AudioDecoder::
give
(AudioStreamPtr stream, shared_ptr<const AudioBuffers> data, ContentTime time)
{
{
- if (_ignore
_audio
) {
+ if (_ignore) {
return;
}
return;
}
@@
-95,9
+97,9
@@
AudioDecoder::seek (ContentTime t, bool accurate)
}
}
}
}
-/** Set this
player never to produce any audio
data */
+/** Set this
decoder never to produce any
data */
void
void
-AudioDecoder::set_ignore
_audio
()
+AudioDecoder::set_ignore ()
{
{
- _ignore
_audio
= true;
+ _ignore = true;
}
}