Fix previous.

diff --git a/src/sound_frame.cc b/src/sound_frame.cc
index da0da194baf7f4df99997e29c009bf76e96ee3fc..c79b29b36a576117600348e97c7a70073e922315 100644 (file)
--- a/src/sound_frame.cc
+++ b/src/sound_frame.cc
@@ -32,7 +32,7 @@ using namespace dcp;
 SoundFrame::SoundFrame (boost::filesystem::path mxf_path, int n, ASDCP::AESDecContext* c)
 {
        ASDCP::PCM::MXFReader reader;
-       Kumu::Result_t r = reader.OpenRead (mxf_path.file().c_str());
+       Kumu::Result_t r = reader.OpenRead (mxf_path.string().c_str());
        if (ASDCP_FAILURE (r)) {
                boost::throw_exception (FileError ("could not open MXF file for reading", mxf_path, r));
        }

diff --git a/src/sound_frame.h b/src/sound_frame.h
index de58a034e3fd46cd10f53721d1f6a45006380d4b..26f738d3524c72156a51221864b3d0d6bb20d44c 100644 (file)
--- a/src/sound_frame.h
+++ b/src/sound_frame.h
@@ -25,6 +25,7 @@
 #define LIBDCP_SOUND_FRAME_H
 
 #include <boost/noncopyable.hpp>
+#include <boost/filesystem.hpp>
 #include <stdint.h>
 #include <string>
 

diff --git a/src/sound_mxf.h b/src/sound_mxf.h
index 04ec8aebedb8756758b0596404bc3990cd77a38a..8d1f8db38ff7dbff6dca30c91ce15e25718024a7 100644 (file)
--- a/src/sound_mxf.h
+++ b/src/sound_mxf.h
@@ -17,6 +17,10 @@
 
 */
 
+/** @file  src/sound_mxf.h
+ *  @brief SoundMXF class
+ */
+
 #ifndef LIBDCP_SOUND_MXF_H
 #define LIBDCP_SOUND_MXF_H
 
@@ -30,6 +34,9 @@ namespace dcp
 class SoundFrame;
 class SoundMXFWriter;
 
+/** @class SoundMXF
+ *  @brief Representation of a MXF file containing sound
+ */
 class SoundMXF : public MXF
 {
 public:
@@ -46,18 +53,12 @@ public:
 
        boost::shared_ptr<const SoundFrame> get_frame (int n) const;
 
-       void set_channels (int c) {
-               _channels = c;
-       }
-       
+       /** @return number of channels */
        int channels () const {
                return _channels;
        }
 
-       void set_sampling_rate (int s) {
-               _sampling_rate = s;
-       }
-
+       /** @return sampling rate in Hz */
        int sampling_rate () const {
                return _sampling_rate;
        }
@@ -65,9 +66,8 @@ public:
 private:
        std::string key_type () const;
 
-       /** Number of channels in the asset */
-       int _channels;
-       int _sampling_rate;
+       int _channels;      ///< number of channels
+       int _sampling_rate; ///< sampling rate in Hz
 };
 
 }