projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix build.
[dcpomatic.git]
/
src
/
wx
/
filter_dialog.h
diff --git
a/src/wx/filter_dialog.h
b/src/wx/filter_dialog.h
index 775995f38f9c1fb4972e0594d32264ad010edcaf..aaa43c3e44962818ab8fe0471ad5f5b62d39d4ee 100644
(file)
--- a/
src/wx/filter_dialog.h
+++ b/
src/wx/filter_dialog.h
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2012-202
0
Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-202
1
Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
This file is part of DCP-o-matic.
@@
-18,33
+18,37
@@
*/
*/
+
/** @file src/filter_dialog.h
* @brief A dialog to select FFmpeg filters.
*/
/** @file src/filter_dialog.h
* @brief A dialog to select FFmpeg filters.
*/
-#include "lib/warnings.h"
-DCPOMATIC_DISABLE_WARNINGS
+
+#include <dcp/warnings.h>
+LIBDCP_DISABLE_WARNINGS
#include <wx/wx.h>
#include <wx/wx.h>
-
DCPOMATIC
_ENABLE_WARNINGS
+
LIBDCP
_ENABLE_WARNINGS
#include <boost/signals2.hpp>
#include <boost/signals2.hpp>
+
class Film;
class Filter;
class Film;
class Filter;
+
/** @class FilterDialog
* @brief A dialog to select FFmpeg filters.
*/
class FilterDialog : public wxDialog
{
public:
/** @class FilterDialog
* @brief A dialog to select FFmpeg filters.
*/
class FilterDialog : public wxDialog
{
public:
- FilterDialog
(wxWindow *, std::vector<Filter const *> const
&);
+ FilterDialog
(wxWindow *, std::vector<Filter> const
&);
- boost::signals2::signal<void (std::vector<Filter
const *
>)> ActiveChanged;
+ boost::signals2::signal<void (std::vector<Filter>)> ActiveChanged;
private:
void active_changed ();
void filter_toggled ();
private:
void active_changed ();
void filter_toggled ();
- std::vector<Filter
const *> active
() const;
+ std::vector<Filter
> active
() const;
- std::map<Filter
const *
, wxCheckBox *> _filters;
+ std::map<Filter, wxCheckBox *> _filters;
};
};