projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Bump libdcp to fix an error in the player (#2401).
[dcpomatic.git]
/
src
/
lib
/
referenced_reel_asset.h
diff --git
a/src/lib/referenced_reel_asset.h
b/src/lib/referenced_reel_asset.h
index 0d66155b53fb51e13680bd0c1a07f8e01cecb50f..23da7c028663c7d8b7c18ff901612810831b0b41 100644
(file)
--- a/
src/lib/referenced_reel_asset.h
+++ b/
src/lib/referenced_reel_asset.h
@@
-18,23
+18,35
@@
*/
*/
+
#ifndef DCPOMATIC_REFERENCED_REEL_ASSET_H
#define DCPOMATIC_REFERENCED_REEL_ASSET_H
#ifndef DCPOMATIC_REFERENCED_REEL_ASSET_H
#define DCPOMATIC_REFERENCED_REEL_ASSET_H
+
+#include "dcpomatic_time.h"
#include <dcp/reel_asset.h>
#include <dcp/reel_asset.h>
+
+class Film;
+class Playlist;
+
+
class ReferencedReelAsset
{
public:
class ReferencedReelAsset
{
public:
- ReferencedReelAsset (
boost
::shared_ptr<dcp::ReelAsset> asset_, dcpomatic::DCPTimePeriod period_)
+ ReferencedReelAsset (
std
::shared_ptr<dcp::ReelAsset> asset_, dcpomatic::DCPTimePeriod period_)
: asset (asset_)
, period (period_)
{}
/** The asset */
: asset (asset_)
, period (period_)
{}
/** The asset */
-
boost
::shared_ptr<dcp::ReelAsset> asset;
+
std
::shared_ptr<dcp::ReelAsset> asset;
/** Period that this asset covers in the DCP */
dcpomatic::DCPTimePeriod period;
};
/** Period that this asset covers in the DCP */
dcpomatic::DCPTimePeriod period;
};
+
+std::list<ReferencedReelAsset> get_referenced_reel_assets(std::shared_ptr<const Film> film, std::shared_ptr<const Playlist> playlist);
+
+
#endif
#endif