X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fplayer_video.h;h=77e19a80e7c911057aa1bd29897a763fc99b93e1;hp=0dcc2eeec422295e1bd5e2c8ac108a90ea99c68e;hb=aeb835a18c8df347e0ed68fb24631b320abeb611;hpb=89ee4cc6019036fa4fc0a6e07e052ffdc3b136ac diff --git a/src/lib/player_video.h b/src/lib/player_video.h index 0dcc2eeec..77e19a80e 100644 --- a/src/lib/player_video.h +++ b/src/lib/player_video.h @@ -19,8 +19,10 @@ #include "types.h" #include "position.h" +#include "dcpomatic_time.h" #include "colour_conversion.h" #include "position_image.h" +#include "data.h" extern "C" { #include } @@ -29,7 +31,6 @@ extern "C" { class Image; class ImageProxy; class Socket; -class Data; /** Everything needed to describe a video frame coming out of the player, but with the * bits still their raw form. We may want to combine the bits on a remote machine, @@ -42,7 +43,7 @@ public: boost::shared_ptr, DCPTime, Crop, - boost::optional, + boost::optional, dcp::Size, dcp::Size, Eyes, @@ -88,7 +89,7 @@ private: boost::shared_ptr _in; DCPTime _time; Crop _crop; - boost::optional _fade; + boost::optional _fade; dcp::Size _inter_size; dcp::Size _out_size; Eyes _eyes;