Logging improvements to allow prettier displays in the server GUI.

[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 feb2c6a4631a7b2bac65f0b7a50bbd2e23257166..0b9bd0bb85b8b88f36a18700384f0a8be74fe816 100644 (file)
--- a/src/wx/content_properties_dialog.cc
+++ b/src/wx/content_properties_dialog.cc
@@ -27,48 +27,24 @@
 #include <boost/algorithm/string.hpp>
 
 using std::string;
+using std::list;
+using std::pair;
 using boost::shared_ptr;
 using boost::dynamic_pointer_cast;
 
 ContentPropertiesDialog::ContentPropertiesDialog (wxWindow* parent, shared_ptr<Content> content)
-       : TableDialog (parent, _("Content Properties"), 2, false)
+       : TableDialog (parent, _("Content Properties"), 2, 1, false)
 {
        string n = content->path(0).string();
        boost::algorithm::replace_all (n, "&", "&&");
-       add_property (_("Filename"), std_to_wx (n));
+       add (_("Filename"), true);
+       add (new wxStaticText (this, wxID_ANY, std_to_wx (n)));
 
-       shared_ptr<VideoContent> video = dynamic_pointer_cast<VideoContent> (content);
-       if (video) {
-               add_property (
-                       _("Video length"),
-                       std_to_wx (raw_convert<string> (video->video_length ())) + " " + _("video frames")
-                       );
-               add_property (
-                       _("Video size"),
-                       std_to_wx (raw_convert<string> (video->video_size().width) + "x" + raw_convert<string> (video->video_size().height))
-                       );
-               add_property (
-                       _("Video frame rate"),
-                       std_to_wx (raw_convert<string> (video->video_frame_rate())) + " " + _("frames per second")
-                       );
+       list<pair<string, string> > properties = content->properties ();
+       for (list<pair<string, string> >::const_iterator i = properties.begin(); i != properties.end(); ++i) {
+               add (std_to_wx (i->first), true);
+               add (new wxStaticText (this, wxID_ANY, std_to_wx (i->second)));
        }
 
-       /* XXX: this could be better wrt audio streams */
-       
-       shared_ptr<SingleStreamAudioContent> single = dynamic_pointer_cast<SingleStreamAudioContent> (content);
-       if (single) {
-               add_property (
-                       _("Audio channels"),
-                       std_to_wx (raw_convert<string> (single->audio_stream()->channels ()))
-                       );
-       }
-       
        layout ();
 }
-
-void
-ContentPropertiesDialog::add_property (wxString k, wxString v)
-{
-       add (k, true);
-       add (new wxStaticText (this, wxID_ANY, v));
-}