projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add DCPOMATIC_CHECKBOX_BOTTOM_PAD.
[dcpomatic.git]
/
src
/
wx
/
timing_panel.h
diff --git
a/src/wx/timing_panel.h
b/src/wx/timing_panel.h
index e0be2d74bf22dc5c5744bf6b97fee628a049f380..251acc9b559808523a757a1ba4f464433213b586 100644
(file)
--- a/
src/wx/timing_panel.h
+++ b/
src/wx/timing_panel.h
@@
-27,7
+27,7
@@
class FilmViewer;
class TimingPanel : public ContentSubPanel
{
public:
class TimingPanel : public ContentSubPanel
{
public:
- TimingPanel (ContentPanel *,
boost
::weak_ptr<FilmViewer> viewer);
+ TimingPanel (ContentPanel *,
std
::weak_ptr<FilmViewer> viewer);
void film_changed (Film::Property);
void film_content_changed (int);
void film_changed (Film::Property);
void film_content_changed (int);
@@
-42,21
+42,18
@@
private:
void trim_end_changed ();
void trim_end_to_playhead_clicked ();
void play_length_changed ();
void trim_end_changed ();
void trim_end_to_playhead_clicked ();
void play_length_changed ();
- void video_frame_rate_changed ();
- void set_video_frame_rate ();
void update_full_length ();
void update_play_length ();
void setup_sensitivity ();
void add_to_grid ();
void update_full_length ();
void update_play_length ();
void setup_sensitivity ();
void add_to_grid ();
-
boost
::weak_ptr<FilmViewer> _viewer;
+
std
::weak_ptr<FilmViewer> _viewer;
wxStaticText* _h_label;
wxStaticText* _m_label;
wxStaticText* _s_label;
wxStaticText* _f_label;
wxStaticText* _colon[3];
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;
wxStaticText* _position_label;
Timecode<dcpomatic::DCPTime>* _position;
wxButton* _move_to_start_of_reel;
@@
-70,9
+67,6
@@
private:
Timecode<dcpomatic::ContentTime>* _trim_end;
wxStaticText* _play_length_label;
Timecode<dcpomatic::DCPTime>* _play_length;
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;
Suspender _film_content_changed_suspender;
};
Suspender _film_content_changed_suspender;
};