diff options
| author | Carl Hetherington <cth@carlh.net> | 2021-11-07 03:03:29 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2021-11-22 23:59:43 +0100 |
| commit | 0254f2d12acb2ff8d770b4e47dc15599d145fe17 (patch) | |
| tree | f7240c24914ce89920f5f36636f2d771a417798c /src/lib/player.h | |
| parent | 0060e0f1969823e4329b15a92e130c8790a2e9d5 (diff) | |
Put Image into the dcpomatic namespace.
Diffstat (limited to 'src/lib/player.h')
| -rw-r--r-- | src/lib/player.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/lib/player.h b/src/lib/player.h index 14fb8d0ee..20a97c896 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -77,7 +77,7 @@ public: class Player : public std::enable_shared_from_this<Player> { public: - Player (std::shared_ptr<const Film>, Image::Alignment subtitle_alignment); + Player (std::shared_ptr<const Film>, dcpomatic::Image::Alignment subtitle_alignment); Player (std::shared_ptr<const Film>, std::shared_ptr<const Playlist> playlist); Player (Player const& Player) = delete; @@ -180,7 +180,7 @@ private: * the size of preview in a window. */ dcp::Size _video_container_size; - std::shared_ptr<Image> _black_image; + std::shared_ptr<dcpomatic::Image> _black_image; /** true if the player should ignore all video; i.e. never produce any */ bool _ignore_video = false; @@ -234,7 +234,7 @@ private: dcpomatic::DCPTime _playback_length; /** Alignment for subtitle images that we create */ - Image::Alignment _subtitle_alignment = Image::Alignment::PADDED; + dcpomatic::Image::Alignment _subtitle_alignment = dcpomatic::Image::Alignment::PADDED; boost::signals2::scoped_connection _film_changed_connection; boost::signals2::scoped_connection _playlist_change_connection; |