projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Find wxWidgets on Fedora 22.
[dcpomatic.git]
/
src
/
wx
/
timing_panel.h
diff --git
a/src/wx/timing_panel.h
b/src/wx/timing_panel.h
index e300e4975cf32b698dca2a1b2b452b9d164070d2..d1f5ea5495a3b902aa92a6fee5b7be7c81eed9ee 100644
(file)
--- a/
src/wx/timing_panel.h
+++ b/
src/wx/timing_panel.h
@@
-30,7
+30,7
@@
public:
void film_changed (Film::Property);
void film_content_changed (int);
void content_selection_changed ();
void film_changed (Film::Property);
void film_content_changed (int);
void content_selection_changed ();
-
+
private:
void position_changed ();
void full_length_changed ();
private:
void position_changed ();
void full_length_changed ();
@@
-45,13
+45,13
@@
private:
void update_play_length ();
FilmViewer* _viewer;
void update_play_length ();
FilmViewer* _viewer;
-
+
Timecode<DCPTime>* _position;
Timecode<DCPTime>* _full_length;
Timecode<DCPTime>* _position;
Timecode<DCPTime>* _full_length;
- Timecode<
DCP
Time>* _trim_start;
+ Timecode<
Content
Time>* _trim_start;
wxButton* _trim_start_to_playhead;
wxButton* _trim_end_to_playhead;
wxButton* _trim_start_to_playhead;
wxButton* _trim_end_to_playhead;
- Timecode<
DCP
Time>* _trim_end;
+ Timecode<
Content
Time>* _trim_end;
Timecode<DCPTime>* _play_length;
wxTextCtrl* _video_frame_rate;
wxButton* _set_video_frame_rate;
Timecode<DCPTime>* _play_length;
wxTextCtrl* _video_frame_rate;
wxButton* _set_video_frame_rate;