Fix missing version string when Popen communicate returns byte strings.

[libdcp.git] / src / picture_asset_writer_common.cc

diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc
index 43b843855fcbd8c3a9447a8f0591da18ea20b305..2caadc6eea9c1f62a1e73f88fe72f78b15932a7d 100644 (file)
--- a/src/picture_asset_writer_common.cc
+++ b/src/picture_asset_writer_common.cc
@@ -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.
 */
 
 using boost::shared_ptr;
@@ -36,7 +50,7 @@ struct ASDCPStateBase
 }
 
 template <class P, class Q>
-void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard standard, Q* asset, uint8_t* data, int size)
+void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Q* asset, uint8_t const * data, int size)
 {
        asset->set_file (writer->_file);
 
@@ -50,10 +64,10 @@ void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard stand
        asset->set_size (Size (state->picture_descriptor.StoredWidth, state->picture_descriptor.StoredHeight));
        asset->set_screen_aspect_ratio (Fraction (state->picture_descriptor.AspectRatio.Numerator, state->picture_descriptor.AspectRatio.Denominator));
 
-       asset->fill_writer_info (&state->writer_info, asset->id(), standard);
+       asset->fill_writer_info (&state->writer_info, asset->id());
 
        Kumu::Result_t r = state->mxf_writer.OpenWrite (
-               asset->file().string().c_str(),
+               asset->file()->string().c_str(),
                state->writer_info,
                state->picture_descriptor,
                16384,
@@ -61,7 +75,7 @@ void dcp::start (PictureAssetWriter* writer, shared_ptr<P> state, Standard stand
                );
 
        if (ASDCP_FAILURE (r)) {
-               boost::throw_exception (MXFFileError ("could not open MXF file for writing", asset->file().string(), r));
+               boost::throw_exception (MXFFileError ("could not open MXF file for writing", asset->file()->string(), r));
        }
 
        writer->_started = true;