From 923b347356a289e09a7adfe28008cac776250ffc Mon Sep 17 00:00:00 2001
From: Niels Martin Hansen <nielsm@aegisub.org>
Date: Sat, 5 Jul 2008 12:50:49 +0000
Subject: [PATCH] Some more checking in PCM provider. Had apparently missed a
 way EnsureRangeAceesibleble() could fail. This means of failure should no
 longer be possible.

Originally committed to SVN as r2240.
---
 aegisub/audio_provider_pcm.cpp |  3 ++-
 configure.in                   | 24 ++++++++++++++----------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/aegisub/audio_provider_pcm.cpp b/aegisub/audio_provider_pcm.cpp
index f55c29ad0..39fcdc368 100644
--- a/aegisub/audio_provider_pcm.cpp
+++ b/aegisub/audio_provider_pcm.cpp
@@ -141,7 +141,7 @@ char * PCMAudioProvider::EnsureRangeAccessible(int64_t range_start, int64_t rang
 	}
 
 	// Check whether the requested range is already visible
-	if (range_start < mapping_start || range_start+range_length > mapping_start+(int64_t)mapping_length) {
+	if (!current_mapping || range_start < mapping_start || range_start+range_length > mapping_start+(int64_t)mapping_length) {
 
 		// It's not visible, change the current mapping
 		
@@ -200,6 +200,7 @@ char * PCMAudioProvider::EnsureRangeAccessible(int64_t range_start, int64_t rang
 
 	}
 
+	assert(current_mapping);
 	assert(range_start >= mapping_start);
 
 	// Difference between actual current mapping start and requested range start
diff --git a/configure.in b/configure.in
index 3d803c109..d81e52470 100644
--- a/configure.in
+++ b/configure.in
@@ -71,7 +71,7 @@ AC_C_BIGENDIAN(
     AC_DEFINE([HAVE_BIG_ENDIAN], [1], [Big Endian]),
     AC_DEFINE([HAVE_LITTLE_ENDIAN], [1], [Little Endian]),
     AC_DEFINE([HAVE_DYNAMIC_ENDIAN], [1], [Unknown endian]),
-    AC_DEFINE([HAVE_UNIVERSAL_ENDIAN], [1], [Universal Endian (MAC Universal PPC/Intel Binaries, uses HAVE_DYNAMIC_ENDIAN)])
+    AC_DEFINE([HAVE_UNIVERSAL_ENDIAN], [1], [Universal Endian (MAC Universal PPC/Intel Binaries, detecting correct during build)])
 )
 
 
@@ -204,15 +204,19 @@ if test "$agi_with_opengl" = "no"; then
 	AC_MSG_FAILURE([Please install a working OpenGL library.])
 fi
 
-AC_AGI_COMPILE([OpenGLU], [openglu], [$GL_CFLAGS], [$GL_LIBS -lGLU],[
-#include <GL/glu.h>
-int main(void) {
-  return 0;
-}])
-
-if test "$agi_with_openglu" = "no"; then
-	AC_MSG_FAILURE([Please install a working OpenGL GLU library.])
-fi
+#AC_AGI_COMPILE([OpenGLU], [openglu], [$GL_CFLAGS], [$GL_LIBS -lGLU],[
+##ifdef __APPLE__
+##include <OpenGL/glu.h>
+##else
+##include <GL/glu.h>
+##endif
+#int main(void) {
+#  return 0;
+#}])
+#
+#if test "$agi_with_openglu" = "no"; then
+#	AC_MSG_FAILURE([Please install a working OpenGL GLU library.])
+#fi
 
 
 ###########