projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add missing file=f so that all desktop shortcuts are uninstalled.
[dcpomatic.git]
/
src
/
wx
/
timeline.h
diff --git
a/src/wx/timeline.h
b/src/wx/timeline.h
index b532e74e3730989bb78124cc7a8cacf9e997dd86..2485e835fa8e4faa235d605d53371d5a09d8d5e7 100644
(file)
--- a/
src/wx/timeline.h
+++ b/
src/wx/timeline.h
@@
-18,26
+18,31
@@
*/
*/
+
#include "content_menu.h"
#include "timeline_content_view.h"
#include "content_menu.h"
#include "timeline_content_view.h"
-#include "lib/
util
.h"
+#include "lib/
film_property
.h"
#include "lib/rect.h"
#include "lib/rect.h"
-#include "lib/film.h"
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+LIBDCP_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
-class Film;
+
class ContentPanel;
class ContentPanel;
-class TimelineView;
-class TimelineTimeAxisView;
-class TimelineReelsView;
-class TimelineLabelsView;
+class Film;
class FilmViewer;
class FilmViewer;
+class TimelineLabelsView;
+class TimelineReelsView;
+class TimelineTimeAxisView;
+class TimelineView;
+
class Timeline : public wxPanel
{
public:
class Timeline : public wxPanel
{
public:
- Timeline (wxWindow *, ContentPanel *, std::shared_ptr<Film>,
std::weak_ptr<FilmViewer>
viewer);
+ Timeline (wxWindow *, ContentPanel *, std::shared_ptr<Film>,
FilmViewer&
viewer);
std::shared_ptr<const Film> film () const;
std::shared_ptr<const Film> film () const;
@@
-77,6
+82,8
@@
public:
int tracks_y_offset () const;
int tracks_y_offset () const;
+ void keypress(wxKeyEvent const &);
+
private:
void paint_labels ();
void paint_main ();
private:
void paint_labels ();
void paint_main ();
@@
-90,7
+97,7
@@
private:
void mouse_moved (wxMouseEvent &);
void mouse_moved_select (wxMouseEvent &);
void mouse_moved_zoom (wxMouseEvent &);
void mouse_moved (wxMouseEvent &);
void mouse_moved_select (wxMouseEvent &);
void mouse_moved_zoom (wxMouseEvent &);
- void film_change
(ChangeType type, Film::
Property);
+ void film_change
(ChangeType type, Film
Property);
void film_content_change (ChangeType type, int, bool frequent);
void resized ();
void assign_tracks ();
void film_content_change (ChangeType type, int, bool frequent);
void resized ();
void assign_tracks ();
@@
-113,7
+120,7
@@
private:
wxScrolledCanvas* _main_canvas;
ContentPanel* _content_panel;
std::weak_ptr<Film> _film;
wxScrolledCanvas* _main_canvas;
ContentPanel* _content_panel;
std::weak_ptr<Film> _film;
-
std::weak_ptr<FilmViewer>
_viewer;
+
FilmViewer&
_viewer;
TimelineViewList _views;
std::shared_ptr<TimelineTimeAxisView> _time_axis_view;
std::shared_ptr<TimelineReelsView> _reels_view;
TimelineViewList _views;
std::shared_ptr<TimelineTimeAxisView> _time_axis_view;
std::shared_ptr<TimelineReelsView> _reels_view;