Rename all_markers() and stop it being possible to set FFOC/LFOC.

diff --git a/src/wx/markers.cc b/src/wx/markers.cc
index 229980c0814cbfdfb64e01002110a662bdafe1b1..f6ca74a951720c3b91088070cfd75ea90374bd58 100644 (file)
--- a/src/wx/markers.cc
+++ b/src/wx/markers.cc
@@ -27,11 +27,9 @@ using std::vector;
 
 
 vector<pair<wxString, dcp::Marker>>
-all_markers()
+all_editable_markers()
 {
        return vector<pair<wxString, dcp::Marker>>{
-               { _("First frame of composition"), dcp::Marker::FFOC },
-               { _("Last frame of composition"), dcp::Marker::LFOC },
                { _("First frame of title credits"), dcp::Marker::FFTC },
                { _("Last frame of title credits"), dcp::Marker::LFTC },
                { _("First frame of intermission"), dcp::Marker::FFOI },

diff --git a/src/wx/markers.h b/src/wx/markers.h
index fb2b2f1faa433f955941307aa52ce8b0490771bd..9aeacdad2cc66b3955daa9c6af7ba4908cd258fc 100644 (file)
--- a/src/wx/markers.h
+++ b/src/wx/markers.h
@@ -28,4 +28,4 @@ LIBDCP_ENABLE_WARNINGS
 #include <vector>
 
 
-extern std::vector<std::pair<wxString, dcp::Marker>> all_markers ();
+extern std::vector<std::pair<wxString, dcp::Marker>> all_editable_markers();

diff --git a/src/wx/markers_dialog.cc b/src/wx/markers_dialog.cc
index 2e4dc42c5950e4f6922651521b9971eebc3e76a2..c8561ad743581ee6435ce2cbde3e1398c574f0cf 100644 (file)
--- a/src/wx/markers_dialog.cc
+++ b/src/wx/markers_dialog.cc
@@ -132,7 +132,7 @@ MarkersDialog::MarkersDialog (wxWindow* parent, weak_ptr<Film> film, weak_ptr<Fi
        auto grid = new wxGridBagSizer (DCPOMATIC_SIZER_X_GAP, DCPOMATIC_SIZER_Y_GAP);
 
        int r = 0;
-       for (auto const& marker: all_markers()) {
+       for (auto const& marker: all_editable_markers()) {
                _markers.push_back (make_shared<Marker>(this, grid, r++, film, viewer, marker.first, marker.second));
        }
 

diff --git a/src/wx/markers_panel.cc b/src/wx/markers_panel.cc
index aa6d8d4495080124890735050bbb45134b875bd2..a110da105f5cb36318365b4119f2408e6b1af710 100644 (file)
--- a/src/wx/markers_panel.cc
+++ b/src/wx/markers_panel.cc
@@ -65,7 +65,7 @@ MarkersPanel::MarkersPanel (wxWindow* parent, weak_ptr<FilmViewer> viewer)
 
        Bind (wxEVT_MENU, boost::bind(&MarkersPanel::move_marker_to_current_position, this), ID_move_marker_to_current_position);
        Bind (wxEVT_MENU, boost::bind(&MarkersPanel::remove_marker, this), ID_remove_marker);
-       Bind (wxEVT_MENU, boost::bind(&MarkersPanel::add_marker, this, _1), ID_add_base, ID_add_base + all_markers().size());
+       Bind (wxEVT_MENU, boost::bind(&MarkersPanel::add_marker, this, _1), ID_add_base, ID_add_base + all_editable_markers().size());
 }
 
 
@@ -239,7 +239,7 @@ MarkersPanel::mouse_right_down (wxMouseEvent& ev)
        }
 
        auto add_marker = new wxMenu ();
-       for (auto const& marker: all_markers()) {
+       for (auto const& marker: all_editable_markers()) {
                add_marker->Append (static_cast<int>(ID_add_base) + static_cast<int>(marker.second), marker.first);
        }
        menu.Append (ID_add_marker, _("Add or move marker to current position"), add_marker);