dcpomatic/src/lib/dcpomatic_time.h, branch v2.11.2 DCP-o-matic DCP tools https://git.carlh.net/cgit/dcpomatic/atom?h=v2.11.2 2017-04-19T22:04:32Z Various Doxygen fixes. 2017-04-19T22:04:32Z Carl Hetherington cth@carlh.net 2017-03-02T15:37:13Z urn:sha1:67a68bd971ebe1b35daa3f75873b4ccb53c00ba0 Fix merging of audio in various circumstances. 2017-04-19T22:04:32Z Carl Hetherington cth@carlh.net 2017-02-26T01:40:30Z urn:sha1:58dce923b9d438a27ce1cd7e3125370f74d46e3a Attempt to tidy up internal APIs slightly. 2017-04-19T22:04:32Z Carl Hetherington cth@carlh.net 2016-11-28T23:45:34Z urn:sha1:a78b741c43830c84bcb4d18e3147746f13a668e5 Fix non-frame-aligned trims when using trim-to-playhead. 2017-01-04T21:41:07Z Carl Hetherington cth@carlh.net 2017-01-04T21:41:07Z urn:sha1:736f9d8154080ea5837b31af623ef863eea1a7c5 Reimplement Time::ceil and add a corresponding Time::floor with tests. ceil returns slightly different results to previously with non-integer frame rates. Then use floor to round the playhead position when trimming. Rename Time::round_up to Time::ceil. 2017-01-04T01:28:54Z Carl Hetherington cth@carlh.net 2017-01-04T01:28:54Z urn:sha1:11ac33e140f3aa9d6e992880a1e1b3a4ca649355 Merge identical time periods returned from text_subtitles_during 2016-10-23T22:27:49Z Carl Hetherington cth@carlh.net 2016-10-23T22:27:49Z urn:sha1:2603c3c5d94ce5e300337d71eeabb56ff3f55fc4 to stop multiple copies of subtitles being returned from the decoder. Fix overlapping burnt-in subtitles in some cases (#959). 2016-10-07T23:45:22Z Carl Hetherington cth@carlh.net 2016-10-07T23:45:22Z urn:sha1:37494990bbe81f41f581de8258dc7353b82d662d Firstly, when finding subtitles that exist during a period, only return those which overlap more than half the period. This means that, in a fight over a frame, the longest-running subtitle in that frame will win. Secondly, make SubtitleDecoder::get pick the wanted subtitles from the cache simply by comparing their periods to those that were requested. I think this is nicer than what was there before (basically reevaulating 'what subtitle(s) for this period') and also makes the first part of this commit effective. Missing include. 2016-08-12T09:58:25Z Carl Hetherington cth@carlh.net 2016-08-12T09:58:25Z urn:sha1:5a83297c4d78a8bc130cea5a05ef3a73cd0e39d8 Remove all use of stringstream in an attempt to fix 2016-08-12T08:13:51Z Carl Hetherington cth@carlh.net 2016-08-10T15:38:33Z urn:sha1:b1dc9c3a2f7e55c9afc5bf2d5b465371b048e14f the suspected thread-unsafe crash bugs on OS X. Allow configuration of MXF/XML filenames (part of #710). 2016-07-31T22:52:02Z Carl Hetherington cth@carlh.net 2016-07-31T22:52:02Z urn:sha1:9c01623c3038b978ba732de2ad147d29fad60afe