Emit no audio from DCPs if none is mapped

[dcpomatic.git] / src / wx / video_waveform_dialog.cc

diff --git a/src/wx/video_waveform_dialog.cc b/src/wx/video_waveform_dialog.cc
index 510d373c61364d3b7b2f8b19151dcbb6faa4ed6e..73ccc82df67abb80b6054d7584b289bd65c45aed 100644 (file)
--- a/src/wx/video_waveform_dialog.cc
+++ b/src/wx/video_waveform_dialog.cc
@@ -18,20 +18,24 @@
 
 */
 
+
 #include "video_waveform_dialog.h"
 #include "video_waveform_plot.h"
 #include "film_viewer.h"
 #include "wx_util.h"
 #include "static_text.h"
-#include <boost/bind.hpp>
-#include <iostream>
+#include <boost/bind/bind.hpp>
+
 
-using std::cout;
 using boost::bind;
-using boost::weak_ptr;
-using boost::shared_ptr;
+using std::weak_ptr;
+using std::shared_ptr;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
+
 
-VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film> film, weak_ptr<FilmViewer> viewer)
+VideoWaveformDialog::VideoWaveformDialog(wxWindow* parent, weak_ptr<const Film> film, FilmViewer& viewer)
        : wxDialog (
                parent,
                wxID_ANY,
@@ -67,11 +71,11 @@ VideoWaveformDialog::VideoWaveformDialog (wxWindow* parent, weak_ptr<const Film>
        overall_sizer->Add (controls, 0, wxALL | wxEXPAND, DCPOMATIC_SIZER_X_GAP);
 
        wxBoxSizer* position = new wxBoxSizer (wxHORIZONTAL);
-       add_label_to_sizer (position, this, _("Image X position"), true);
+       add_label_to_sizer (position, this, _("Image X position"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
        _x_position = new StaticText (this, "");
        _x_position->SetMinSize (wxSize (64, -1));
        position->Add (_x_position, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
-       add_label_to_sizer (position, this, _("component value"), true);
+       add_label_to_sizer (position, this, _("component value"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTRE_VERTICAL);
        _value = new StaticText (this, "");
        _value->SetMinSize (wxSize (64, -1));
        position->Add (_value, 0, wxALL, DCPOMATIC_SIZER_X_GAP);
@@ -108,9 +112,7 @@ VideoWaveformDialog::shown (wxShowEvent& ev)
 {
        _plot->set_enabled (ev.IsShown ());
        if (ev.IsShown ()) {
-               shared_ptr<FilmViewer> fv = _viewer.lock ();
-               DCPOMATIC_ASSERT (fv);
-               fv->slow_refresh ();
+               _viewer.slow_refresh();
        }
 }