diff options
| -rw-r--r-- | platform/osx/make_dmg.sh | 1 | ||||
| -rw-r--r-- | src/lib/encode_server.h | 4 | ||||
| -rw-r--r-- | src/lib/hints.h | 4 | ||||
| -rw-r--r-- | src/lib/job.h | 4 | ||||
| -rw-r--r-- | src/lib/player.h | 22 | ||||
| -rw-r--r-- | src/wx/gl_video_view.h | 10 |
6 files changed, 22 insertions, 23 deletions
diff --git a/platform/osx/make_dmg.sh b/platform/osx/make_dmg.sh index 5509af505..fb20ad864 100644 --- a/platform/osx/make_dmg.sh +++ b/platform/osx/make_dmg.sh @@ -172,7 +172,6 @@ function copy_libs { copy_lib_root libleqm_nrt "$dest" copy $ROOT src/$SOURCE_NAME/build/src/lib/libdcpomatic2.dylib "$dest" copy $ROOT src/$SOURCE_NAME/build/src/wx/libdcpomatic2-wx.dylib "$dest" - copy_lib_env libboost_atomic "$dest" copy_lib_env libboost_system "$dest" copy_lib_env libboost_filesystem "$dest" copy_lib_env libboost_thread "$dest" diff --git a/src/lib/encode_server.h b/src/lib/encode_server.h index 276212583..ea769d4fe 100644 --- a/src/lib/encode_server.h +++ b/src/lib/encode_server.h @@ -32,9 +32,9 @@ #include "exception_store.h" #include "server.h" #include <boost/asio.hpp> -#include <boost/atomic.hpp> #include <boost/thread.hpp> #include <boost/thread/condition.hpp> +#include <atomic> #include <string> @@ -72,7 +72,7 @@ private: bool _verbose; int _num_threads; Waker _waker; - boost::atomic<int> _frames_encoded; + std::atomic<int> _frames_encoded; struct Broadcast { diff --git a/src/lib/hints.h b/src/lib/hints.h index b17da2c99..78cc615d3 100644 --- a/src/lib/hints.h +++ b/src/lib/hints.h @@ -26,8 +26,8 @@ #include "signaller.h" #include "text_type.h" #include "weak_film.h" -#include <boost/atomic.hpp> #include <boost/signals2.hpp> +#include <atomic> #include <string> #include <vector> @@ -111,7 +111,7 @@ private: bool _very_long_subtitle = false; boost::optional<dcpomatic::DCPTimePeriod> _last_subtitle; - boost::atomic<bool> _stop; + std::atomic<bool> _stop; bool _disable_audio_analysis = false; }; diff --git a/src/lib/job.h b/src/lib/job.h index f435d815a..34f7b0526 100644 --- a/src/lib/job.h +++ b/src/lib/job.h @@ -30,12 +30,12 @@ #include "signaller.h" #include <dcp/warnings.h> -#include <boost/atomic.hpp> LIBDCP_DISABLE_WARNINGS #include <boost/signals2.hpp> LIBDCP_ENABLE_WARNINGS #include <boost/thread.hpp> #include <boost/thread/mutex.hpp> +#include <atomic> #include <string> @@ -174,7 +174,7 @@ private: /** true to limit emissions of the progress signal so that they don't * come too often. */ - boost::atomic<bool> _rate_limit_progress; + std::atomic<bool> _rate_limit_progress; /** condition to signal changes to pause/resume so that we know when to wake; this could be a general _state_change if it made more sense. diff --git a/src/lib/player.h b/src/lib/player.h index 4a1cf5f55..df5db28f0 100644 --- a/src/lib/player.h +++ b/src/lib/player.h @@ -39,7 +39,7 @@ #include "player_text.h" #include "position_image.h" #include "shuffler.h" -#include <boost/atomic.hpp> +#include <atomic> #include <list> @@ -192,36 +192,36 @@ private: std::shared_ptr<const Playlist> _playlist; /** > 0 if we are suspended (i.e. pass() and seek() do nothing) */ - boost::atomic<int> _suspended; + std::atomic<int> _suspended; std::vector<std::shared_ptr<Piece>> _pieces; /** Size of the image we are rendering to; this may be the DCP frame size, or * the size of preview in a window. */ - boost::atomic<dcp::Size> _video_container_size; + std::atomic<dcp::Size> _video_container_size; mutable boost::mutex _black_image_mutex; std::shared_ptr<Image> _black_image; /** true if the player should ignore all video; i.e. never produce any */ - boost::atomic<bool> _ignore_video; - boost::atomic<bool> _ignore_audio; + std::atomic<bool> _ignore_video; + std::atomic<bool> _ignore_audio; /** true if the player should ignore all text; i.e. never produce any */ - boost::atomic<bool> _ignore_text; - boost::atomic<bool> _always_burn_open_subtitles; + std::atomic<bool> _ignore_text; + std::atomic<bool> _always_burn_open_subtitles; /** true if we should try to be fast rather than high quality */ - boost::atomic<bool> _fast; + std::atomic<bool> _fast; /** true if we should keep going in the face of `survivable' errors */ bool _tolerant; /** true if we should `play' (i.e output) referenced DCP data (e.g. for preview) */ - boost::atomic<bool> _play_referenced; + std::atomic<bool> _play_referenced; /** Time of the next video that we will emit, or the time of the last accurate seek */ boost::optional<dcpomatic::DCPTime> _next_video_time; /** Time of the next audio that we will emit, or the time of the last accurate seek */ boost::optional<dcpomatic::DCPTime> _next_audio_time; - boost::atomic<boost::optional<int>> _dcp_decode_reduction; + std::atomic<boost::optional<int>> _dcp_decode_reduction; EnumIndexedVector<std::pair<std::shared_ptr<PlayerVideo>, dcpomatic::DCPTime>, Eyes> _last_video; @@ -250,7 +250,7 @@ private: std::shared_ptr<AudioProcessor> _audio_processor; bool _disable_audio_processor = false; - boost::atomic<dcpomatic::DCPTime> _playback_length; + std::atomic<dcpomatic::DCPTime> _playback_length; /** Alignment for subtitle images that we create */ Image::Alignment _subtitle_alignment = Image::Alignment::PADDED; diff --git a/src/wx/gl_video_view.h b/src/wx/gl_video_view.h index 35f4aeeda..fc40cee33 100644 --- a/src/wx/gl_video_view.h +++ b/src/wx/gl_video_view.h @@ -45,9 +45,9 @@ LIBDCP_ENABLE_WARNINGS #include "lib/signaller.h" #include "lib/position.h" #include <dcp/util.h> -#include <boost/atomic.hpp> #include <boost/thread.hpp> #include <boost/thread/condition.hpp> +#include <atomic> class Texture @@ -146,8 +146,8 @@ private: Last<Crop> _last_crop; Last<boost::optional<dcpomatic::Rect<float>>> _last_crop_guess; - boost::atomic<wxSize> _canvas_size; - boost::atomic<bool> _rec2020; + std::atomic<wxSize> _canvas_size; + std::atomic<bool> _rec2020; std::vector<std::unique_ptr<Texture>> _video_textures; std::unique_ptr<Texture> _subtitle_texture; bool _have_subtitle_to_render = false; @@ -156,8 +156,8 @@ private: boost::mutex _playing_mutex; boost::condition _thread_work_condition; - boost::atomic<bool> _playing; - boost::atomic<Request> _pending_request; + std::atomic<bool> _playing; + std::atomic<Request> _pending_request; GLuint _vao; dcpomatic::gl::Uniform1i _fragment_type; |