projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Coalesce short reels.
[dcpomatic.git]
/
src
/
lib
/
audio_decoder.cc
diff --git
a/src/lib/audio_decoder.cc
b/src/lib/audio_decoder.cc
index 440510ce562c9dbb13304a75f5f3a24e6f471eb2..a5e86f22b8e352d529fa39e69149ad10cca9fec4 100644
(file)
--- a/
src/lib/audio_decoder.cc
+++ b/
src/lib/audio_decoder.cc
@@
-35,6
+35,7
@@
using std::map;
using std::pair;
using boost::shared_ptr;
using boost::optional;
using std::pair;
using boost::shared_ptr;
using boost::optional;
+using namespace dcpomatic;
AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast)
: DecoderPart (parent)
AudioDecoder::AudioDecoder (Decoder* parent, shared_ptr<const AudioContent> content, bool fast)
: DecoderPart (parent)
@@
-110,7
+111,7
@@
AudioDecoder::stream_position (shared_ptr<const Film> film, AudioStreamPtr strea
return ContentTime::from_frames (i->second, _content->resampled_frame_rate(film));
}
return ContentTime::from_frames (i->second, _content->resampled_frame_rate(film));
}
-ContentTime
+boost::optional<ContentTime>
AudioDecoder::position (shared_ptr<const Film> film) const
{
optional<ContentTime> p;
AudioDecoder::position (shared_ptr<const Film> film) const
{
optional<ContentTime> p;
@@
-121,7
+122,7
@@
AudioDecoder::position (shared_ptr<const Film> film) const
}
}
}
}
- return p
.get_value_or(ContentTime())
;
+ return p;
}
void
}
void