projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Missing check_gl_error() calls.
[dcpomatic.git]
/
src
/
wx
/
film_editor.h
diff --git
a/src/wx/film_editor.h
b/src/wx/film_editor.h
index 576cd5ba1b251bab083dec3cab431049bda02ca4..6aff127d8a6cfe4156a478e8a971220aad133fae 100644
(file)
--- a/
src/wx/film_editor.h
+++ b/
src/wx/film_editor.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-20
15
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,29
+18,37
@@
*/
*/
+
/** @file src/wx/film_editor.h
* @brief FilmEditor class.
*/
/** @file src/wx/film_editor.h
* @brief FilmEditor class.
*/
+
#include "lib/film.h"
#include "lib/film.h"
+#include "lib/warnings.h"
+DCPOMATIC_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
+
class wxNotebook;
class Film;
class ContentPanel;
class DCPPanel;
class FilmViewer;
class wxNotebook;
class Film;
class ContentPanel;
class DCPPanel;
class FilmViewer;
+
/** @class FilmEditor
* @brief A wx widget to edit a film's metadata, and perform various functions.
*/
class FilmEditor : public wxPanel
{
public:
/** @class FilmEditor
* @brief A wx widget to edit a film's metadata, and perform various functions.
*/
class FilmEditor : public wxPanel
{
public:
- FilmEditor (wxWindow *,
FilmViewer*
viewer);
+ FilmEditor (wxWindow *,
std::weak_ptr<FilmViewer>
viewer);
- void set_film (boost::shared_ptr<Film>);
+ void set_film (std::shared_ptr<Film>);
+ void first_shown ();
boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
boost::signals2::signal<void (void)> SelectionChanged;
boost::signals2::signal<void (boost::filesystem::path)> FileChanged;
boost::signals2::signal<void (void)> SelectionChanged;
@@
-51,13
+59,15
@@
public:
return _content_panel;
}
return _content_panel;
}
-
boost
::shared_ptr<Film> film () const {
+
std
::shared_ptr<Film> film () const {
return _film;
}
return _film;
}
+private:
+
/* Handle changes to the model */
/* Handle changes to the model */
- void film_change
d (
Film::Property);
- void film_content_change
d (
int);
+ void film_change
(ChangeType,
Film::Property);
+ void film_content_change
(ChangeType type,
int);
void set_general_sensitivity (bool);
void active_jobs_changed (boost::optional<std::string>);
void set_general_sensitivity (bool);
void active_jobs_changed (boost::optional<std::string>);
@@
-67,5
+77,5
@@
public:
DCPPanel* _dcp_panel;
/** The film we are editing */
DCPPanel* _dcp_panel;
/** The film we are editing */
-
boost
::shared_ptr<Film> _film;
+
std
::shared_ptr<Film> _film;
};
};