X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdcp_video.h;h=32cd1a1699ac56382ee547c04830af88b0808777;hb=df29125d2f63b5c2e36b373462eac9684d8046e4;hp=05aa0ff7c31b9e56aea469eb20f050adc6e3ded6;hpb=53ca2dda0e9138a251adc186a745f7943fc1abc1;p=dcpomatic.git diff --git a/src/lib/dcp_video.h b/src/lib/dcp_video.h index 05aa0ff7c..32cd1a169 100644 --- a/src/lib/dcp_video.h +++ b/src/lib/dcp_video.h @@ -1,25 +1,25 @@ /* - Copyright (C) 2012-2014 Carl Hetherington - Taken from code Copyright (C) 2010-2011 Terrence Meiczinger + Copyright (C) 2012-2016 Carl Hetherington - 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. - 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 - 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 . */ #include "types.h" -#include "server_description.h" +#include "encode_server_description.h" #include #include @@ -46,7 +46,7 @@ public: DCPVideo (boost::shared_ptr, cxml::ConstNodePtr, boost::shared_ptr); dcp::Data encode_locally (dcp::NoteHandler note); - dcp::Data encode_remotely (ServerDescription, int timeout = 30); + dcp::Data encode_remotely (EncodeServerDescription, int timeout = 30); int index () const { return _index;