Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / types.h

diff --git a/src/types.h b/src/types.h
index 0f05d889f07db6a406c17a2208de683f7221c27e..807c4df0db51a664b3a0db04c2c108f7ecc84a7b 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of libdcp.
+
+    libdcp 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,
+    libdcp 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 libdcp.  If not, see <http://www.gnu.org/licenses/>.
+
+    In addition, as a special exception, the copyright holders give
+    permission to link the code of portions of this program with the
+    OpenSSL library under certain conditions as described in each
+    individual source file, and distribute linked combinations
+    including the two.
+
+    You must obey the GNU General Public License in all respects
+    for all of the code used other than OpenSSL.  If you modify
+    file(s) with this exception, you may extend this exception to your
+    version of the file(s), but you are not obligated to do so.  If you
+    do not wish to do so, delete this exception statement from your
+    version.  If you delete this exception statement from all source
+    files in the program, then also delete it here.
 */
 
 /** @file  src/types.h
@@ -54,6 +68,10 @@ struct Size
        int height;
 };
 
+extern bool operator== (Size const & a, Size const & b);
+extern bool operator!= (Size const & a, Size const & b);
+extern std::ostream& operator<< (std::ostream& s, Size const & a);
+
 /** Identifier for a sound channel */
 enum Channel {
        LEFT = 0,      ///< left
@@ -140,7 +158,7 @@ class Fraction
 public:
        /** Construct a fraction of 0/0 */
        Fraction () : numerator (0), denominator (0) {}
-       Fraction (std::string s);
+       explicit Fraction (std::string s);
        /** Construct a fraction with a specified numerator and denominator.
         *  @param n Numerator.
         *  @param d Denominator.
@@ -214,8 +232,11 @@ enum Standard {
 
 enum Formulation {
        MODIFIED_TRANSITIONAL_1,
+       MULTIPLE_MODIFIED_TRANSITIONAL_1,
        DCI_ANY,
-       DCI_SPECIFIC
+       DCI_SPECIFIC,
+       /** For testing: adds no AuthorizedDeviceInfo tag */
+       MODIFIED_TRANSITIONAL_TEST
 };
 
 /** @class Colour
@@ -226,12 +247,13 @@ class Colour
 public:
        Colour ();
        Colour (int r_, int g_, int b_);
-       Colour (std::string argb_hex);
+       explicit Colour (std::string argb_hex);
 
        int r; ///< red component, from 0 to 255
        int g; ///< green component, from 0 to 255
        int b; ///< blue component, from 0 to 255
 
+       std::string to_rgb_string () const;
        std::string to_argb_string () const;
 };