summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2014-02-05 13:15:39 +0000
committerCarl Hetherington <cth@carlh.net>2014-02-05 13:15:39 +0000
commit5d2236bf466ea8592344791e926b075be339c3dc (patch)
tree75956c717e3cf490f92ef29259a536199986e922
parentf9862aff32f7ea5aa10f9362d7598480b1c9cf28 (diff)
Fix previous.
-rw-r--r--src/sound_frame.cc2
-rw-r--r--src/sound_frame.h1
-rw-r--r--src/sound_mxf.h22
3 files changed, 13 insertions, 12 deletions
diff --git a/src/sound_frame.cc b/src/sound_frame.cc
index da0da194..c79b29b3 100644
--- 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 de58a034..26f738d3 100644
--- 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 04ec8aeb..8d1f8db3 100644
--- 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
};
}