Carltonus/0ad
1
0
Fork 0
forked from 0ad/0ad
Code Pull Requests Activity

add error handling: recover and return false if file not found

Browse Source 
This was SVN commit r2264.
This commit is contained in:
janwas 2005-05-09 17:10:52 +00:00
parent b42d5ab207
commit 28b92f3c43
1 changed files with 18 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
source/sound/JSI_Sound.cpp
View File

@ -10,6 +10,12 @@ JSI_Sound::JSI_Sound( const CStr& Filename )
{
const char* fn = Filename.c_str();
m_Handle = snd_open( fn );
// open failed. raising an exception is the only way to report errors,
// since we're in the ctor and don't want to move the open call elsewhere
// (by requiring an explicit open() call).
// will be caught by JSI_Sound::Construct.
if(m_Handle <= 0)
throw (int)m_Handle;
snd_set_pos( m_Handle, 0,0,0, true);
}
@ -116,9 +122,18 @@ JSBool JSI_Sound::Construct( JSContext* cx, JSObject* obj, unsigned int argc, js
if( !ToPrimitive<CStrW>( cx, argv[0], filename ) )
return( JS_FALSE );
JSI_Sound* newObject = new JSI_Sound( filename );
newObject->m_EngineOwned = false;
*rval = OBJECT_TO_JSVAL( newObject->GetScript() );
try
{
JSI_Sound* newObject = new JSI_Sound( filename );
newObject->m_EngineOwned = false;
*rval = OBJECT_TO_JSVAL( newObject->GetScript() );
}
catch(int)
{
// failed, but this can happen easily enough that we don't want to
// return JS_FALSE (since that stops the script).
*rval = JSVAL_NULL;
}
return( JS_TRUE );
}