Merge branch 'ehofman/sound'

configure.ac

@@ -8,7 +8,7 @@ dnl Require at least automake 2.52
 AC_PREREQ(2.52)
 
 dnl Initialize the automake stuff
-AM_INIT_AUTOMAKE(SimGear, 1.9.1)
+AM_INIT_AUTOMAKE(SimGear, 2.0.0-rc2)
 
 dnl Specify KAI C++ compiler and flags.
 dnl Borrowed with slight modification from blitz distribution.

projects/VC90/SimGear.vcproj

@@ -1003,7 +1003,6 @@
 				RelativePath="..\..\simgear\props\ExtendedPropertyAdapter.hxx"
 				>
 			</File>
-
 			<File
 				RelativePath="..\..\simgear\props\props.cxx"
 				>
@@ -1156,6 +1155,14 @@
 				RelativePath="..\..\simgear\scene\model\SGScaleTransform.hxx"
 				>
 			</File>
+			<File
+				RelativePath="..\..\simgear\scene\model\SGText.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\simgear\scene\model\SGText.hxx"
+				>
+			</File>
 			<File
 				RelativePath="..\..\simgear\scene\model\SGTranslateTransform.cxx"
 				>
@@ -1168,18 +1175,18 @@
 				RelativePath="..\..\simgear\scene\model\shadanim.cxx"
 				>
 			</File>
-			<File
-				RelativePath="..\..\simgear\scene\model\SGText.cxx"
-				>
-			</File>
-			<File
-				RelativePath="..\..\simgear\scene\model\SGText.hxx"
-				>
-			</File>
 		</Filter>
 		<Filter
 			Name="Lib_sgsound"
 			>
+			<File
+				RelativePath="..\..\simgear\sound\sample_group.cxx"
+				>
+			</File>
+			<File
+				RelativePath="..\..\simgear\sound\sample_group.hxx"
+				>
+			</File>
 			<File
 				RelativePath="..\..\simgear\sound\sample_openal.cxx"
 				>
@@ -1952,7 +1959,7 @@
 			</File>
 		</Filter>
 		<File
-			RelativePath="..\..\simgear\simgear_config.h-msvc71"
+			RelativePath="..\..\simgear\simgear_config.h-msvc90"
 			>
 			<FileConfiguration
 				Name="Release|Win32"

simgear/math/SGGeoc.hxx

@@ -79,6 +79,8 @@ public:
   static double courseDeg(const SGGeoc& from, const SGGeoc& to);
   static double distanceM(const SGGeoc& from, const SGGeoc& to);
 
+  // Compare two geocentric positions for equality
+  bool operator == ( const SGGeoc & other ) const;
 private:
   /// This one is private since construction is not unique if you do
   /// not know the units of the arguments, use the factory methods for
@@ -323,6 +325,15 @@ SGGeoc::distanceM(const SGGeoc& from, const SGGeoc& to)
   return SGGeodesy::distanceM(from, to);
 }
 
+inline
+bool
+SGGeoc::operator == ( const SGGeoc & other ) const
+{
+  return _lon == other._lon &&
+         _lat == other._lat &&
+         _radius == other._radius;
+}
+
 /// Output to an ostream
 template<typename char_type, typename traits_type>
 inline

simgear/math/SGGeod.hxx

@@ -86,6 +86,9 @@ public:
   /// Set the geodetic elevation from the argument given in feet
   void setElevationFt(double elevation);
 
+  // Compare two geodetic positions for equality
+  bool operator == ( const SGGeod & other ) const;
+
 #ifndef NO_OPENSCENEGRAPH_INTERFACE
   // Create a local coordinate frame in the earth-centered frame of
   // reference. X points north, Z points down.
@@ -350,6 +353,15 @@ SGGeod::setElevationFt(double elevation)
   _elevation = elevation*SG_FEET_TO_METER;
 }
 
+inline
+bool
+SGGeod::operator == ( const SGGeod & other ) const
+{
+  return _lon == other._lon &&
+         _lat == other._lat &&
+         _elevation == other._elevation;
+}
+
 /// Output to an ostream
 template<typename char_type, typename traits_type>
 inline

