feature(openal): Implements OpenAL audio backend.

Author: OmniBlade

CMakeLists.txt

@@ -39,9 +39,13 @@ if(SYNTAX_CHECK_ONLY)
 endif(SYNTAX_CHECK_ONLY)
 
 # Do we want to build with ffmpeg for audio/video decoding?
-option(W3D_BUILD_OPTION_FFMPEG "Build with ffmpeg." OFF)
+option(W3D_BUILD_OPTION_FFMPEG "Build with ffmpeg." ON)
 add_feature_info(FFMpegBuild W3D_BUILD_OPTION_FFMPEG "Build OpenW3D with FFMpeg")
 
+# Do we want to build with OpenAL/ffmpeg for audio playback?
+cmake_dependent_option(W3D_BUILD_OPTION_OPENAL "Build with openal." ON W3D_BUILD_OPTION_FFMPEG OFF)
+add_feature_info(OpenALBuild W3D_BUILD_OPTION_OPENAL "Build OpenW3D with OpenAL")
+
 if(NOT WIN32)
     add_compile_definitions(__cdecl=)
     add_compile_definitions(__stdcall=)
@@ -58,9 +62,13 @@ if(W3D_BUILD_OPTION_FFMPEG)
     include(ffmpeg)
 endif()
 
+if(W3D_BUILD_OPTION_OPENAL)
+    include(openal)
+endif()
+
 if(WIN32)
     # Do we want to build with bink for video decoding?
-    option(W3D_BUILD_OPTION_BINK "Build with bink." ON)
+    cmake_dependent_option(W3D_BUILD_OPTION_BINK "Build with bink." ON NOT W3D_BUILD_OPTION_FFMPEG OFF)
     add_feature_info(BinkBuild W3D_BUILD_OPTION_BINK "Build OpenW3D with Bink")
 
     if(W3D_BUILD_OPTION_BINK)
@@ -69,7 +77,7 @@ if(WIN32)
     endif()
 
     # Do we want to build with miles for audio playback?
-    option(W3D_BUILD_OPTION_MILES "Build with miles." ON)
+    cmake_dependent_option(W3D_BUILD_OPTION_MILES "Build with miles." ON NOT W3D_BUILD_OPTION_OPENAL OFF)
     add_feature_info(MilesBuild W3D_BUILD_OPTION_MILES "Build OpenW3D with Miles Audio")
 
     if(W3D_BUILD_OPTION_MILES)

Code/BinkMovie/FFMpegPlayer.cpp

@@ -29,7 +29,7 @@ extern "C" {
 	#include <libswscale/swscale.h>
 }
 
-void FFMpegMovieClass::On_Frame(AVFrame *frame, int stream_idx, int stream_type)
+void FFMpegMovieClass::On_Frame(AVFrame *frame, int /* stream_idx */, int stream_type)
 {
 	if (stream_type == AVMEDIA_TYPE_VIDEO) {
 		av_frame_free(&CurrentFrame);

Code/WWAudio/AudibleSound.cpp

@@ -1059,6 +1059,13 @@ AudibleSoundClass::On_Frame_Update (unsigned int /* milliseconds */)
 		m_LogicalSound->Set_Transform (m_Transform);
 	}
 
+	//
+	// OpenAL addition, attempt to queue audio if the handle buffer is streaming.
+	//
+	if (m_SoundHandle != NULL) {
+		m_SoundHandle->Queue_Audio();
+	}
+	
 	return true;
 }
 

Code/WWAudio/AudibleSound.h

@@ -104,6 +104,7 @@ class AudibleSoundClass : public SoundSceneObjClass
 		//////////////////////////////////////////////////////////////////////
 		friend class WWAudioClass;
 		friend class MilesAudioClass;
+		friend class OpenALAudioClass;
 
 		//////////////////////////////////////////////////////////////////////
 		//	Public data types

Code/WWAudio/CMakeLists.txt

