projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix crash now that some audio channels are definitely unused.
[dcpomatic.git]
/
src
/
wx
/
timing_panel.h
diff --git
a/src/wx/timing_panel.h
b/src/wx/timing_panel.h
index 65d8aabc94e124ce8cceeccdf8f885fc95f0d6d3..e0be2d74bf22dc5c5744bf6b97fee628a049f380 100644
(file)
--- a/
src/wx/timing_panel.h
+++ b/
src/wx/timing_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
15
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
20
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-20,6
+20,7
@@
#include "content_sub_panel.h"
#include "timecode.h"
#include "content_sub_panel.h"
#include "timecode.h"
+#include "suspender.h"
class FilmViewer;
class FilmViewer;
@@
-57,19
+58,21
@@
private:
wxStaticText* _colon[3];
wxStaticText* _tip;
wxStaticText* _position_label;
wxStaticText* _colon[3];
wxStaticText* _tip;
wxStaticText* _position_label;
- Timecode<DCPTime>* _position;
+ Timecode<
dcpomatic::
DCPTime>* _position;
wxButton* _move_to_start_of_reel;
wxStaticText* _full_length_label;
wxButton* _move_to_start_of_reel;
wxStaticText* _full_length_label;
- Timecode<DCPTime>* _full_length;
+ Timecode<
dcpomatic::
DCPTime>* _full_length;
wxStaticText* _trim_start_label;
wxStaticText* _trim_start_label;
- Timecode<ContentTime>* _trim_start;
+ Timecode<
dcpomatic::
ContentTime>* _trim_start;
wxButton* _trim_start_to_playhead;
wxButton* _trim_end_to_playhead;
wxStaticText* _trim_end_label;
wxButton* _trim_start_to_playhead;
wxButton* _trim_end_to_playhead;
wxStaticText* _trim_end_label;
- Timecode<ContentTime>* _trim_end;
+ Timecode<
dcpomatic::
ContentTime>* _trim_end;
wxStaticText* _play_length_label;
wxStaticText* _play_length_label;
- Timecode<DCPTime>* _play_length;
+ Timecode<
dcpomatic::
DCPTime>* _play_length;
wxStaticText* _video_frame_rate_label;
wxTextCtrl* _video_frame_rate;
wxButton* _set_video_frame_rate;
wxStaticText* _video_frame_rate_label;
wxTextCtrl* _video_frame_rate;
wxButton* _set_video_frame_rate;
+
+ Suspender _film_content_changed_suspender;
};
};