projects
/
libdcp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add edit_rate accessor.
[libdcp.git]
/
src
/
reel_asset.cc
diff --git
a/src/reel_asset.cc
b/src/reel_asset.cc
index d56a492b837ee225edbc35fddae390f128091c33..46e0bd3c9ce2600fc4d21f0028831522c24290f4 100644
(file)
--- a/
src/reel_asset.cc
+++ b/
src/reel_asset.cc
@@
-1,5
+1,5
@@
/*
/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014
-2015
Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
@@
-17,14
+17,20
@@
*/
*/
+/** @file src/reel_asset.cc
+ * @brief ReelAsset class.
+ */
+
#include "raw_convert.h"
#include "reel_asset.h"
#include "asset.h"
#include "compose.hpp"
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
#include "raw_convert.h"
#include "reel_asset.h"
#include "asset.h"
#include "compose.hpp"
#include <libcxml/cxml.h>
#include <libxml++/libxml++.h>
+#include <iostream>
using std::pair;
using std::pair;
+using std::cout;
using std::string;
using std::stringstream;
using std::make_pair;
using std::string;
using std::stringstream;
using std::make_pair;
@@
-32,8
+38,7
@@
using boost::shared_ptr;
using namespace dcp;
ReelAsset::ReelAsset ()
using namespace dcp;
ReelAsset::ReelAsset ()
- : Object (make_uuid ())
- , _asset_ref (_id)
+ : _asset_ref (_id)
, _edit_rate (Fraction (24, 1))
, _intrinsic_duration (0)
, _entry_point (0)
, _edit_rate (Fraction (24, 1))
, _intrinsic_duration (0)
, _entry_point (0)