Merge branch 'master' of ssh://git.carlh.net/home/carl/git/libdcp

[libdcp.git] / src / sound_asset_writer.h

diff --git a/src/sound_asset_writer.h b/src/sound_asset_writer.h
index 0263942327687edb800fbe7b86411b4036909512..b2de9e8eed4182a5034734751594f46ef821b75f 100644 (file)
--- a/src/sound_asset_writer.h
+++ b/src/sound_asset_writer.h
@@ -37,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
@@ -63,7 +63,7 @@ public:
 private:
        friend class SoundAsset;
 
-       SoundAssetWriter (SoundAsset *, boost::filesystem::path, Standard standard);
+       SoundAssetWriter (SoundAsset *, boost::filesystem::path);
 
        void write_current_frame ();
 
@@ -74,7 +74,7 @@ private:
        struct ASDCPState;
        boost::shared_ptr<ASDCPState> _state;
 
-       SoundAsset* _sound_asset;
+       SoundAsset* _asset;
        int _frame_buffer_offset;
 };