From 9fd79fb05fa47833ed431d83d73fd6d9a4a9f774 Mon Sep 17 00:00:00 2001
From: Carl Hetherington <cth@carlh.net>
Date: Fri, 17 Jan 2014 22:16:05 +0000
Subject: Asset -> MXF in some cases.

---
 src/cpl.cc | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

(limited to 'src/cpl.cc')

diff --git a/src/cpl.cc b/src/cpl.cc
index 843f98d9..55683b64 100644
--- a/src/cpl.cc
+++ b/src/cpl.cc
@@ -21,9 +21,9 @@
 #include "cpl.h"
 #include "parse/cpl.h"
 #include "util.h"
-#include "mono_picture_asset.h"
-#include "stereo_picture_asset.h"
-#include "sound_asset.h"
+#include "mono_picture_mxf.h"
+#include "stereo_picture_mxf.h"
+#include "sound_mxf.h"
 #include "subtitle_asset.h"
 #include "parse/asset_map.h"
 #include "reel.h"
@@ -94,8 +94,8 @@ CPL::CPL (boost::filesystem::path directory, string file, list<PathAssetMap> ass
 		_fps = p->edit_rate.numerator;
 		_length += p->duration;
 
-		shared_ptr<PictureAsset> picture;
-		shared_ptr<SoundAsset> sound;
+		shared_ptr<PictureMXF> picture;
+		shared_ptr<SoundMXF> sound;
 		shared_ptr<SubtitleAsset> subtitle;
 
 		/* Some rather twisted logic to decide if we are 3D or not;
@@ -109,7 +109,7 @@ CPL::CPL (boost::filesystem::path directory, string file, list<PathAssetMap> ass
 			try {
 				pair<string, shared_ptr<const parse::AssetMapAsset> > asset = asset_from_id (asset_maps, p->id);
 
-				picture.reset (new MonoPictureAsset (asset.first, asset.second->chunks.front()->path));
+				picture.reset (new MonoPictureMXF (asset.first, asset.second->chunks.front()->path));
 
 				picture->read ();
 				picture->set_edit_rate (_fps);
@@ -129,7 +129,7 @@ CPL::CPL (boost::filesystem::path directory, string file, list<PathAssetMap> ass
 			try {
 				pair<string, shared_ptr<const parse::AssetMapAsset> > asset = asset_from_id (asset_maps, p->id);
 
-				picture.reset (new StereoPictureAsset (asset.first, asset.second->chunks.front()->path));
+				picture.reset (new StereoPictureMXF (asset.first, asset.second->chunks.front()->path));
 
 				picture->read ();
 				picture->set_edit_rate (_fps);
@@ -153,7 +153,7 @@ CPL::CPL (boost::filesystem::path directory, string file, list<PathAssetMap> ass
 			try {
 				pair<string, shared_ptr<const parse::AssetMapAsset> > asset = asset_from_id (asset_maps, (*i)->asset_list->main_sound->id);
 			
-				sound.reset (new SoundAsset (asset.first, asset.second->chunks.front()->path));
+				sound.reset (new SoundMXF (asset.first, asset.second->chunks.front()->path));
 				shared_ptr<parse::MainSound> s = (*i)->asset_list->main_sound;
 
 				sound->read ();
-- 
cgit v1.2.3