ACCESS: Split setVideo into 2 functions to allow the loading of files…

… out of a container
scummvm · Jan 31, 2015 · e0a9c92 · e0a9c92
1 parent 4cd155c
commit e0a9c92
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 5 deletions.
diff --git a/engines/access/video.cpp b/engines/access/video.cpp
@@ -37,17 +37,13 @@ VideoPlayer::~VideoPlayer() {
 	closeVideo();
 }
 
-
-void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, const FileIdent &videoFile, int rate) {
+void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, int rate) {
 	_vidSurface = vidSurface;
 	vidSurface->_orgX1 = pt.x;
 	vidSurface->_orgY1 = pt.y;
 	_vm->_timers[31]._timer = rate;
 	_vm->_timers[31]._initTm = rate;
 
-	// Open up video stream
-	_videoData = _vm->_files->loadFile(videoFile);
-
 	// Load in header
 	_header._frameCount = _videoData->_stream->readUint16LE();
 	_header._width = _videoData->_stream->readUint16LE();
@@ -80,6 +76,20 @@ void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, const
 	_videoEnd = false;
 }
 
+void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, const Common::String filename, int rate) {
+	// Open up video stream
+	_videoData = _vm->_files->loadFile(filename);
+
+	setVideo(vidSurface, pt, rate);
+}
+
+void VideoPlayer::setVideo(ASurface *vidSurface, const Common::Point &pt, const FileIdent &videoFile, int rate) {
+	// Open up video stream
+	_videoData = _vm->_files->loadFile(videoFile);
+
+	setVideo(vidSurface, pt, rate);
+}
+
 void VideoPlayer::closeVideo() {
 	delete _videoData;
 	_videoData = nullptr;

diff --git a/engines/access/video.h b/engines/access/video.h
@@ -51,6 +51,7 @@ class VideoPlayer : public Manager {
 	Common::Rect _videoBounds;
 
 	void getFrame();
+	void setVideo(ASurface *vidSurface, const Common::Point &pt, int rate);
 public:
 	int _videoFrame;
 	bool _soundFlag;
@@ -64,6 +65,7 @@ class VideoPlayer : public Manager {
 	 * Start up a video
 	 */
 	void setVideo(ASurface *vidSurface, const Common::Point &pt, const FileIdent &videoFile, int rate);
+	void setVideo(ASurface *vidSurface, const Common::Point &pt, const Common::String filename, int rate);
 
 	/**
 	 * Decodes a frame of the video