summaryrefslogtreecommitdiff
path: root/src/lib/player.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-06-22 01:47:28 +0100
committerCarl Hetherington <cth@carlh.net>2016-06-22 01:47:28 +0100
commit76f83b97c401c24b3c93baee0665e84be05f43ea (patch)
tree75e7f3e87f3721c8ac4c55ac6bc9559556954987 /src/lib/player.cc
parent5e9e59e044fe3b51352d5dccad7f11882c6a571c (diff)
Set AudioDecoder::fast a different way.
Diffstat (limited to 'src/lib/player.cc')
-rw-r--r--src/lib/player.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/player.cc b/src/lib/player.cc
index 30313d39d..ba678dfeb 100644
--- a/src/lib/player.cc
+++ b/src/lib/player.cc
@@ -123,7 +123,7 @@ Player::setup_pieces ()
continue;
}
- shared_ptr<Decoder> decoder = decoder_factory (i, _film->log(), _fast);
+ shared_ptr<Decoder> decoder = decoder_factory (i, _film->log());
FrameRateChange frc (i->active_video_frame_rate(), _film->video_frame_rate());
if (!decoder) {
@@ -139,6 +139,10 @@ Player::setup_pieces ()
decoder->audio->set_ignore ();
}
+ if (decoder->audio && _fast) {
+ decoder->audio->set_fast ();
+ }
+
_pieces.push_back (shared_ptr<Piece> (new Piece (i, decoder, frc)));
}
@@ -706,7 +710,7 @@ Player::get_reel_assets ()
scoped_ptr<DCPDecoder> decoder;
try {
- decoder.reset (new DCPDecoder (j, _film->log(), false));
+ decoder.reset (new DCPDecoder (j, _film->log()));
} catch (...) {
return a;
}