summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2015-06-04 16:48:08 +0100
committerCarl Hetherington <cth@carlh.net>2015-06-05 14:34:43 +0100
commit6c55e8d2c3b0129a19fc40dca344219021ad12ef (patch)
treecf9c3244ed55fb1fa8db89ca87923f3b7a6d35a1 /tools
parent2105caa32a12236d5b70a0cf8b9ac62fcf7f574e (diff)
Rename some stuff Content -> Asset.
Diffstat (limited to 'tools')
-rw-r--r--tools/dcpinfo.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/tools/dcpinfo.cc b/tools/dcpinfo.cc
index c278fc2f..119a2106 100644
--- a/tools/dcpinfo.cc
+++ b/tools/dcpinfo.cc
@@ -22,7 +22,7 @@
#include "reel.h"
#include "sound_mxf.h"
#include "picture_mxf.h"
-#include "subtitle_content.h"
+#include "subtitle_asset.h"
#include "reel_picture_asset.h"
#include "reel_sound_asset.h"
#include "reel_subtitle_asset.h"
@@ -80,8 +80,8 @@ main_subtitle (shared_ptr<Reel> reel, bool list_subtitles)
return;
}
- list<SubtitleString> subs = reel->main_subtitle()->subtitle_content()->subtitles ();
- cout << " Subtitle: " << subs.size() << " subtitles in " << reel->main_subtitle()->subtitle_content()->language() << "\n";
+ list<SubtitleString> subs = reel->main_subtitle()->subtitle_asset()->subtitles ();
+ cout << " Subtitle: " << subs.size() << " subtitles in " << reel->main_subtitle()->subtitle_asset()->language() << "\n";
if (list_subtitles) {
BOOST_FOREACH (SubtitleString const& k, subs) {
cout << k << "\n";