diff options
Diffstat (limited to 'src/wx/timeline.h')
| -rw-r--r-- | src/wx/timeline.h | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/wx/timeline.h b/src/wx/timeline.h index ef1d10797..b3ee77fff 100644 --- a/src/wx/timeline.h +++ b/src/wx/timeline.h @@ -29,12 +29,12 @@ class Film; class View; class ContentView; class FilmEditor; -class TimeAxisView; +class DCPTimeAxisView; -class Timeline : public wxPanel +class DCPTimeline : public wxPanel { public: - Timeline (wxWindow *, FilmEditor *, boost::shared_ptr<Film>); + DCPTimeline (wxWindow *, FilmEditor *, boost::shared_ptr<Film>); boost::shared_ptr<const Film> film () const; @@ -94,13 +94,13 @@ private: FilmEditor* _film_editor; boost::weak_ptr<Film> _film; ViewList _views; - boost::shared_ptr<TimeAxisView> _time_axis_view; + boost::shared_ptr<DCPTimeAxisView> _time_axis_view; int _tracks; double _pixels_per_time_unit; bool _left_down; wxPoint _down_point; boost::shared_ptr<ContentView> _down_view; - Time _down_view_position; + DCPTime _down_view_position; bool _first_move; ContentMenu _menu; bool _snap; |