projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Another OS X include.
[dcpomatic.git]
/
src
/
wx
/
timing_panel.h
diff --git
a/src/wx/timing_panel.h
b/src/wx/timing_panel.h
index 1a9f5d3fd7c5713cd4244e749205e0ac6e9728b2..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 *,
ControlFilmViewer*
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,7
+48,7
@@
private:
void setup_sensitivity ();
void add_to_grid ();
void setup_sensitivity ();
void add_to_grid ();
-
ControlFilmViewer*
_viewer;
+
boost::weak_ptr<FilmViewer>
_viewer;
wxStaticText* _h_label;
wxStaticText* _m_label;
wxStaticText* _h_label;
wxStaticText* _m_label;
@@
-57,18
+57,18
@@
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;