@@ -35,7 +35,17 @@ set(WWAUDIO_SRC
     WWAudio.h
 )
 
-if(W3D_BUILD_OPTION_MILES)
+if(W3D_BUILD_OPTION_OPENAL)
+    list(APPEND WWAUDIO_SRC
+        openal/OpenALAudio.h
+        openal/OpenALAudio.cpp
+        openal/FFMpegBuffer.cpp
+        openal/FFMpegBuffer.h
+        openal/OpenALHandle.cpp
+        openal/OpenALHandle.h
+        null/NullUtils.cpp
+    )
+elseif(W3D_BUILD_OPTION_MILES)
     list(APPEND WWAUDIO_SRC
         miles/MilesAudio.h
         miles/MilesAudio.cpp
@@ -70,6 +80,10 @@ if(TARGET milesstub)
     target_link_libraries(wwaudio PRIVATE milesstub)
 endif()
 
+if(TARGET OpenAL::OpenAL)
+    target_link_libraries(wwaudio PRIVATE OpenAL::OpenAL)
+endif()
+
 # This module needs building differently for the level editor
 if (W3D_TOOLS)
     # Targets to build.
@@ -87,6 +101,10 @@ if (W3D_TOOLS)
         target_compile_definitions(wwaudioe PRIVATE W3D_HAS_MILES)
     endif()
 
+    if(TARGET OpenAL::OpenAL)
+        target_link_libraries(wwaudioe PRIVATE OpenAL::OpenAL)
+    endif()
+
     if(TARGET milesstub)
         target_link_libraries(wwaudioe PRIVATE milesstub)
     endif()

Code/WWAudio/SoundScene.h

@@ -161,14 +161,14 @@ class SoundSceneClass
 		//	Debugging
 		//////////////////////////////////////////////////////////////////////		
 		bool						Is_Sound_In_Scene (AudibleSoundClass *sound_obj, bool all = true);
-
+		
+		virtual void			Initialize (void);
 	protected:
 
 		//////////////////////////////////////////////////////////////////////
 		//	Protected methods
 		//////////////////////////////////////////////////////////////////////
 		virtual void			On_Frame_Update (unsigned int milliseconds = 0);
-		virtual void			Initialize (void);
 
 		virtual bool			Is_Logical_Sound_In_Scene (LogicalSoundClass *sound_obj, bool single_shot = false);
 

Code/WWAudio/WWAudio.cpp

@@ -134,6 +134,11 @@ WWAudioClass::WWAudioClass(bool lite)
 
 WWAudioClass::~WWAudioClass (void)
 { 
+	//
+	//	Free the list of logical "types".
+	//
+	Reset_Logical_Types ();
+
 	delete AudioIni;
 	_theInstance = NULL;
 }

Code/WWAudio/miles/MilesAudio.cpp

@@ -122,13 +122,6 @@ MilesAudioClass::~MilesAudioClass (void)
 	WWAudioThreadsClass::End_Delayed_Release_Thread ();
 
 	Shutdown ();
-
-	//
-	//	Free the list of logical "types".
-	//
-	Reset_Logical_Types ();
-
-	return;
 }
 
 

Code/WWAudio/miles/sound2dhandle.h

@@ -64,11 +64,6 @@ class Sound2DHandleClass : public SoundHandleClass
 	//	Public methods
 	///////////////////////////////////////////////////////////////////
 
-	//
-	//	RTTI
-	//
-	Sound2DHandleClass *		As_Sound2DHandleClass (void) override	{ return this; }
-
 	//
 	//	Inherited
 	//

Code/WWAudio/miles/sound3dhandle.h

@@ -64,11 +64,6 @@ class Sound3DHandleClass : public SoundHandleClass
 	//	Public methods
 	///////////////////////////////////////////////////////////////////
 
-	//
-	//	RTTI
-	//
-	Sound3DHandleClass *		As_Sound3DHandleClass (void) override	{ return this; }
-
 	//
 	//	Inherited
 	//