simgear/props/AtomicChangeListener.cxx

@@ -1,3 +1,8 @@
+
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "AtomicChangeListener.hxx"
 
 #include <algorithm>

simgear/scene/material/EffectBuilder.hxx

@@ -266,7 +266,7 @@ public:
         else
             return itr->second.ptr();
     }
-    template<typename T> friend class InstallAttributeBuilder;
+    template<typename T> friend struct InstallAttributeBuilder;
 };
 
 template<typename T>

simgear/scene/tgdb/TreeBin.cxx

@@ -19,6 +19,10 @@
  *
  */
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include <algorithm>
 #include <vector>
 #include <string>

simgear/scene/util/CopyOp.cxx

@@ -17,6 +17,10 @@
 // Free Software Foundation, Inc., 59 Temple Place - Suite 330,
 // Boston, MA  02111-1307, USA.
 
+#ifdef HAVE_CONFIG_H
+#  include <simgear_config.h>
+#endif
+
 #include "CopyOp.hxx"
 
 #include <simgear/scene/material/Effect.hxx>

simgear/simgear_config.h-msvc90

@@ -0,0 +1,157 @@
+/* simgear_config.h.  Generated for MSCV++ 9.0 */
+
+/* Define if the X Window System is missing or not being used.  */
+#define X_DISPLAY_MISSING 1
+
+/* Define to empty if the keyword does not work.  */
+/* #undef const */
+
+/* Define if you don't have vprintf but do have _doprnt.  */
+/* #undef HAVE_DOPRNT */
+
+/* Define if you have the vprintf function.  */
+#define HAVE_VPRINTF 1
+
+/* Define to package name */
+#define PACKAGE "FlightGear"
+
+/* Define as the return type of signal handlers (int or void).  */
+#define RETSIGTYPE void
+
+/* Define to `unsigned' if <sys/types.h> doesn't define.  */
+/* #undef size_t */
+
+/* Define if you have the ANSI C header files.  */
+#define STDC_HEADERS 1
+
+/* Define if you can safely include both <sys/time.h> and <time.h>.  */
+/* #undef TIME_WITH_SYS_TIME */
+
+/* Define if your <sys/time.h> declares struct tm.  */
+/* #define TM_IN_SYS_TIME 1 */
+
+/* Define to version number */
+#define VERSION "1.99.4"
+
+/* Define if compiling on a Winbloze (95, NT, etc.) platform */
+#define WIN32 1
+
+/* Define if you have the GetLocalTime function.  */
+#define HAVE_GETLOCALTIME 1
+
+/* Define if you have the ftime function.  */
+/* #define HAVE_FTIME 1 */
+
+/* Define if you have the getitimer function.  */
+/* #define HAVE_GETITIMER 1 */
+
+/* Define if you have the getrusage function.  */
+/* #define HAVE_GETRUSAGE 1 */
+
+/* Define if you have the gettimeofday function.  */
+/* #define HAVE_GETTIMEOFDAY 1 */
+
+/* Define if you have the mktime function.  */
+#define HAVE_MKTIME 1
+
+/* Define if you have the rand function.  */
+#define HAVE_RAND 1
+
+/* Define if you have the random function.  */
+#define HAVE_RANDOM 1
+
+/* Define if you have the rint function.  */
+/* #define HAVE_RINT 1 */
+
+/* Define if you have the setitimer function.  */
+/* #define HAVE_SETITIMER 1 */
+
+/* Define if you have the signal function.  */
+#define HAVE_SIGNAL 1
+
+/* Define if you have the strstr function.  */
+#define HAVE_STRSTR 1
+
+/* Define if you have the <fcntl.h> header file.  */
+#define HAVE_FCNTL_H 1
+
+/* Define if you have the <getopt.h> header file.  */
+/* #define HAVE_GETOPT_H 1 */
+
+/* Define if you have the <malloc.h> header file.  */
+#define HAVE_MALLOC_H 1
+
+/* Define if you have the <stdlib.h> header file.  */
+#define HAVE_STDLIB_H 1
+
+/* Define if you have the <sys/time.h> header file.  */
+/* #define HAVE_SYS_TIME_H 1 */
+
+/* Define if you have the <sys/timeb.h> header file.  */
+#define HAVE_SYS_TIMEB_H 1
+
+/* Define if you have the <unistd.h> header file.  */
+/* #define HAVE_UNISTD_H 1 */
+
+/* Define if you have the <values.h> header file.  */
+/* #define HAVE_VALUES_H 1 */
+
+/* Define if you have the <winbase.h> header file.  */
+#define HAVE_WINBASE_H 1
+
+/* Define if you have the <windows.h> header file.  */
+#define HAVE_WINDOWS_H 1
+
+/* Define if you have the GL library (-lGL).  */
+#define HAVE_LIBGL 1
+
+/* Define if you have the GLU library (-lGLU).  */
+#define HAVE_LIBGLU 1
+
+/* Define if you have the GLcore library (-lGLcore).  */
+/* #undef HAVE_LIBGLCORE */
+
+/* Define if you have the ICE library (-lICE).  */
+/* #define HAVE_LIBICE 1 */
+
+/* Define if you have the MesaGL library (-lMesaGL).  */
+/* #undef HAVE_LIBMESAGL */
+
+/* Define if you have the MesaGLU library (-lMesaGLU).  */
+/* #undef HAVE_LIBMESAGLU */
+
+/* Define if you have the SM library (-lSM).  */
+/* #define HAVE_LIBSM 1 */
+
+/* Define if you have the X11 library (-lX11).  */
+/* #define HAVE_LIBX11 1 */
+
+/* Define if you have the Xext library (-lXext).  */
+/* #define HAVE_LIBXEXT 1 */
+
+/* Define if you have the Xi library (-lXi).  */
+/* #define HAVE_LIBXI 1 */
+
+/* Define if you have the Xmu library (-lXmu).  */
+/* #define HAVE_LIBXMU 1 */
+
+/* Define if you have the Xt library (-lXt).  */
+/* #define HAVE_LIBXT 1 */
+
+/* Define if you have the glut library (-lglut).  */
+#define HAVE_LIBGLUT 1
+
+/* Define if you have the m library (-lm).  */
+#define HAVE_LIBM 1
+
+/* Define if you have the socket library (-lsocket).  */
+/* #undef HAVE_LIBSOCKET */
+
+/* Define if you have the <memory.h> header file.  */
+#define HAVE_MEMORY_H 1
+
+#define HAVE_MEMCPY 1
+
+#define GLUT_H <GL/glut.h>
+
+#define NOMINMAX 1

