#include <dcp/stereo_picture_asset_reader.h>
#include <dcp/exceptions.h>
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
using namespace dcpomatic;
mono.reset (new dcp::MonoPictureAsset (_content->path(0)));
} catch (dcp::MXFFileError& e) {
/* maybe it's stereo */
- } catch (dcp::DCPReadError& e) {
+ } catch (dcp::ReadError& e) {
/* maybe it's stereo */
}
if (!mono) {
throw;
}
- } catch (dcp::DCPReadError& e) {
+ } catch (dcp::ReadError& e) {
if (!mono) {
throw;
}
double const vfr = _content->active_video_frame_rate (film());
int64_t const frame = _next.frames_round (vfr);
-
if (frame >= _content->video->length()) {
return true;
}
video->emit (
film(),
shared_ptr<ImageProxy> (
- new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_LEFT, AV_PIX_FMT_XYZ12LE, optional<int>())
+ new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::Eye::LEFT, AV_PIX_FMT_XYZ12LE, optional<int>())
),
frame
);
video->emit (
film(),
shared_ptr<ImageProxy> (
- new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::EYE_RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>())
+ new J2KImageProxy (_stereo_reader->get_frame(frame), _size, dcp::Eye::RIGHT, AV_PIX_FMT_XYZ12LE, optional<int>())
),
frame
);