projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
timeline.h
diff --git
a/src/wx/timeline.h
b/src/wx/timeline.h
index 8f23f68941e6428a834910ac7dd988d813f6adb5..82d10afde6cc8a8337c910b8b9506c1461c96585 100644
(file)
--- a/
src/wx/timeline.h
+++ b/
src/wx/timeline.h
@@
-28,13
+28,13
@@
class Film;
class View;
class ContentView;
class Film;
class View;
class ContentView;
-class
FilmEditor
;
+class
ContentPanel
;
class TimeAxisView;
class Timeline : public wxPanel
{
public:
class TimeAxisView;
class Timeline : public wxPanel
{
public:
- Timeline (wxWindow *,
FilmEditor
*, boost::shared_ptr<Film>);
+ Timeline (wxWindow *,
ContentPanel
*, boost::shared_ptr<Film>);
boost::shared_ptr<const Film> film () const;
boost::shared_ptr<const Film> film () const;
@@
-92,7
+92,7
@@
private:
ContentViewList selected_views () const;
ContentList selected_content () const;
ContentViewList selected_views () const;
ContentList selected_content () const;
-
FilmEditor* _film_editor
;
+
ContentPanel* _content_panel
;
boost::weak_ptr<Film> _film;
ViewList _views;
boost::shared_ptr<TimeAxisView> _time_axis_view;
boost::weak_ptr<Film> _film;
ViewList _views;
boost::shared_ptr<TimeAxisView> _time_axis_view;