projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Cleanup: use simpler ownership for FilmViewer.
[dcpomatic.git]
/
src
/
wx
/
content_panel.h
diff --git
a/src/wx/content_panel.h
b/src/wx/content_panel.h
index eec062284eab7eaa9857f594b3d67eeb0776f047..3aeb9db17328475984f04bab805cbee9e62b6dbb 100644
(file)
--- a/
src/wx/content_panel.h
+++ b/
src/wx/content_panel.h
@@
-71,7
+71,7
@@
private:
class ContentPanel
{
public:
class ContentPanel
{
public:
- ContentPanel
(wxNotebook *, std::shared_ptr<Film>, std::weak_ptr<FilmViewer>
viewer);
+ ContentPanel
(wxNotebook *, std::shared_ptr<Film>, FilmViewer&
viewer);
ContentPanel (ContentPanel const&) = delete;
ContentPanel& operator= (ContentPanel const&) = delete;
ContentPanel (ContentPanel const&) = delete;
ContentPanel& operator= (ContentPanel const&) = delete;
@@
-109,10
+109,14
@@
public:
bool remove_clicked (bool hotkey);
void timeline_clicked ();
bool remove_clicked (bool hotkey);
void timeline_clicked ();
-
std::weak_ptr<FilmViewer> film_viewer
() const {
+
FilmViewer& film_viewer
() const {
return _film_viewer;
}
return _film_viewer;
}
+ void add_files(std::vector<boost::filesystem::path> files);
+ void add_dcp(boost::filesystem::path dcp);
+ void add_folder(boost::filesystem::path folder);
+
boost::signals2::signal<void (void)> SelectionChanged;
private:
boost::signals2::signal<void (void)> SelectionChanged;
private:
@@
-131,7
+135,6
@@
private:
void setup_sensitivity ();
void set_selected_state(int item, bool state);
void setup_sensitivity ();
void set_selected_state(int item, bool state);
- void add_files (std::vector<boost::filesystem::path>);
std::list<ContentSubPanel *> panels () const;
LimitedSplitter* _splitter;
std::list<ContentSubPanel *> panels () const;
LimitedSplitter* _splitter;
@@
-155,7
+158,7
@@
private:
wxWindow* _last_selected_tab = nullptr;
std::shared_ptr<Film> _film;
wxWindow* _last_selected_tab = nullptr;
std::shared_ptr<Film> _film;
-
std::weak_ptr<FilmViewer>
_film_viewer;
+
FilmViewer&
_film_viewer;
bool _generally_sensitive;
bool _ignore_deselect;
bool _no_check_selection;
bool _generally_sensitive;
bool _ignore_deselect;
bool _no_check_selection;