X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Freel_asset.cc;h=46e0bd3c9ce2600fc4d21f0028831522c24290f4;hb=bec7cbcc015814452690a0f702cc41b6f5f56311;hp=d56a492b837ee225edbc35fddae390f128091c33;hpb=fe99eae4b95c5fcf2f3730efad4a18d0cb5c29bc;p=libdcp.git diff --git a/src/reel_asset.cc b/src/reel_asset.cc index d56a492b..46e0bd3c 100644 --- a/src/reel_asset.cc +++ b/src/reel_asset.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2014 Carl Hetherington + Copyright (C) 2014-2015 Carl Hetherington 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 #include +#include using std::pair; +using std::cout; using std::string; using std::stringstream; using std::make_pair; @@ -32,8 +38,7 @@ using boost::shared_ptr; 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)