X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fsound_asset.h;h=509ae559316bd800a9cde9da2e3f878bf54957e8;hb=9f75a44df591954519ac828a1b50b6d5ebd2a3a1;hp=952ba968df72bc6d74358da2f7cf313893ffae99;hpb=d1f0b2b71a702b5624485cfeacaee5d58c4af5b2;p=libdcp.git
diff --git a/src/sound_asset.h b/src/sound_asset.h
index 952ba968..509ae559 100644
--- a/src/sound_asset.h
+++ b/src/sound_asset.h
@@ -15,6 +15,20 @@
You should have received a copy of the GNU General Public License
along with libdcp. If not, see .
+
+ 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.h
@@ -27,13 +41,13 @@
#include "mxf.h"
#include "types.h"
#include "metadata.h"
+#include "sound_frame.h"
+#include "sound_asset_reader.h"
namespace dcp
{
-class SoundFrame;
class SoundAssetWriter;
-class SoundAssetReader;
/** @class SoundAsset
* @brief Representation of a sound asset
@@ -41,10 +55,10 @@ class SoundAssetReader;
class SoundAsset : public Asset, public MXF
{
public:
- SoundAsset (boost::filesystem::path file);
- SoundAsset (Fraction edit_rate, int sampling_rate, int channels);
+ explicit SoundAsset (boost::filesystem::path file);
+ SoundAsset (Fraction edit_rate, int sampling_rate, int channels, Standard standard);
- boost::shared_ptr start_write (boost::filesystem::path file, Standard standard);
+ boost::shared_ptr start_write (boost::filesystem::path file);
boost::shared_ptr start_read () const;
bool equals (
@@ -72,11 +86,14 @@ public:
}
static bool valid_mxf (boost::filesystem::path);
+ static std::string static_pkl_type (Standard standard);
private:
friend class SoundAssetWriter;
- std::string pkl_type (Standard standard) const;
+ std::string pkl_type (Standard standard) const {
+ return static_pkl_type (standard);
+ }
Fraction _edit_rate;
/** The total length of this content in video frames. The amount of