X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fpicture_asset_writer_common.cc;h=2caadc6eea9c1f62a1e73f88fe72f78b15932a7d;hb=9f75a44df591954519ac828a1b50b6d5ebd2a3a1;hp=0696bc4862df40e4975226f01c9ec799f99354e7;hpb=6425742f95a4c2e539061b29016a4a5bd10ac9ae;p=libdcp.git

diff --git a/src/picture_asset_writer_common.cc b/src/picture_asset_writer_common.cc
index 0696bc48..2caadc6e 100644
--- 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;
@@ -26,7 +40,7 @@ struct ASDCPStateBase
 	ASDCPStateBase ()
 		: frame_buffer (4 * Kumu::Megabyte)
 	{}
-	
+
 	ASDCP::JP2K::CodestreamParser j2k_parser;
 	ASDCP::JP2K::FrameBuffer frame_buffer;
 	ASDCP::WriterInfo writer_info;
@@ -36,10 +50,10 @@ 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);
-	
+
 	if (ASDCP_FAILURE (state->j2k_parser.OpenReadFrame (data, size, state->frame_buffer))) {
 		boost::throw_exception (MiscError ("could not parse J2K frame"));
 	}
@@ -49,11 +63,11 @@ 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;