Merge branch 'master' of github.com:scummvm/scummvm into mortevielle

Conflicts:
	base/plugins.cpp
	configure

1 files changed, 148 insertions, 0 deletions

diff --git a/engines/wintermute/video/video_theora_player.h b/engines/wintermute/video/video_theora_player.h
new file mode 100644
index 0000000000..593c1b9666
--- /dev/null
+++ b/engines/wintermute/video/video_theora_player.h
@@ -0,0 +1,148 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * 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 the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ */
+
+/*
+ * This file is based on WME Lite.
+ * http://dead-code.org/redir.php?target=wmelite
+ * Copyright (c) 2011 Jan Nedoma
+ */
+
+#ifndef WINTERMUTE_VIDTHEORAPLAYER_H
+#define WINTERMUTE_VIDTHEORAPLAYER_H
+
+#include "engines/wintermute/base/base.h"
+#include "engines/wintermute/persistent.h"
+#include "video/video_decoder.h"
+#include "common/stream.h"
+#include "graphics/surface.h"
+
+namespace Wintermute {
+class BaseSurface;
+class BaseImage;
+class VideoTheoraPlayer : public BaseClass {
+private:
+	enum {
+		THEORA_STATE_NONE = 0,
+		THEORA_STATE_PLAYING = 1,
+		THEORA_STATE_PAUSED = 2,
+		THEORA_STATE_FINISHED = 3
+	};
+	Video::VideoDecoder *_theoraDecoder;
+	Graphics::Surface _surface;
+public:
+	DECLARE_PERSISTENT(VideoTheoraPlayer, BaseClass)
+
+	VideoTheoraPlayer(BaseGame *inGame);
+	virtual ~VideoTheoraPlayer(void);
+
+	// external objects
+	Common::SeekableReadStream *_file;
+	Common::String _filename;
+
+	BaseSurface *_texture;
+	//CVidSubtitler *_subtitler;
+
+	// control methods
+	bool initialize(const Common::String &filename, const Common::String &subtitleFile = NULL);
+	bool initializeSimple();
+	bool update();
+	bool play(TVideoPlayback type = VID_PLAY_CENTER, int x = 0, int y = 0, bool freezeGame = false, bool freezeMusic = true, bool looping = false, uint32 startTime = 0, float forceZoom = -1.0f, int volume = -1);
+	bool stop();
+	bool display(uint32 alpha = 0xFFFFFFFF);
+
+	bool pause();
+	bool resume();
+
+	bool isPlaying()  {
+		return _state == THEORA_STATE_PLAYING;
+	};
+	bool isFinished() {
+		return _state == THEORA_STATE_FINISHED;
+	};
+	bool isPaused()   {
+		return _state == THEORA_STATE_PAUSED;
+	};
+
+	uint32 getMovieTime();
+
+	BaseSurface *getTexture();
+
+	int _state;
+	uint32 _startTime;
+
+	int _savedState;
+	uint32 _savedPos;
+
+
+	// alpha related
+	BaseImage *_alphaImage;
+	Common::String _alphaFilename;
+	bool setAlphaImage(const Common::String &filename);
+	__inline byte getAlphaAt(int x, int y);
+	void writeAlpha();
+
+	bool seekToTime(uint32 Time);
+
+
+	void cleanup();
+	bool resetStream();
+
+	// video properties
+	TVideoPlayback _playbackType;
+	int _posX;
+	int _posY;
+	float _playZoom;
+	int _volume;
+
+	bool _looping;
+	bool _dontDropFrames;
+	bool _freezeGame;
+	uint32 _currentTime;
+
+
+private:
+	// seeking support
+	bool _seekingKeyframe;
+	float _timeOffset;
+
+	bool _frameRendered;
+
+	bool getIsFrameReady() {
+		return _videoFrameReady;
+	}
+private:
+	bool _audioFrameReady;
+	bool _videoFrameReady;
+	float _videobufTime;
+
+	bool writeVideo();
+
+	bool _playbackStarted;
+
+	// helpers
+	void SetDefaults();
+
+};
+
+} // end of namespace Wintermute
+
+#endif