X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontent_panel.cc;h=fadcade313494df9da690f14d01835d9766a18e5;hb=a3c1ae7c2e46b65347341896b3d1a505ff92632b;hp=5fa935fac3708b4052de4d6516565402007a21ab;hpb=11778a3e9acb687a3cfe3af8358824ad7086218c;p=dcpomatic.git

diff --git a/src/wx/content_panel.cc b/src/wx/content_panel.cc
index 5fa935fac..fadcade31 100644
--- a/src/wx/content_panel.cc
+++ b/src/wx/content_panel.cc
@@ -42,6 +42,7 @@
 #include "lib/dcp_subtitle_decoder.h"
 #include "lib/dcpomatic_log.h"
 #include "lib/ffmpeg_content.h"
+#include "lib/film.h"
 #include "lib/image_content.h"
 #include "lib/log.h"
 #include "lib/playlist.h"
@@ -401,11 +402,11 @@ ContentPanel::selected_ffmpeg ()
 
 
 void
-ContentPanel::film_changed (Film::Property p)
+ContentPanel::film_changed(FilmProperty p)
 {
 	switch (p) {
-	case Film::Property::CONTENT:
-	case Film::Property::CONTENT_ORDER:
+	case FilmProperty::CONTENT:
+	case FilmProperty::CONTENT_ORDER:
 		setup ();
 		break;
 	default:
@@ -527,7 +528,7 @@ ContentPanel::check_selection ()
 		_video_panel->create ();
 	} else if (!have_video && _video_panel) {
 		_notebook->DeletePage (off);
-		_video_panel = 0;
+		_video_panel = nullptr;
 	}
 
 	if (have_video) {
@@ -540,7 +541,7 @@ ContentPanel::check_selection ()
 		_audio_panel->create ();
 	} else if (!have_audio && _audio_panel) {
 		_notebook->DeletePage (off);
-		_audio_panel = 0;
+		_audio_panel = nullptr;
 	}
 
 	if (have_audio) {
@@ -772,8 +773,8 @@ ContentPanel::set_film (shared_ptr<Film> film)
 
 	_film = film;
 
-	film_changed (Film::Property::CONTENT);
-	film_changed (Film::Property::AUDIO_CHANNELS);
+	film_changed(FilmProperty::CONTENT);
+	film_changed(FilmProperty::AUDIO_CHANNELS);
 
 	if (_film) {
 		check_selection ();