Use the same code for both Interop and SMPTE ratings controls.

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

diff --git a/src/wx/interop_metadata_dialog.cc b/src/wx/interop_metadata_dialog.cc
index 08626c0ed7707d9390c5b14c8770381889e93d16..0258f9ca514b39fc7d99ca32774d73f7beb136f6 100644 (file)
--- a/src/wx/interop_metadata_dialog.cc
+++ b/src/wx/interop_metadata_dialog.cc
@@ -19,16 +19,15 @@
 */
 
 
-#include "editable_list.h"
 #include "interop_metadata_dialog.h"
 #include "language_tag_widget.h"
 #include "rating_dialog.h"
 #include "lib/film.h"
-#include "lib/warnings.h"
 #include <dcp/types.h>
-DCPOMATIC_DISABLE_WARNINGS
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/gbsizer.h>
-DCPOMATIC_ENABLE_WARNINGS
+LIBDCP_ENABLE_WARNINGS
 
 
 using std::shared_ptr;
@@ -60,23 +59,6 @@ InteropMetadataDialog::setup_standard (wxPanel* panel, wxSizer* sizer)
                sizer->Add (m, 0, flags, DCPOMATIC_SIZER_GAP);
        }
 
-       vector<EditableListColumn> columns;
-       columns.push_back (EditableListColumn(_("Agency"), 200, true));
-       columns.push_back (EditableListColumn(_("Label"), 50, true));
-       _ratings = new EditableList<dcp::Rating, RatingDialog> (
-               panel,
-               columns,
-               boost::bind(&InteropMetadataDialog::ratings, this),
-               boost::bind(&InteropMetadataDialog::set_ratings, this, _1),
-               [](dcp::Rating r, int c) {
-                       if (c == 0) {
-                               return r.agency;
-                       }
-                       return r.label;
-               },
-               true,
-               false
-               );
        sizer->Add (_ratings, 1, wxEXPAND);
 
        add_label_to_sizer (sizer, panel, _("Content version"), true, 0, wxLEFT | wxRIGHT | wxALIGN_CENTER_VERTICAL);
@@ -91,20 +73,6 @@ InteropMetadataDialog::setup_standard (wxPanel* panel, wxSizer* sizer)
 }
 
 
-vector<dcp::Rating>
-InteropMetadataDialog::ratings () const
-{
-       return film()->ratings ();
-}
-
-
-void
-InteropMetadataDialog::set_ratings (vector<dcp::Rating> r)
-{
-       film()->set_ratings (r);
-}
-
-
 void
 InteropMetadataDialog::content_version_changed ()
 {