projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
dcp_video.h
diff --git
a/src/lib/dcp_video.h
b/src/lib/dcp_video.h
index 05aa0ff7c31b9e56aea469eb20f050adc6e3ded6..32cd1a1699ac56382ee547c04830af88b0808777 100644
(file)
--- a/
src/lib/dcp_video.h
+++ b/
src/lib/dcp_video.h
@@
-1,25
+1,25
@@
/*
/*
- Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
- Taken from code Copyright (C) 2010-2011 Terrence Meiczinger
+ Copyright (C) 2012-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/>.
*/
#include "types.h"
*/
#include "types.h"
-#include "server_description.h"
+#include "
encode_
server_description.h"
#include <libcxml/cxml.h>
#include <dcp/data.h>
#include <libcxml/cxml.h>
#include <dcp/data.h>
@@
-46,7
+46,7
@@
public:
DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
dcp::Data encode_locally (dcp::NoteHandler note);
DCPVideo (boost::shared_ptr<const PlayerVideo>, cxml::ConstNodePtr, boost::shared_ptr<Log>);
dcp::Data encode_locally (dcp::NoteHandler note);
- dcp::Data encode_remotely (ServerDescription, int timeout = 30);
+ dcp::Data encode_remotely (
Encode
ServerDescription, int timeout = 30);
int index () const {
return _index;
int index () const {
return _index;