ogreal-svn/patch.patch

   1 Index: src/OgreALSound.cpp
   2 ===================================================================
   3 --- src/OgreALSound.cpp (revision 137)
   4 +++ src/OgreALSound.cpp (working copy)
   5 @@ -1066,7 +1066,10 @@
   6
   7         void Sound::queueBuffers()
   8         {
   9 -               alSourceQueueBuffers(mSource, mNumBuffers, mBuffers);
  10 +                if (mNumBuffers == 1)
  11 +                    alSourcei(mSource, AL_BUFFER, mBuffers[0]);
  12 +                else
  13 +                    alSourceQueueBuffers(mSource, mNumBuffers, mBuffers);
  14                 CheckError(alGetError(), "Failed to bind Buffer");
  15         }
  16
  17 @@ -1079,15 +1082,8 @@
  18                 ** it wasn't playing.
  19                 */
  20                 alSourceStop(mSource);
  21 +                alSourcei(mSource, AL_BUFFER, 0);
  22                 CheckError(alGetError(), "Failed to stop sound");
  23 -
  24 -               int queued;
  25 -               alGetSourcei(mSource, AL_BUFFERS_QUEUED, &queued);
  26 -               CheckError(alGetError(), "Failed to get Source");
  27 -
  28 -               alSourceUnqueueBuffers(mSource, queued, mBuffers);
  29 -               CheckError(alGetError(), "Failed to unqueue Buffers");
  30 -
  31
  32                 mBuffersQueued = false;
  33         }
  34 Index: configure.ac
  35 ===================================================================
  36 --- configure.ac        (revision 137)
  37 +++ configure.ac        (working copy)
  38 @@ -24,8 +24,6 @@
  39  dnl Chekcing for OpenAL
  40  PKG_CHECK_MODULES(OPENAL, openal)
  41
  42 -dnl The Demos require OIS
  43 -PKG_CHECK_MODULES(OIS, OIS)
  44
  45  dnl You may want to export each var individually
  46  AC_SUBST(OGREAL_CFLAGS,"$OGRE_CFLAGS $VORBIS_FLAGS $OPENAL_FLAGS")
  47 Index: Makefile.am
  48 ===================================================================
  49 --- Makefile.am (revision 137)
  50 +++ Makefile.am (working copy)
  51 @@ -1,4 +1,4 @@
  52 -SUBDIRS = include src Demos
  53 +SUBDIRS = include src
  54  pkgconfigdir = $(libdir)/pkgconfig
  55  pkgconfig_DATA = OgreAL.pc
  56  EXTRA_DIST = bootstrap README LICENSE