Move video frame rate ('prepared-for') into Content.

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

diff --git a/src/wx/content_properties_dialog.cc b/src/wx/content_properties_dialog.cc
index 37f96c156aeeef50977198ea7313f00b7742c247..bae4ff2415bc837fbe14e0559b1bebf86beb0d2f 100644 (file)
--- a/src/wx/content_properties_dialog.cc
+++ b/src/wx/content_properties_dialog.cc
@@ -23,7 +23,6 @@
 #include "lib/content.h"
 #include "lib/video_content.h"
 #include "lib/audio_content.h"
-#include "lib/single_stream_audio_content.h"
 #include <boost/algorithm/string.hpp>
 #include <boost/foreach.hpp>
 
@@ -42,15 +41,15 @@ ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<C
        add (_("Filename"), true);
        add (new wxStaticText (this, wxID_ANY, std_to_wx (n)));
 
-       map<string, list<Content::UserProperty> > grouped;
-       BOOST_FOREACH (Content::UserProperty i, content->user_properties()) {
+       map<string, list<UserProperty> > grouped;
+       BOOST_FOREACH (UserProperty i, content->user_properties()) {
                if (grouped.find(i.category) == grouped.end()) {
-                       grouped[i.category] = list<Content::UserProperty> ();
+                       grouped[i.category] = list<UserProperty> ();
                }
                grouped[i.category].push_back (i);
        }
 
-       for (map<string, list<Content::UserProperty> >::const_iterator i = grouped.begin(); i != grouped.end(); ++i) {
+       for (map<string, list<UserProperty> >::const_iterator i = grouped.begin(); i != grouped.end(); ++i) {
 
                wxStaticText* m = new wxStaticText (this, wxID_ANY, std_to_wx (i->first));
                wxFont font (*wxNORMAL_FONT);
@@ -62,7 +61,7 @@ ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<C
                add (m, false);
                add_spacer ();
 
-               BOOST_FOREACH (Content::UserProperty j, i->second) {
+               BOOST_FOREACH (UserProperty j, i->second) {
                        add (std_to_wx (j.key), true);
                        add (new wxStaticText (this, wxID_ANY, std_to_wx (j.value + " " + j.unit)));
                }