projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/master' into 2.0
[dcpomatic.git]
/
src
/
wx
/
video_panel.h
diff --git
a/src/wx/video_panel.h
b/src/wx/video_panel.h
index 4331a97128bea83daba8749ec4d1f6a73f7da532..e17541cd3f8ef3f565549cd7e6564a949e842da0 100644
(file)
--- a/
src/wx/video_panel.h
+++ b/
src/wx/video_panel.h
@@
-22,7
+22,7
@@
*/
#include "lib/film.h"
*/
#include "lib/film.h"
-#include "
film_editor
_panel.h"
+#include "
content_sub
_panel.h"
#include "content_widget.h"
class wxChoice;
#include "content_widget.h"
class wxChoice;
@@
-33,10
+33,10
@@
class wxButton;
/** @class VideoPanel
* @brief The video tab of the film editor.
*/
/** @class VideoPanel
* @brief The video tab of the film editor.
*/
-class VideoPanel : public
FilmEditor
Panel
+class VideoPanel : public
ContentSub
Panel
{
public:
{
public:
- VideoPanel (
FilmEditor
*);
+ VideoPanel (
ContentPanel
*);
void film_changed (Film::Property);
void film_content_changed (int);
void film_changed (Film::Property);
void film_content_changed (int);