[Scummvm-cvs-logs] SF.net SVN: scummvm: [23182] scummvm/branches/branch-0-9-0/sound

[anotherguest at users.sourceforge.net]

Revision: 23182
Author:   anotherguest
Date:     2006-06-19 14:06:57 -0700 (Mon, 19 Jun 2006)
ViewCVS:  http://svn.sourceforge.net/scummvm/?rev=23182&view=rev

Log Message:
-----------
Added assert for audio allocation since failure causes serious problems

Modified Paths:
--------------
    scummvm/branches/branch-0-9-0/backends/symbian/src/SymbianActions.cpp
    scummvm/branches/branch-0-9-0/sound/audiostream.cpp
Modified: scummvm/branches/branch-0-9-0/backends/symbian/src/SymbianActions.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/backends/symbian/src/SymbianActions.cpp	2006-06-19 10:31:09 UTC (rev 23181)
+++ scummvm/branches/branch-0-9-0/backends/symbian/src/SymbianActions.cpp	2006-06-19 21:06:57 UTC (rev 23182)
@@ -52,13 +52,13 @@
 };
 
 #ifdef UIQ
-static const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, SDLK_F1, SDLK_F2, SDLK_MENU, SDLK_PAGEDOWN, 0, 0,SDLK_PAGEUP,0,0};
+static const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, SDLK_F1, SDLK_F2, SDLK_F5, SDLK_PAGEDOWN, 0, 0, 0, SDLK_PAGEUP, 0, 0};
 #elif defined (S60)
 const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, '*', '#', '9',0,0,0,0,0};
 #elif defined (S90)
-const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, 0, 0, SDLK_MENU, SDLK_ESCAPE, 0, 0,0,0,0,0};
+const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, 0, 0, SDLK_MENU, SDLK_ESCAPE, 0, 0,0,0,0,0};
 #else
-const int ACTIONS_DEFAULT[ACTION_LAST] = { 0, 0, 0, 0, SDLK_F1, SDLK_F2, SDLK_MENU, SDLK_ESCAPE, 0, 0,0,0,0,0};
+const int ACTIONS_DEFAULT[ACTION_LAST] = { SDLK_UP, SDLK_DOWN, SDLK_LEFT, SDLK_RIGHT, SDLK_F1, SDLK_F2, SDLK_MENU, SDLK_ESCAPE, 0, 0, 0, 0, 0, 0};
 #endif
 
 // creator function according to Factory Pattern

Modified: scummvm/branches/branch-0-9-0/sound/audiostream.cpp
===================================================================
--- scummvm/branches/branch-0-9-0/sound/audiostream.cpp	2006-06-19 10:31:09 UTC (rev 23181)
+++ scummvm/branches/branch-0-9-0/sound/audiostream.cpp	2006-06-19 21:06:57 UTC (rev 23182)
@@ -261,6 +261,8 @@
 		assert((bufferSize & 1) == 0);
 
 	_bufferStart = (byte *)malloc(bufferSize);
+	assert(_bufferStart != NULL);
+
 	_pos = _end = _bufferStart;
 	_bufferEnd = _bufferStart + bufferSize;
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.