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

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

diff --git a/src/wx/markers_panel.cc b/src/wx/markers_panel.cc
index 1219da3f525e83862a7e9065b64f7448c67aba61..a110da105f5cb36318365b4119f2408e6b1af710 100644 (file)
--- a/src/wx/markers_panel.cc
+++ b/src/wx/markers_panel.cc
@@ -23,8 +23,11 @@
 #include "markers.h"
 #include "markers_panel.h"
 #include "wx_util.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
 #include <wx/graphics.h>
 #include <wx/tipwin.h>
+LIBDCP_ENABLE_WARNINGS
 #include <boost/bind/bind.hpp>
 #include <boost/version.hpp>
 
@@ -62,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());
 }
 
 
@@ -236,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);