funguloids/openalsoundsystem.cpp.diff

   1 --- src/openalsoundsystem.cpp   2007-05-22 11:11:46.000000000 -0400
   2 +++ src/openalsoundsystem.cpp.ok        2009-12-12 03:56:37.341800903 -0500
   3 @@ -21,9 +21,9 @@
   4  //
   5  //  3. This notice may not be removed or altered from any source distribution.
   6  //
   7 -//***************************************************************************/
   8 -
   9 -// NOTICE: This file is written by Piet (thanks! :), <funguloids@superpiet.de>,
  10 +//***************************************************************************/
  11 +
  12 +// NOTICE: This file is written by Piet (thanks! :), <funguloids@superpiet.de>,
  13  // for the Linux version of Funguloids.
  14
  15  #include "soundsystem.h"
  16 @@ -266,14 +266,14 @@
  17
  18         int attributes[] = { 0 };
  19         mContext = alcCreateContext(mDevice, attributes);
  20 -       if ( (err = alGetError()) != AL_NO_ERROR) {
  21 +       if ( (err = alcGetError(mDevice)) != ALC_NO_ERROR) {
  22                 LogManager::getSingleton().logMessage("OpanAL: error creating context: " + lastALError(err) );
  23                 return 1;
  24         }
  25  //     check_alc_error("Couldn't create audio context: ");
  26         alcMakeContextCurrent(mContext);
  27  //     check_alc_error("Couldn't select audio context: ");
  28 -       if ( (err = alGetError()) != AL_NO_ERROR) {
  29 +       if ( (err = alcGetError(mDevice)) != ALC_NO_ERROR) {
  30                 LogManager::getSingleton().logMessage("OpanAL: error making context current: " + lastALError(err) );
  31                 return 2;
  32         }
  33 @@ -312,12 +312,12 @@
  34         mSoundChannels->setVolume(vol);
  35
  36         // add a music player
  37 -       mStreamPlayer = new StreamPlayer();
  38 -
  39 -       // Set the music volume
  40 +       mStreamPlayer = new StreamPlayer();
  41 +
  42 +       // Set the music volume
  43         svol = GameApplication::mGameConfig->GetValue("audio", "music_volume", "1.0");
  44         vol = StringConverter::parseReal(svol);
  45 -       mStreamPlayer->setVolume(vol);
  46 +       mStreamPlayer->setVolume(vol);
  47
  48         return 0;
  49  }
  50 @@ -480,14 +480,14 @@
  51         if(mSoundDisabled) return;
  52         if(file.empty()) return;
  53         LogManager::getSingleton().logMessage("Going to play '" + file + "'..");
  54 -       assert(mStreamPlayer);
  55 -
  56 -       // Set the volume
  57 +       assert(mStreamPlayer);
  58 +
  59 +       // Set the volume
  60         String svol = GameApplication::mGameConfig->GetValue("audio", "music_volume", "1.0");
  61         Real vol = StringConverter::parseReal(svol);
  62
  63         mStreamPlayer->play(file);
  64 -       mStreamPlayer->setVolume(vol);
  65 +       mStreamPlayer->setVolume(vol);
  66  }
  67
  68