X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscreen.h;h=5e8f1f9759723ddcb7b3e8fe4e9bbd605458f685;hb=72b11d5eb036651b6ff68edf3ed270e8fc52960f;hp=6e3b8b01dc32b0342100b80de96e900e355587cb;hpb=ffa5a512112809e2256cae7a01afcd14c99c83a6;p=dcpomatic.git diff --git a/src/lib/screen.h b/src/lib/screen.h index 6e3b8b01d..5e8f1f975 100644 --- a/src/lib/screen.h +++ b/src/lib/screen.h @@ -1,19 +1,20 @@ /* - Copyright (C) 2013-2015 Carl Hetherington + Copyright (C) 2013-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 . */ @@ -33,16 +34,19 @@ class Cinema; class Screen { public: - Screen (std::string const & n, boost::optional rec) + Screen (std::string const & n, boost::optional rec, std::vector td) : name (n) , recipient (rec) + , trusted_devices (td) {} - Screen (cxml::ConstNodePtr); + explicit Screen (cxml::ConstNodePtr); void as_xml (xmlpp::Element *) const; boost::shared_ptr cinema; std::string name; + std::string notes; boost::optional recipient; + std::vector trusted_devices; };