summaryrefslogtreecommitdiff
path: root/src/picture_asset.h
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2013-01-17 20:23:43 +0000
committerCarl Hetherington <cth@carlh.net>2013-01-17 20:23:43 +0000
commitf150c837cdc6eeee8f61e743586ddbaf2a8c8010 (patch)
treef41d9caa339762701e462ce3dd64b786481d2909 /src/picture_asset.h
parent828c320df8c56208a8834971f5d937ce06a4edf2 (diff)
Replace length with intrinsic_duration.
Diffstat (limited to 'src/picture_asset.h')
-rw-r--r--src/picture_asset.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/picture_asset.h b/src/picture_asset.h
index 4bd7e8e4..d2c6f656 100644
--- a/src/picture_asset.h
+++ b/src/picture_asset.h
@@ -35,7 +35,7 @@ class StereoPictureFrame;
class PictureAsset : public MXFAsset
{
public:
- PictureAsset (std::string directory, std::string mxf_name, boost::signals2::signal<void (float)>* progress, int fps, int length);
+ PictureAsset (std::string directory, std::string mxf_name, boost::signals2::signal<void (float)>* progress, int fps, int intrinsic_duration);
/** Write details of this asset to a CPL stream.
* @param s Stream.
@@ -70,7 +70,7 @@ public:
* @param mxf_name Name of MXF file to create.
* @param progress Signal to inform of progress.
* @param fps Frames per second.
- * @param length Length in frames.
+ * @param intrinsic_duration Length of the whole asset in frames.
* @param size Size of images in pixels.
*/
MonoPictureAsset (
@@ -79,7 +79,7 @@ public:
std::string mxf_name,
boost::signals2::signal<void (float)>* progress,
int fps,
- int length,
+ int intrinsic_duration,
Size size
);
@@ -90,7 +90,7 @@ public:
* @param mxf_name Name of MXF file to create.
* @param progress Signal to inform of progress.
* @param fps Frames per second.
- * @param length Length in frames.
+ * @param intrinsic_duration Length of the whole asset in frames.
* @param size Size of images in pixels.
*/
MonoPictureAsset (
@@ -99,11 +99,11 @@ public:
std::string mxf_name,
boost::signals2::signal<void (float)>* progress,
int fps,
- int length,
+ int intrinsic_duration,
Size size
);
- MonoPictureAsset (std::string directory, std::string mxf_name, int fps, int length);
+ MonoPictureAsset (std::string directory, std::string mxf_name, int fps, int intrinsic_duration);
boost::shared_ptr<const MonoPictureFrame> get_frame (int n) const;
bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;
@@ -117,7 +117,7 @@ private:
class StereoPictureAsset : public PictureAsset
{
public:
- StereoPictureAsset (std::string directory, std::string mxf_name, int fps, int length);
+ StereoPictureAsset (std::string directory, std::string mxf_name, int fps, int intrinsic_duration);
boost::shared_ptr<const StereoPictureFrame> get_frame (int n) const;
bool equals (boost::shared_ptr<const Asset> other, EqualityOptions opt, std::list<std::string>& notes) const;