#include "butler.h"
-#include "player.h"
-#include "util.h"
-#include "log.h"
-#include "dcpomatic_log.h"
-#include "cross.h"
#include "compose.hpp"
+#include "cross.h"
+#include "dcpomatic_log.h"
#include "exceptions.h"
+#include "log.h"
+#include "player.h"
+#include "util.h"
#include "video_content.h"
using std::cout;
-using std::pair;
+using std::function;
using std::make_pair;
+using std::pair;
+using std::shared_ptr;
using std::string;
using std::weak_ptr;
-using std::shared_ptr;
using boost::bind;
using boost::optional;
-using std::function;
using namespace dcpomatic;
#if BOOST_VERSION >= 106100
using namespace boost::placeholders;
VideoRange video_range,
Image::Alignment alignment,
bool fast,
- bool prepare_only_proxy
+ bool prepare_only_proxy,
+ Audio audio
)
: _film (film)
, _player (player)
, _stop_thread (false)
, _audio_mapping (audio_mapping)
, _audio_channels (audio_channels)
- , _disable_audio (false)
+ , _disable_audio (audio == Audio::DISABLED)
, _pixel_format (pixel_format)
, _video_range (video_range)
, _alignment (alignment)
}
-void
-Butler::disable_audio ()
-{
- boost::mutex::scoped_lock lm (_mutex);
- _disable_audio = true;
-}
-
-
pair<size_t, string>
Butler::memory_used () const
{