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 26e4bea6b2cbd56da11d8be64ee8294aaf6e4d93..807c4df0db51a664b3a0db04c2c108f7ecc84a7b 100644 (file)
--- a/src/types.h
+++ b/src/types.h
@@ -15,6 +15,20 @@
 
     You should have received a copy of the GNU General Public License
     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
@@ -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
@@ -232,6 +253,7 @@ public:
        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;
 };