X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Fcontrols.cc;h=c02581cc0ec3ad3dff7833481ea5bc1cf89394ba;hb=b3a11879c49c8c0f79e7643827125ae8a7c82a01;hp=ba069126877b95fae069125f1b46b0d3049ee333;hpb=3c29aa6531a4046a8db72dcac81189eb8893233c;p=dcpomatic.git

diff --git a/src/wx/controls.cc b/src/wx/controls.cc
index ba0691268..c02581cc0 100644
--- a/src/wx/controls.cc
+++ b/src/wx/controls.cc
@@ -24,6 +24,7 @@
 #include "controls.h"
 #include "dcpomatic_button.h"
 #include "film_viewer.h"
+#include "markers_panel.h"
 #include "playhead_to_frame_dialog.h"
 #include "playhead_to_timecode_dialog.h"
 #include "static_text.h"
@@ -65,6 +66,7 @@ using namespace dcpomatic;
 
 Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor_controls)
 	: wxPanel (parent)
+	, _markers (new MarkersPanel(this, viewer))
 	, _slider (new wxSlider(this, wxID_ANY, 0, 0, 4096))
 	, _viewer (viewer)
 	, _slider_being_moved (false)
@@ -103,14 +105,19 @@ Controls::Controls (wxWindow* parent, shared_ptr<FilmViewer> viewer, bool editor
 	time_sizer->Add (_timecode, 0, wxEXPAND);
 
 	h_sizer->Add (_rewind_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
-	h_sizer->Add (time_sizer, 0, wxEXPAND);
+	h_sizer->Add (time_sizer, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
 	h_sizer->Add (_back_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
 	h_sizer->Add (_forward_button, 0, wxALL | wxALIGN_CENTER_VERTICAL, 2);
 
 	_button_sizer = new wxBoxSizer (wxHORIZONTAL);
 	h_sizer->Add (_button_sizer, 0, wxEXPAND);
 
-	h_sizer->Add (_slider, 1, wxEXPAND);
+	{
+		auto box = new wxBoxSizer (wxVERTICAL);
+		box->Add (_markers, 0, wxEXPAND);
+		box->Add (_slider, 0, wxEXPAND);
+		h_sizer->Add (box, 1, wxEXPAND);
+	}
 
 	_v_sizer->Add (h_sizer, 0, wxEXPAND | wxALL, 6);
 
@@ -469,6 +476,8 @@ Controls::set_film (shared_ptr<Film> film)
 
 	_film = film;
 
+	_markers->set_film (_film);
+
 	if (_film) {
 		_film_change_connection = _film->Change.connect (boost::bind(&Controls::film_change, this, _1, _2));
 	}