projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'v2.15.x' of ssh://git.carlh.net/home/carl/git/dcpomatic into v2.15.x
[dcpomatic.git]
/
src
/
wx
/
timing_panel.h
diff --git
a/src/wx/timing_panel.h
b/src/wx/timing_panel.h
index 400305c1a0cf5432c81189a449f7e73be910eb12..962a7fedcb17b3fd7bb8a18709f6b9e9a8ab1924 100644
(file)
--- a/
src/wx/timing_panel.h
+++ b/
src/wx/timing_panel.h
@@
-26,7
+26,7
@@
class FilmViewer;
class TimingPanel : public ContentSubPanel
{
public:
class TimingPanel : public ContentSubPanel
{
public:
- TimingPanel (ContentPanel *,
FilmViewer*
viewer);
+ TimingPanel (ContentPanel *,
boost::weak_ptr<FilmViewer>
viewer);
void film_changed (Film::Property);
void film_content_changed (int);
void film_changed (Film::Property);
void film_content_changed (int);
@@
-48,16
+48,28
@@
private:
void setup_sensitivity ();
void add_to_grid ();
void setup_sensitivity ();
void add_to_grid ();
-
FilmViewer*
_viewer;
+
boost::weak_ptr<FilmViewer>
_viewer;
- Timecode<DCPTime>* _position;
+ wxStaticText* _h_label;
+ wxStaticText* _m_label;
+ wxStaticText* _s_label;
+ wxStaticText* _f_label;
+ wxStaticText* _colon[3];
+ wxStaticText* _tip;
+ wxStaticText* _position_label;
+ Timecode<dcpomatic::DCPTime>* _position;
wxButton* _move_to_start_of_reel;
wxButton* _move_to_start_of_reel;
- Timecode<DCPTime>* _full_length;
- Timecode<ContentTime>* _trim_start;
+ wxStaticText* _full_length_label;
+ Timecode<dcpomatic::DCPTime>* _full_length;
+ wxStaticText* _trim_start_label;
+ Timecode<dcpomatic::ContentTime>* _trim_start;
wxButton* _trim_start_to_playhead;
wxButton* _trim_end_to_playhead;
wxButton* _trim_start_to_playhead;
wxButton* _trim_end_to_playhead;
- Timecode<ContentTime>* _trim_end;
- Timecode<DCPTime>* _play_length;
+ wxStaticText* _trim_end_label;
+ Timecode<dcpomatic::ContentTime>* _trim_end;
+ wxStaticText* _play_length_label;
+ Timecode<dcpomatic::DCPTime>* _play_length;
+ wxStaticText* _video_frame_rate_label;
wxTextCtrl* _video_frame_rate;
wxButton* _set_video_frame_rate;
};
wxTextCtrl* _video_frame_rate;
wxButton* _set_video_frame_rate;
};