projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Rename _size -> _video_size
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index 70568ccc044bf2be3230de382008a4ae122b71ea..e25dedceabc94064de40e7386361cfed4d428b41 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
19
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-20
21
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,12
+18,14
@@
*/
*/
+
#include "content_menu.h"
#include "content_menu.h"
-#include "lib/types.h"
#include "lib/film.h"
#include "lib/film.h"
+#include "lib/types.h"
#include <wx/splitter.h>
#include <list>
#include <wx/splitter.h>
#include <list>
+
class wxNotebook;
class wxPanel;
class wxSizer;
class wxNotebook;
class wxPanel;
class wxSizer;
@@
-62,11
+64,14
@@
private:
};
};
-class ContentPanel
: public boost::noncopyable
+class ContentPanel
{
public:
ContentPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
{
public:
ContentPanel (wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer> viewer);
+ ContentPanel (ContentPanel const&) = delete;
+ ContentPanel& operator= (ContentPanel const&) = delete;
+
std::shared_ptr<Film> film () const {
return _film;
}
std::shared_ptr<Film> film () const {
return _film;
}
@@
-121,7
+126,7
@@
private:
void setup ();
void setup_sensitivity ();
void setup ();
void setup_sensitivity ();
- void add_files (std::
list
<boost::filesystem::path>);
+ void add_files (std::
vector
<boost::filesystem::path>);
std::list<ContentSubPanel *> panels () const;
LimitedSplitter* _splitter;
std::list<ContentSubPanel *> panels () const;
LimitedSplitter* _splitter;
@@
-135,14
+140,14
@@
private:
wxButton* _earlier;
wxButton* _later;
wxButton* _timeline;
wxButton* _earlier;
wxButton* _later;
wxButton* _timeline;
- VideoPanel* _video_panel;
- AudioPanel* _audio_panel;
+ VideoPanel* _video_panel
= nullptr
;
+ AudioPanel* _audio_panel
= nullptr
;
TextPanel* _text_panel[static_cast<int>(TextType::COUNT)];
TimingPanel* _timing_panel;
ContentMenu* _menu;
TextPanel* _text_panel[static_cast<int>(TextType::COUNT)];
TimingPanel* _timing_panel;
ContentMenu* _menu;
- TimelineDialog* _timeline_dialog;
+ TimelineDialog* _timeline_dialog
= nullptr
;
wxNotebook* _parent;
wxNotebook* _parent;
- wxWindow* _last_selected_tab;
+ wxWindow* _last_selected_tab
= nullptr
;
std::shared_ptr<Film> _film;
std::weak_ptr<FilmViewer> _film_viewer;
std::shared_ptr<Film> _film;
std::weak_ptr<FilmViewer> _film_viewer;