Skip to content
This repository has been archived by the owner on Sep 4, 2019. It is now read-only.

Commit

Permalink
Fixing a compilation error caused by improper use of alDeleteBuffer()
Browse files Browse the repository at this point in the history
  • Loading branch information
Ramprasad Madhavan authored and Ramprasad Madhavan committed Jun 26, 2012
1 parent 7fa8ec3 commit abca0f2
Show file tree
Hide file tree
Showing 9 changed files with 15 additions and 9 deletions.
5 changes: 5 additions & 0 deletions .gitignore
View file
@@ -0,0 +1,5 @@
.metadata/*
*.DS_Store
*.o
HelloOpenAL/arm/*
HelloOpenAL/x86/*
1 change: 1 addition & 0 deletions HelloOpenAL/.cproject
View file
Expand Up @@ -220,4 +220,5 @@
<autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/> <autodiscovery enabled="true" problemReportingEnabled="true" selectedProfileId="com.qnx.tools.ide.qde.managedbuilder.core.qccScannerInfo"/>
</scannerConfigBuildInfo> </scannerConfigBuildInfo>
</storageModule> </storageModule>
<storageModule moduleId="refreshScope"/>
</cproject> </cproject>
2 changes: 1 addition & 1 deletion HelloOpenAL/arm/Makefile
View file
@@ -1,6 +1,6 @@
############################################################################# #############################################################################
# Makefile for building: o.le-v7/cowbell # Makefile for building: o.le-v7/cowbell
# Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 14:29:37 2012 # Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 21:30:22 2012
# Project: ../HelloOpenAL.pro # Project: ../HelloOpenAL.pro
# Template: app # Template: app
# Command: /Developer/SDKs/bbndk-10.0.4-beta/host/macosx/x86/usr/bin/qmake -spec /Developer/SDKs/bbndk-10.0.4-beta/target/qnx6/usr/share/qt4/mkspecs/unsupported/blackberry-armv7le-g++ CONFIG+=device -o Makefile ../HelloOpenAL.pro # Command: /Developer/SDKs/bbndk-10.0.4-beta/host/macosx/x86/usr/bin/qmake -spec /Developer/SDKs/bbndk-10.0.4-beta/target/qnx6/usr/share/qt4/mkspecs/unsupported/blackberry-armv7le-g++ CONFIG+=device -o Makefile ../HelloOpenAL.pro
Expand Down
2 changes: 1 addition & 1 deletion HelloOpenAL/arm/Makefile.Debug
View file
@@ -1,6 +1,6 @@
############################################################################# #############################################################################
# Makefile for building: o.le-v7-g/cowbell # Makefile for building: o.le-v7-g/cowbell
# Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 14:29:37 2012 # Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 21:30:22 2012
# Project: ../HelloOpenAL.pro # Project: ../HelloOpenAL.pro
# Template: app # Template: app
############################################################################# #############################################################################
Expand Down
2 changes: 1 addition & 1 deletion HelloOpenAL/arm/Makefile.Release
View file
@@ -1,6 +1,6 @@
############################################################################# #############################################################################
# Makefile for building: o.le-v7/cowbell # Makefile for building: o.le-v7/cowbell
# Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 14:29:37 2012 # Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 21:30:22 2012
# Project: ../HelloOpenAL.pro # Project: ../HelloOpenAL.pro
# Template: app # Template: app
############################################################################# #############################################################################
Expand Down
6 changes: 3 additions & 3 deletions HelloOpenAL/src/soundmanager.cpp
View file
Expand Up @@ -101,7 +101,7 @@ SoundManager::SoundManager(QString soundDirectory)
if (fread(header, 1, 12, file) != 12) if (fread(header, 1, 12, file) != 12)
{ {
qDebug() << "Invalid header for audio file " << path; qDebug() << "Invalid header for audio file " << path;
alDeleteBuffers(1, mSoundBuffers[fileInfo.fileName()]); alDeleteBuffers(1, &mSoundBuffers[fileInfo.fileName()]);
goto cleanup; goto cleanup;
} }


Expand All @@ -111,7 +111,7 @@ SoundManager::SoundManager(QString soundDirectory)
if (!loadWav(file, mSoundBuffers[fileInfo.fileName()])) if (!loadWav(file, mSoundBuffers[fileInfo.fileName()]))
{ {
qDebug() << "Invalid wav file: " << path; qDebug() << "Invalid wav file: " << path;
alDeleteBuffers(1, mSoundBuffers[fileInfo.fileName()]); alDeleteBuffers(1, &mSoundBuffers[fileInfo.fileName()]);
goto cleanup; goto cleanup;
} }
} }
Expand All @@ -120,7 +120,7 @@ SoundManager::SoundManager(QString soundDirectory)
if (!loadOgg(file, mSoundBuffers[fileInfo.fileName()])) if (!loadOgg(file, mSoundBuffers[fileInfo.fileName()]))
{ {
qDebug() << "Invalid ogg file: " << path; qDebug() << "Invalid ogg file: " << path;
alDeleteBuffers(1, mSoundBuffers[fileInfo.fileName()]); alDeleteBuffers(1, &mSoundBuffers[fileInfo.fileName()]);
goto cleanup; goto cleanup;
} }
} }
Expand Down
2 changes: 1 addition & 1 deletion HelloOpenAL/x86/Makefile
View file
@@ -1,6 +1,6 @@
############################################################################# #############################################################################
# Makefile for building: o/cowbell # Makefile for building: o/cowbell
# Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 14:29:37 2012 # Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 21:30:22 2012
# Project: ../HelloOpenAL.pro # Project: ../HelloOpenAL.pro
# Template: app # Template: app
# Command: /Developer/SDKs/bbndk-10.0.4-beta/host/macosx/x86/usr/bin/qmake -spec /Developer/SDKs/bbndk-10.0.4-beta/target/qnx6/usr/share/qt4/mkspecs/unsupported/blackberry-x86-g++ CONFIG+=simulator -o Makefile ../HelloOpenAL.pro # Command: /Developer/SDKs/bbndk-10.0.4-beta/host/macosx/x86/usr/bin/qmake -spec /Developer/SDKs/bbndk-10.0.4-beta/target/qnx6/usr/share/qt4/mkspecs/unsupported/blackberry-x86-g++ CONFIG+=simulator -o Makefile ../HelloOpenAL.pro
Expand Down
2 changes: 1 addition & 1 deletion HelloOpenAL/x86/Makefile.Debug
View file
@@ -1,6 +1,6 @@
############################################################################# #############################################################################
# Makefile for building: o-g/cowbell # Makefile for building: o-g/cowbell
# Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 14:29:37 2012 # Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 21:30:22 2012
# Project: ../HelloOpenAL.pro # Project: ../HelloOpenAL.pro
# Template: app # Template: app
############################################################################# #############################################################################
Expand Down
2 changes: 1 addition & 1 deletion HelloOpenAL/x86/Makefile.Release
View file
@@ -1,6 +1,6 @@
############################################################################# #############################################################################
# Makefile for building: o/cowbell # Makefile for building: o/cowbell
# Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 14:29:37 2012 # Generated by qmake (2.01a) (Qt 4.8.0) on: Mon Jun 25 21:30:22 2012
# Project: ../HelloOpenAL.pro # Project: ../HelloOpenAL.pro
# Template: app # Template: app
############################################################################# #############################################################################
Expand Down

0 comments on commit abca0f2

Please sign in to comment.