projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Use make_shared<>."
[dcpomatic.git]
/
src
/
wx
/
subtitle_view.h
diff --git
a/src/wx/subtitle_view.h
b/src/wx/subtitle_view.h
index 338742afcaac5575f35bc58bc895b9757967106b..ac8e496ce00402baa1ec74e9c92f15f50f3c3ca2 100644
(file)
--- a/
src/wx/subtitle_view.h
+++ b/
src/wx/subtitle_view.h
@@
-1,19
+1,20
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2016
Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
-
This program
is distributed in the hope that it will be useful,
+
DCP-o-matic
is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
*/
@@
-21,13
+22,13
@@
#include <wx/wx.h>
#include <wx/listctrl.h>
#include <wx/wx.h>
#include <wx/listctrl.h>
-class
Subtitle
Decoder;
+class Decoder;
class SubtitleView : public wxDialog
{
public:
class SubtitleView : public wxDialog
{
public:
- SubtitleView (wxWindow *, boost::shared_ptr<Film>, boost::shared_ptr<
Subtitle
Decoder>, DCPTime position);
+ SubtitleView (wxWindow *, boost::shared_ptr<Film>, boost::shared_ptr<Decoder>, DCPTime position);
-private:
+private:
wxListCtrl* _list;
};
wxListCtrl* _list;
};