proteaaudio 0.6.3 → 0.6.4

raw patch · 2 files changed

+21/−17 lines, 2 files

Files

• cbits/proteaaudio_binding.cpp +11/−11
• proteaaudio.cabal +10/−6

@@ -62,25 +62,25 @@  int loaderAvailable(char* suffix) {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return 0;+    if((&audio) == 0) return 0;     return audio.loaderAvailable(suffix); }  void volume(float left, float right) {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return;+    if((&audio) == 0) return;     audio.volume(left,right); }  sample_t sampleFromFile(char* filename, float volume) {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return 0;+    if((&audio) == 0) return 0;     return (int)audio.sampleFromFile(filename, volume); }  sample_t sampleFromMemoryWav(char *data, int size, float volume) {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return 0;+    if((&audio) == 0) return 0;     AudioSample* pSample = loadWavFromMemory((unsigned char*)data, size);     if(!pSample) return 0;     unsigned int ret = audio.sampleFromMemory(*pSample, volume);@@ -90,7 +90,7 @@  sample_t sampleFromMemoryOgg(char *data, int size, float volume) {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return 0;+    if((&audio) == 0) return 0;     AudioSample* pSample = loadOggFromMemory((unsigned char*)data, size);     if(!pSample) return 0;     unsigned int ret = audio.sampleFromMemory(*pSample, volume);@@ -100,37 +100,37 @@  int soundActive() {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return 0;+    if((&audio) == 0) return 0;     return (int)audio.soundActive(); }  void soundStopAll() {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return;+    if((&audio) == 0) return;     audio.soundStop(); }  // sound void soundLoop(sample_t sample, float volumeL, float volumeR, float disparity, float pitch) {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return;+    if((&audio) == 0) return;     audio.soundLoop(sample, volumeL,volumeR,disparity,pitch); }  void soundPlay(sample_t sample, float volumeL, float volumeR, float disparity, float pitch) {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return;+    if((&audio) == 0) return;     audio.soundPlay(sample, volumeL,volumeR,disparity,pitch); }  int soundUpdate(sample_t sample, float volumeL, float volumeR, float disparity, float pitch) {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return 0;+    if((&audio) == 0) return 0;     return audio.soundUpdate(sample, volumeL,volumeR,disparity,pitch); }  int soundStop(sample_t sample) {     DeviceAudio & audio = DeviceAudio::singleton();-    if((&audio) == nullptr) return 0;+    if((&audio) == 0) return 0;     return audio.soundStop(sample); }

@@ -1,15 +1,15 @@ Name:                proteaaudio-Version:             0.6.3-Synopsis:            A wrapper for the proteaaudio library.-Description:         A wrapper for the proteaaudio library. http://viremo.eludi.net/proteaAudio/+Version:             0.6.4+Synopsis:            Simple audio library for Windows/Linux/OSX.+Description:         Simple audio library for Windows/Linux/OSX. Supports Ogg and Wav playback and multichannel mixing. License:             BSD3 License-file:        LICENSE Author:              Csaba Hruska-Maintainer:          csaba (dot) hruska (at) gmail (dot) com+Maintainer:          csaba.hruska@gmail.com Stability:           Experimental Category:            Sound-Tested-With:         GHC == 7.8.3-Cabal-Version:       >= 1.2+Tested-With:         GHC == 7.10.3+Cabal-Version:       >= 1.6 Build-Type:          Simple  Extra-Source-Files:@@ -39,6 +39,10 @@   cbits/stb_vorbis.c    Sound/ProteaAudio.chs++source-repository head+  type:     git+  location: https://github.com/csabahruska/proteaaudio  Library   Build-Depends:        base >= 4 && < 5