[Scummvm-cvs-logs] SF.net SVN: scummvm: [26106] scummvm/trunk/engines/scumm/smush
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Mon Mar 12 20:53:37 CET 2007
Revision: 26106
http://scummvm.svn.sourceforge.net/scummvm/?rev=26106&view=rev
Author: anotherguest
Date: 2007-03-12 12:53:36 -0700 (Mon, 12 Mar 2007)
Log Message:
-----------
Special filehandling for Symbian OS not needed in smushplayer anymore.
Modified Paths:
--------------
scummvm/trunk/engines/scumm/smush/smush_player.cpp
scummvm/trunk/engines/scumm/smush/smush_player.h
Modified: scummvm/trunk/engines/scumm/smush/smush_player.cpp
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.cpp 2007-03-12 19:19:30 UTC (rev 26105)
+++ scummvm/trunk/engines/scumm/smush/smush_player.cpp 2007-03-12 19:53:36 UTC (rev 26106)
@@ -215,13 +215,6 @@
_inTimer = true;
_inTimerCount++;
#endif
-#ifdef __SYMBIAN32__
- if (_closeOnTextTick) {
- delete _base;
- _base = NULL;
- _closeOnTextTick = false;
- }
-#endif
}
SmushPlayer::SmushPlayer(ScummEngine_v7 *scumm) {
@@ -263,9 +256,6 @@
_inTimerCount = 0;
_inTimerCountRedraw = ConfMan.getInt("Smush_force_redraw");
#endif
-#ifdef __SYMBIAN32__
- _closeOnTextTick = false;
-#endif
}
SmushPlayer::~SmushPlayer() {
@@ -300,14 +290,6 @@
}
void SmushPlayer::release() {
-#ifdef __SYMBIAN32__
- _closeOnTextTick = true;
- // Wait for _closeOnTextTick to be set to false to indicate file closure
- while (_closeOnTextTick) {
- User::After(15624);
- }
-#endif
-
_vm->_smushVideoShouldFinish = true;
for (int i = 0; i < 5; i++) {
Modified: scummvm/trunk/engines/scumm/smush/smush_player.h
===================================================================
--- scummvm/trunk/engines/scumm/smush/smush_player.h 2007-03-12 19:19:30 UTC (rev 26105)
+++ scummvm/trunk/engines/scumm/smush/smush_player.h 2007-03-12 19:53:36 UTC (rev 26106)
@@ -86,9 +86,6 @@
int16 _inTimerCount;
int16 _inTimerCountRedraw;
#endif
-#ifdef __SYMBIAN32__
- bool _closeOnTextTick;
-#endif
public:
SmushPlayer(ScummEngine_v7 *scumm);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list