projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
dec38a4
)
macOS / new boost build fixes.
v2.15.104
author
Carl Hetherington
<cth@carlh.net>
Wed, 21 Oct 2020 07:23:12 +0000
(09:23 +0200)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 21 Oct 2020 20:22:18 +0000
(22:22 +0200)
30 files changed:
src/lib/analyse_subtitles_job.cc
patch
|
blob
|
history
src/lib/dcp_content.cc
patch
|
blob
|
history
src/lib/dcp_encoder.cc
patch
|
blob
|
history
src/lib/film.cc
patch
|
blob
|
history
src/lib/player.cc
patch
|
blob
|
history
src/lib/reel_writer.cc
patch
|
blob
|
history
src/lib/writer.cc
patch
|
blob
|
history
src/tools/dcpomatic_combiner.cc
patch
|
blob
|
history
src/tools/dcpomatic_disk.cc
patch
|
blob
|
history
src/tools/dcpomatic_kdm.cc
patch
|
blob
|
history
src/tools/dcpomatic_kdm_cli.cc
patch
|
blob
|
history
src/tools/dcpomatic_player.cc
patch
|
blob
|
history
src/tools/swaroop_dcpomatic_playlist.cc
patch
|
blob
|
history
src/wx/audio_plot.cc
patch
|
blob
|
history
src/wx/closed_captions_dialog.cc
patch
|
blob
|
history
src/wx/content_advanced_dialog.cc
patch
|
blob
|
history
src/wx/content_menu.cc
patch
|
blob
|
history
src/wx/controls.cc
patch
|
blob
|
history
src/wx/dkdm_dialog.cc
patch
|
blob
|
history
src/wx/gl_video_view.cc
patch
|
blob
|
history
src/wx/i18n_hook.cc
patch
|
blob
|
history
src/wx/interop_metadata_dialog.cc
patch
|
blob
|
history
src/wx/kdm_output_panel.cc
patch
|
blob
|
history
src/wx/language_tag_dialog.cc
patch
|
blob
|
history
src/wx/player_config_dialog.cc
patch
|
blob
|
history
src/wx/recipient_dialog.cc
patch
|
blob
|
history
src/wx/simple_video_view.cc
patch
|
blob
|
history
src/wx/smpte_metadata_dialog.cc
patch
|
blob
|
history
src/wx/video_waveform_dialog.cc
patch
|
blob
|
history
src/wx/video_waveform_plot.cc
patch
|
blob
|
history
diff --git
a/src/lib/analyse_subtitles_job.cc
b/src/lib/analyse_subtitles_job.cc
index 7a1c4ab00ff751572832a74475d0a9d1ec14e9a4..92fb9657c143019486a6ff22b992926ca56f3570 100644
(file)
--- a/
src/lib/analyse_subtitles_job.cc
+++ b/
src/lib/analyse_subtitles_job.cc
@@
-33,6
+33,9
@@
using std::string;
using boost::shared_ptr;
using boost::weak_ptr;
using std::string;
using boost::shared_ptr;
using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
AnalyseSubtitlesJob::AnalyseSubtitlesJob (shared_ptr<const Film> film, shared_ptr<Content> content)
: Job (film)
AnalyseSubtitlesJob::AnalyseSubtitlesJob (shared_ptr<const Film> film, shared_ptr<Content> content)
: Job (film)
diff --git
a/src/lib/dcp_content.cc
b/src/lib/dcp_content.cc
index f507784208444f4c152253aa1909769a708ad32e..b4ee1444c95a51f5e9597b99b83a2dff43939e3a 100644
(file)
--- a/
src/lib/dcp_content.cc
+++ b/
src/lib/dcp_content.cc
@@
-56,6
+56,9
@@
using boost::scoped_ptr;
using boost::optional;
using boost::function;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::function;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::raw_convert;
using namespace dcpomatic;
using dcp::raw_convert;
using namespace dcpomatic;
diff --git
a/src/lib/dcp_encoder.cc
b/src/lib/dcp_encoder.cc
index 438a73fd64d4b95ea93facb66091a2f7d0b84d30..345e5511c41bc6ec73ec0b484c941596525c3bb4 100644
(file)
--- a/
src/lib/dcp_encoder.cc
+++ b/
src/lib/dcp_encoder.cc
@@
-50,6
+50,9
@@
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
/** Construct a DCP encoder.
using namespace dcpomatic;
/** Construct a DCP encoder.
diff --git
a/src/lib/film.cc
b/src/lib/film.cc
index e2e77cce2b757ea2be3514186be7321ebb009088..87037f51fb97169a6293e302d262e6aadc19e136 100644
(file)
--- a/
src/lib/film.cc
+++ b/
src/lib/film.cc
@@
-102,6
+102,9
@@
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::is_any_of;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::is_any_of;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::raw_convert;
using namespace dcpomatic;
using dcp::raw_convert;
using namespace dcpomatic;
diff --git
a/src/lib/player.cc
b/src/lib/player.cc
index 57fc7a67c6bdeab59cc591a9c316ce655b3494fc..4417c940d5671efaee74f4f24e68af615984b497 100644
(file)
--- a/
src/lib/player.cc
+++ b/
src/lib/player.cc
@@
-78,6
+78,9
@@
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::scoped_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::scoped_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
int const PlayerProperty::VIDEO_CONTAINER_SIZE = 700;
using namespace dcpomatic;
int const PlayerProperty::VIDEO_CONTAINER_SIZE = 700;
diff --git
a/src/lib/reel_writer.cc
b/src/lib/reel_writer.cc
index 9272bfa30fedea9608826c03335828cf31109fde..a42c6182ab5fc37bf758a5c014a145a7def45060 100644
(file)
--- a/
src/lib/reel_writer.cc
+++ b/
src/lib/reel_writer.cc
@@
-64,6
+64,9
@@
using std::vector;
using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
using boost::optional;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::Data;
using dcp::raw_convert;
using namespace dcpomatic;
using dcp::Data;
using dcp::raw_convert;
using namespace dcpomatic;
diff --git
a/src/lib/writer.cc
b/src/lib/writer.cc
index e2054dc03921f20dd8fef146fab4f0d455b8bc54..d3fdc5128611a2e6c5436ae8c6147be61c07034e 100644
(file)
--- a/
src/lib/writer.cc
+++ b/
src/lib/writer.cc
@@
-62,6
+62,9
@@
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::Data;
using namespace dcpomatic;
using dcp::Data;
using namespace dcpomatic;
diff --git
a/src/tools/dcpomatic_combiner.cc
b/src/tools/dcpomatic_combiner.cc
index 5f1a7722a7ebd7fab5f93a9922ea1f18d10760a4..d55df303f0e370d03482b9b8693467022a8d0020 100644
(file)
--- a/
src/tools/dcpomatic_combiner.cc
+++ b/
src/tools/dcpomatic_combiner.cc
@@
-43,6
+43,9
@@
using std::vector;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
static string
static string
diff --git
a/src/tools/dcpomatic_disk.cc
b/src/tools/dcpomatic_disk.cc
index 7bea4d8e911693f81a4288657e87328133b1a484..92429aa53238c43a75a57bae33328750c895696a 100644
(file)
--- a/
src/tools/dcpomatic_disk.cc
+++ b/
src/tools/dcpomatic_disk.cc
@@
-53,6
+53,10
@@
using std::cout;
using std::cerr;
using boost::shared_ptr;
using boost::optional;
using std::cerr;
using boost::shared_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
class DOMFrame : public wxFrame
{
class DOMFrame : public wxFrame
{
diff --git
a/src/tools/dcpomatic_kdm.cc
b/src/tools/dcpomatic_kdm.cc
index 1d623abcd9222ad195185e83718591795b738120..cc070b45467f8bc9c34f8d7494d92a280364cb7e 100644
(file)
--- a/
src/tools/dcpomatic_kdm.cc
+++ b/
src/tools/dcpomatic_kdm.cc
@@
-79,6
+79,9
@@
using boost::bind;
using boost::optional;
using boost::ref;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::ref;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
enum {
using namespace dcpomatic;
enum {
diff --git
a/src/tools/dcpomatic_kdm_cli.cc
b/src/tools/dcpomatic_kdm_cli.cc
index adb14f49e8bb588938f0a5d52c35cd659367346b..b9f73d357e8f38b0fdb72f865d380c3c05b8f049 100644
(file)
--- a/
src/tools/dcpomatic_kdm_cli.cc
+++ b/
src/tools/dcpomatic_kdm_cli.cc
@@
-46,8
+46,12
@@
using boost::shared_ptr;
using boost::optional;
using boost::bind;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::bind;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
using namespace dcpomatic;
+
static void
help ()
{
static void
help ()
{
diff --git
a/src/tools/dcpomatic_player.cc
b/src/tools/dcpomatic_player.cc
index 9b88ee2c3663297af31c94b0a5be4a17bf4d8c37..a82e67b88d7d6c09d2340c31571a9aa376aee116 100644
(file)
--- a/
src/tools/dcpomatic_player.cc
+++ b/
src/tools/dcpomatic_player.cc
@@
-95,6
+95,9
@@
using boost::optional;
using boost::dynamic_pointer_cast;
using boost::thread;
using boost::bind;
using boost::dynamic_pointer_cast;
using boost::thread;
using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::raw_convert;
using namespace dcpomatic;
using dcp::raw_convert;
using namespace dcpomatic;
diff --git
a/src/tools/swaroop_dcpomatic_playlist.cc
b/src/tools/swaroop_dcpomatic_playlist.cc
index a15a7c6bdeb85ec4b7c0d225fbd91712114a99a2..e22961240a67086773558725a97586e947aef6a1 100644
(file)
--- a/
src/tools/swaroop_dcpomatic_playlist.cc
+++ b/
src/tools/swaroop_dcpomatic_playlist.cc
@@
-45,6
+45,10
@@
using boost::shared_ptr;
using boost::weak_ptr;
using boost::bind;
using boost::dynamic_pointer_cast;
using boost::weak_ptr;
using boost::bind;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
class ContentDialog : public wxDialog, public ContentStore
{
class ContentDialog : public wxDialog, public ContentStore
{
diff --git
a/src/wx/audio_plot.cc
b/src/wx/audio_plot.cc
index b8b14b2e699762ac0a061b8dbcd9474bfbe8c075..35f2c93add67a64bd040aa744a4a73d8e8ec2f85 100644
(file)
--- a/
src/wx/audio_plot.cc
+++ b/
src/wx/audio_plot.cc
@@
-39,6
+39,9
@@
using boost::bind;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
int const AudioPlot::_minimum = -70;
using namespace dcpomatic;
int const AudioPlot::_minimum = -70;
diff --git
a/src/wx/closed_captions_dialog.cc
b/src/wx/closed_captions_dialog.cc
index 666547d16b5f00dad69aa65180566e67eb96d98d..5522e5c4cfb35df9142fad3b23ab42d7798030c9 100644
(file)
--- a/
src/wx/closed_captions_dialog.cc
+++ b/
src/wx/closed_captions_dialog.cc
@@
-35,6
+35,9
@@
using std::make_pair;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
using namespace dcpomatic;
ClosedCaptionsDialog::ClosedCaptionsDialog (wxWindow* parent, FilmViewer* viewer)
diff --git
a/src/wx/content_advanced_dialog.cc
b/src/wx/content_advanced_dialog.cc
index 79e6da9fad76957bd9ba7bbd870aeb8e4e86c958..8ab2e8dc07e20353fb92b336d89b7b6d950f0498 100644
(file)
--- a/
src/wx/content_advanced_dialog.cc
+++ b/
src/wx/content_advanced_dialog.cc
@@
-37,6
+37,9
@@
using std::vector;
using boost::bind;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
using boost::bind;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
diff --git
a/src/wx/content_menu.cc
b/src/wx/content_menu.cc
index d3115ce490f5598dbfe46d3ae2f05eb32e9e1cb7..3c3b1ed3ada6496385e524da5f0689b94d1a4fae 100644
(file)
--- a/
src/wx/content_menu.cc
+++ b/
src/wx/content_menu.cc
@@
-54,6
+54,10
@@
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
enum {
/* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */
enum {
/* Start at 256 so we can have IDs on _cpl_menu from 1 to 255 */
diff --git
a/src/wx/controls.cc
b/src/wx/controls.cc
index caa0dc823974a3882511b19b99dd278bd203bed9..86329efb39425f8f4ff40b88cf52751df7f5d4f5 100644
(file)
--- a/
src/wx/controls.cc
+++ b/
src/wx/controls.cc
@@
-52,8
+52,12
@@
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::dynamic_pointer_cast;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
using namespace dcpomatic;
+
Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
: wxPanel (parent)
, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
: wxPanel (parent)
, _slider (new wxSlider (this, wxID_ANY, 0, 0, 4096))
diff --git
a/src/wx/dkdm_dialog.cc
b/src/wx/dkdm_dialog.cc
index c77123526cf8fbc0191a3f85348d3c6cb4e39928..5b89d28fafecdbf394c10c9d9c33c76c03a97003 100644
(file)
--- a/
src/wx/dkdm_dialog.cc
+++ b/
src/wx/dkdm_dialog.cc
@@
-49,6
+49,10
@@
using std::runtime_error;
using boost::shared_ptr;
using boost::bind;
using boost::optional;
using boost::shared_ptr;
using boost::bind;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr<const Film> film)
: wxDialog (parent, wxID_ANY, _("Make DKDMs"))
DKDMDialog::DKDMDialog (wxWindow* parent, shared_ptr<const Film> film)
: wxDialog (parent, wxID_ANY, _("Make DKDMs"))
diff --git
a/src/wx/gl_video_view.cc
b/src/wx/gl_video_view.cc
index a82d5a27688e156f0c5eab8f8b7aa82fdc6de02d..79ede0d8e843d8fee59dd7f51802552e1a5d9e68 100644
(file)
--- a/
src/wx/gl_video_view.cc
+++ b/
src/wx/gl_video_view.cc
@@
-51,6
+51,9
@@
using std::cout;
using boost::shared_ptr;
using boost::optional;
using std::cout;
using boost::shared_ptr;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
static void
static void
diff --git
a/src/wx/i18n_hook.cc
b/src/wx/i18n_hook.cc
index b2cd6df8e7f5e1af60ff0179cb2673bac43422b1..b2797fa51272a020de4dcd69a2f6d586780f1607 100644
(file)
--- a/
src/wx/i18n_hook.cc
+++ b/
src/wx/i18n_hook.cc
@@
-27,6
+27,10
@@
using std::map;
using std::string;
using std::map;
using std::string;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
map<string, string> I18NHook::_translations;
map<string, string> I18NHook::_translations;
diff --git
a/src/wx/interop_metadata_dialog.cc
b/src/wx/interop_metadata_dialog.cc
index f91bdcf7fb2259fe9da0c20e9c855664c49ffcd6..186e9bbcdefa9f8baf44ef538a40ddfc0f65cf48 100644
(file)
--- a/
src/wx/interop_metadata_dialog.cc
+++ b/
src/wx/interop_metadata_dialog.cc
@@
-29,6
+29,10
@@
using std::string;
using std::vector;
using boost::weak_ptr;
using boost::shared_ptr;
using std::vector;
using boost::weak_ptr;
using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
static string
column (dcp::Rating r, int c)
static string
column (dcp::Rating r, int c)
diff --git
a/src/wx/kdm_output_panel.cc
b/src/wx/kdm_output_panel.cc
index 294fdd4dfb7f803ea12974bd8fba934a517f9f87..35ce4fc278a76d1c37d2387f5e2fd4f92aeff771 100644
(file)
--- a/
src/wx/kdm_output_panel.cc
+++ b/
src/wx/kdm_output_panel.cc
@@
-50,6
+50,10
@@
using std::exception;
using std::make_pair;
using boost::shared_ptr;
using boost::function;
using std::make_pair;
using boost::shared_ptr;
using boost::function;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
: wxPanel (parent, wxID_ANY)
KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop)
: wxPanel (parent, wxID_ANY)
diff --git
a/src/wx/language_tag_dialog.cc
b/src/wx/language_tag_dialog.cc
index f4e54e94ba4b72c8555f5ab6fd6e24ef20bf9ffa..2854479a7469647ec9ad1e4f852cf99752c82d2f 100644
(file)
--- a/
src/wx/language_tag_dialog.cc
+++ b/
src/wx/language_tag_dialog.cc
@@
-43,6
+43,9
@@
using std::vector;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
class SubtagListCtrl : public wxListCtrl
class SubtagListCtrl : public wxListCtrl
diff --git
a/src/wx/player_config_dialog.cc
b/src/wx/player_config_dialog.cc
index 4c3e2ca173a2d190f663750e8ca1d137c38cbf26..a6837653084d10f9558db11896ada2a173bb1f57 100644
(file)
--- a/
src/wx/player_config_dialog.cc
+++ b/
src/wx/player_config_dialog.cc
@@
-68,6
+68,9
@@
using boost::bind;
using boost::shared_ptr;
using boost::function;
using boost::optional;
using boost::shared_ptr;
using boost::function;
using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::locale_convert;
class PlayerGeneralPage : public GeneralPage
using dcp::locale_convert;
class PlayerGeneralPage : public GeneralPage
diff --git
a/src/wx/recipient_dialog.cc
b/src/wx/recipient_dialog.cc
index 1d36046ddad2cce697dde6c14c49774c068de429..d59226a96e94abb2e101de54e047188e62c01a57 100644
(file)
--- a/
src/wx/recipient_dialog.cc
+++ b/
src/wx/recipient_dialog.cc
@@
-42,6
+42,9
@@
using std::vector;
using std::list;
using boost::optional;
using boost::bind;
using std::list;
using boost::optional;
using boost::bind;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
static string
static string
diff --git
a/src/wx/simple_video_view.cc
b/src/wx/simple_video_view.cc
index d68ea48ddf679c38c818e8394e00004882ca4620..97e582ce7fcd4cad8c848e509d67152bf12710fd 100644
(file)
--- a/
src/wx/simple_video_view.cc
+++ b/
src/wx/simple_video_view.cc
@@
-33,8
+33,12
@@
using std::max;
using std::string;
using boost::optional;
using boost::shared_ptr;
using std::string;
using boost::optional;
using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using namespace dcpomatic;
using namespace dcpomatic;
+
SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
: VideoView (viewer)
{
SimpleVideoView::SimpleVideoView (FilmViewer* viewer, wxWindow* parent)
: VideoView (viewer)
{
diff --git
a/src/wx/smpte_metadata_dialog.cc
b/src/wx/smpte_metadata_dialog.cc
index 6b567de75fbf326e1969bd715bff58b3251adcd2..ba45329f28ca9c1b0d07f96161f9a45e9f24771f 100644
(file)
--- a/
src/wx/smpte_metadata_dialog.cc
+++ b/
src/wx/smpte_metadata_dialog.cc
@@
-33,6
+33,9
@@
using std::vector;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::weak_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
static string
static string
diff --git
a/src/wx/video_waveform_dialog.cc
b/src/wx/video_waveform_dialog.cc
index 8becbd5fbca485aa855688dd39ada0ae475bb6ea..3603c5dd29ba5e8bd00db4c1ee77e5717edfe66c 100644
(file)
--- a/
src/wx/video_waveform_dialog.cc
+++ b/
src/wx/video_waveform_dialog.cc
@@
-30,6
+30,10
@@
using std::cout;
using boost::bind;
using boost::weak_ptr;
using boost::shared_ptr;
using boost::bind;
using boost::weak_ptr;
using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
: wxDialog (
VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
: wxDialog (
diff --git
a/src/wx/video_waveform_plot.cc
b/src/wx/video_waveform_plot.cc
index c6fa883fa871c227b321dea92819d126998cd922..9674d0af27015879bccd38fb5cc7b4941c91442b 100644
(file)
--- a/
src/wx/video_waveform_plot.cc
+++ b/
src/wx/video_waveform_plot.cc
@@
-38,12
+38,17
@@
using std::max;
using std::string;
using boost::weak_ptr;
using boost::shared_ptr;
using std::string;
using boost::weak_ptr;
using boost::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
using dcp::locale_convert;
using dcp::locale_convert;
+
int const VideoWaveformPlot::_vertical_margin = 8;
int const VideoWaveformPlot::_pixel_values = 4096;
int const VideoWaveformPlot::_x_axis_width = 52;
int const VideoWaveformPlot::_vertical_margin = 8;
int const VideoWaveformPlot::_pixel_values = 4096;
int const VideoWaveformPlot::_x_axis_width = 52;
+
VideoWaveformPlot::VideoWaveformPlot (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
, _film (film)
VideoWaveformPlot::VideoWaveformPlot (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
: wxPanel (parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxFULL_REPAINT_ON_RESIZE)
, _film (film)