fixed name collision

git-svn-id: svn://svn.code.sf.net/p/actiongame/code/trunk/ac@3794 e016b1c5-ed68-44aa-a2f7-31cac88cffde
This commit is contained in:
driAn
2008-11-29 00:25:14 +00:00
parent 5a22bb2ef8
commit 61c6ed5f67
5 changed files with 14 additions and 14 deletions
+3 -3
View File
@@ -27,7 +27,7 @@ oggstream::oggstream() : valid(false), isopen(false), src(NULL)
reset();
// grab a source and keep it during the whole lifetime
src = sourcescheduler::default().newsource(SP_HIGHEST, camera1->o);
src = sourcescheduler::instance().newsource(SP_HIGHEST, camera1->o);
if(src)
{
if(src->valid)
@@ -37,7 +37,7 @@ oggstream::oggstream() : valid(false), isopen(false), src(NULL)
}
else
{
sourcescheduler::default().releasesource(src);
sourcescheduler::instance().releasesource(src);
src = NULL;
}
}
@@ -53,7 +53,7 @@ oggstream::~oggstream()
{
reset();
if(src) sourcescheduler::default().releasesource(src);
if(src) sourcescheduler::instance().releasesource(src);
if(alIsBuffer(bufferids[0]) || alIsBuffer(bufferids[1]))
{