#include "playhead_to_frame_dialog.h"
#include "playhead_to_timecode_dialog.h"
#include "static_text.h"
-#include "wx_ptr.h"
#include "wx_util.h"
#include "lib/content_factory.h"
#include "lib/cross.h"
#include "lib/dcp_content.h"
#include "lib/examine_content_job.h"
+#include "lib/film.h"
#include "lib/job.h"
#include "lib/job_manager.h"
#include "lib/player_video.h"
-#include "lib/scope_guard.h"
#include <dcp/cpl.h>
#include <dcp/dcp.h>
#include <dcp/reel.h>
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(_button_sizer, 0, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_GAP);
{
auto box = new wxBoxSizer (wxVERTICAL);
set_film(viewer.film());
- setup_sensitivity ();
-
JobManager::instance()->ActiveJobsChanged.connect (
bind (&Controls::active_jobs_changed, this, _2)
);
_config_changed_connection = Config::instance()->Changed.connect (bind(&Controls::config_changed, this, _1));
- config_changed (Config::OTHER);
}
void
void
Controls::slider_released ()
{
+ if (!_film) {
+ return;
+ }
+
/* Restart after a drag */
_viewer.resume();
_slider_being_moved = false;
void
-Controls::film_change (ChangeType type, Film::Property p)
+Controls::film_change(ChangeType type, FilmProperty p)
{
if (type == ChangeType::DONE) {
- if (p == Film::Property::CONTENT) {
+ if (p == FilmProperty::CONTENT) {
setup_sensitivity ();
update_position_label ();
update_position_slider ();
- } else if (p == Film::Property::THREE_D) {
+ } else if (p == FilmProperty::THREE_D) {
setup_sensitivity ();
}
}