simgear/sound/soundmgr_openal.cxx

@@ -110,7 +110,9 @@ void SGSoundMgr::init(const char *devname) {
         }
     }
 
+    _device = device;
     ALCcontext *context = alcCreateContext(device, NULL);
+    testForALCError("context creation.");
     if ( testForError(context, "Unable to create a valid context.") ) {
         alcCloseDevice (device);
         return;
@@ -162,7 +164,7 @@ void SGSoundMgr::init(const char *devname) {
 
     _vendor = (const char *)alGetString(AL_VENDOR);
     _renderer = (const char *)alGetString(AL_RENDERER);
-    if ( _vendor != "OpenAL Community" ||
+    if ( (_vendor != "OpenAL Community" && _vendor != "Apple Computer Inc.") ||
         (_renderer != "Software" && _renderer != "OpenAL Sample Implementation")
        )
     {
@@ -552,8 +554,9 @@ bool SGSoundMgr::load(string &samplepath, void **dbuf, int *fmt,
 
 #if defined(ALUT_API_MAJOR_VERSION) && ALUT_API_MAJOR_VERSION >= 1
     ALfloat freqf;
-    testForALError("load file");
-    testForALCError("load file");
+    // ignore previous errors to prevent the system from halting on silly errors
+    alGetError();
+    alcGetError(_device);
     data = alutLoadMemoryFromFile(samplepath.c_str(), &format, &size, &freqf );
     freq = (ALsizei)freqf;
     int error = alutGetError();