X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset_writer.h;h=b2de9e8eed4182a5034734751594f46ef821b75f;hb=63bff141f70aa81e50a7cf927e5110a2bb504ae6;hp=3516efcbd4fc23d08d6d6b4388b41f77393dca12;hpb=9e523d8a4062ad52330dff6c2ba50e54184c9bb2;p=libdcp.git

diff --git a/src/sound_asset_writer.h b/src/sound_asset_writer.h
index 3516efcb..b2de9e8e 100644
--- a/src/sound_asset_writer.h
+++ b/src/sound_asset_writer.h
@@ -1,20 +1,34 @@
 /*
     Copyright (C) 2012-2014 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/sound_asset_writer.h
@@ -23,12 +37,12 @@
 
 #include "asset_writer.h"
 #include "types.h"
+#include "sound_frame.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/filesystem.hpp>
 
 namespace dcp {
 
-class SoundFrame;
 class SoundAsset;
 
 /** @class SoundAssetWriter
@@ -44,12 +58,12 @@ class SoundAssetWriter : public AssetWriter
 {
 public:
 	void write (float const * const *, int);
-	void finalize ();
+	bool finalize ();
 
 private:
 	friend class SoundAsset;
 
-	SoundAssetWriter (SoundAsset *, boost::filesystem::path, Standard standard);
+	SoundAssetWriter (SoundAsset *, boost::filesystem::path);
 
 	void write_current_frame ();
 
@@ -60,9 +74,8 @@ private:
 	struct ASDCPState;
 	boost::shared_ptr<ASDCPState> _state;
 
-	SoundAsset* _sound_asset;
+	SoundAsset* _asset;
 	int _frame_buffer_offset;
 };
 
 }
-