Fix two more badly-adapted instantiations of EditableList and make

[dcpomatic.git] / src / tools / dcpomatic_combiner.cc

diff --git a/src/tools/dcpomatic_combiner.cc b/src/tools/dcpomatic_combiner.cc
index 40587e23ad4b5f9fae1ea114fadc7ca824751d6b..2ef58bb85011fe59bfffd8491d78eb875a50a65c 100644 (file)
--- a/src/tools/dcpomatic_combiner.cc
+++ b/src/tools/dcpomatic_combiner.cc
@@ -65,7 +65,7 @@ public:
 
        }
 
-       boost::filesystem::path get () const
+       optional<boost::filesystem::path> get () const
        {
                return boost::filesystem::path(wx_to_std(GetPath()));
        }
@@ -100,8 +100,8 @@ public:
                        boost::bind(&DOMFrame::inputs, this),
                        boost::bind(&DOMFrame::set_inputs, this, _1),
                        &display_string,
-                       false,
-                       true
+                       EditableListTitle::VISIBLE,
+                       EditableListButton::NEW | EditableListButton::REMOVE
                        );
 
                auto output = new wxFlexGridSizer (2, DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);