dcpomatic/src/lib/transcode_job.cc, branch v2.1.4 DCP-o-matic DCP tools https://git.carlh.net/cgit/dcpomatic/atom?h=v2.1.4 2015-03-24T23:57:22Z Hand-apply e30fd8d; resurrect JSON server code. 2015-03-24T23:57:22Z Carl Hetherington cth@carlh.net 2015-03-24T23:57:22Z urn:sha1:a71a3b3d0f8545e44af75ded10dfda4a382158f2 Fix error reporting by transcode job; no need to set job state inside TranscodeJob as Job does it. 2015-01-05T09:56:16Z Carl Hetherington cth@carlh.net 2015-01-05T09:56:16Z urn:sha1:e0716fe268bea8a97dea440291dbf712e4a8539e Hand apply 7e5cb78c7e14aac65d1e8a4df301cfac8cf20b2c from master; 2014-11-24T12:05:01Z Carl Hetherington cth@carlh.net 2014-11-24T12:05:01Z urn:sha1:ee63091f695dfe4e5a1bf8e30a1e828b8dd6940d fix markup of TRANSLATORS comments. Shrink progress text so that it fits better on 4:3 screens. 2014-11-07T09:44:20Z Carl Hetherington cth@carlh.net 2014-11-07T09:44:20Z urn:sha1:1d45262d8e0e77b6f9c874c11858cbbd530c5dc5 Merge master. 2014-08-23T21:50:40Z Carl Hetherington cth@carlh.net 2014-08-23T21:50:40Z urn:sha1:8c7a308c03e4b4196b4e2379a26d432b100ae2b1 Use SafeStringStream instead of std::stringstream to try to fix random crashes on OS X. 2014-08-19T20:01:28Z Carl Hetherington cth@carlh.net 2014-08-19T20:01:28Z urn:sha1:9a2b45caa81d8fb056802dfe3c25f214e808ffdf Merge master. 2014-08-11T21:39:20Z Carl Hetherington cth@carlh.net 2014-08-11T21:39:20Z urn:sha1:cc27c2716f755305d67f1e1ba828ecf37f8405dd Remove some left-over JSON bits. 2014-08-11T18:53:20Z Carl Hetherington cth@carlh.net 2014-08-11T18:53:20Z urn:sha1:491daf8790f35611052d8954d5d74df275dcda18 Merge master. 2014-06-02T11:06:20Z Carl Hetherington cth@carlh.net 2014-06-02T11:06:20Z urn:sha1:3574212ee42b2bd924eb95d5c0f4f69ec9e0a2f0 Try to fix clashes caused by ERROR, WARNING etc. as variables. 2014-05-21T21:34:49Z Carl Hetherington cth@carlh.net 2014-05-21T21:34:49Z urn:sha1:2935d9d158cf35496a35107f9c4ab7d2929cf6c3