f45b53e8f5d13f3dd3eecd14bfd44a12fb788d4e from master; ignore ._ files.

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

diff --git a/src/wx/hints_dialog.cc b/src/wx/hints_dialog.cc
index a5f3417a2401a018c24db4caa4451f0a4506e9e4..406bcbf0f712892672d823a7fac4b0744dc8bcea 100644 (file)
--- a/src/wx/hints_dialog.cc
+++ b/src/wx/hints_dialog.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2013 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -17,11 +17,12 @@
 
 */
 
-#include <boost/algorithm/string.hpp>
-#include <wx/richtext/richtextctrl.h>
 #include "lib/film.h"
 #include "lib/ratio.h"
+#include "lib/video_content.h"
 #include "hints_dialog.h"
+#include <boost/algorithm/string.hpp>
+#include <wx/richtext/richtextctrl.h>
 
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
@@ -47,8 +48,8 @@ HintsDialog::HintsDialog (wxWindow* parent, boost::weak_ptr<Film> f)
 
        boost::shared_ptr<Film> film = _film.lock ();
        if (film) {
-               film->Changed.connect (boost::bind (&HintsDialog::film_changed, this));
-               film->ContentChanged.connect (boost::bind (&HintsDialog::film_changed, this));
+               _film_changed_connection = film->Changed.connect (boost::bind (&HintsDialog::film_changed, this));
+               _film_content_changed_connection = film->ContentChanged.connect (boost::bind (&HintsDialog::film_changed, this));
        }
 
        film_changed ();
@@ -143,7 +144,7 @@ HintsDialog::film_changed ()
 
        if (three_d > 0) {
                hint = true;
-               _text->WriteText (_("You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if you want to play it back on a 3D system (e.g.\ Real-D, MasterImage etc.)"));
+               _text->WriteText (_("You are using 3D content but your DCP is set to 2D.  Set the DCP to 3D if you want to play it back on a 3D system (e.g. Real-D, MasterImage etc.)"));
                _text->Newline ();
        }