libsoundio + libsndfile audio backend

.gitmodules

@@ -27,3 +27,6 @@
 [submodule "vendor/gorilla-audio"]
   path = vendor/gorilla-audio
   url = https://github.com/IceDragon200/gorilla-audio.git
+[submodule "vendor/libsoundio"]
+	path = vendor/libsoundio
+	url = https://github.com/andrewrk/libsoundio

.travis.yml

@@ -2,18 +2,25 @@ language: cpp
 sudo: false
 addons:
   apt:
-    sources:
+    sources: &sources
     - george-edison55-precise-backports
-    packages:
+    - ubuntu-toolchain-r-test
+    packages: &deps
     - cmake
     - cmake-data
     - freeglut3-dev
     - freetype
+    - libasound2-dev
     - libdevil-dev
+    - libflac-dev
     - libgles2-mesa-dev
     - libglew-dev
     - libglu1-mesa-dev
+    - libogg-dev
     - libopenal-dev
+    - libpulse-dev
+    - libvorbis-dev
+    - libvorbisenc2
     - libx11-dev
     - libxi-dev
     - libxmu-dev
@@ -23,15 +30,40 @@ matrix:
   include:
     - os: linux
       compiler: gcc
-      env: MOON_MRUBY_TOOLCHAIN=gcc
-
+      env:
+        - MOON_MRUBY_TOOLCHAIN=gcc
+        - COMPILER=g++-4.9
+      before_install:
+        - export CC="gcc-4.9"
+        - export CXX="g++-4.9"
+      addons:
+        apt:
+          sources:
+            - *sources
+          packages:
+            - *deps
+            - gcc-4.9
+            - g++-4.9
     - os: linux
       compiler: clang
       env:
       - MOON_MRUBY_TOOLCHAIN=clang
+      - COMPILER=clang++-3.7
       - LD_LIBRARY_PATH: "${TRAVIS_BUILD_DIR}/build/vendor/glfw/src"
+      before_install:
+      - export CC="clang-3.7"
+      - export CXX="clang++-3.7"
+      addons:
+        apt:
+          sources:
+            - *sources
+            - llvm-toolchain-precise-3.7
+          packages:
+            - *deps
+            - clang-3.7
 
     - os: osx
+      osx_image: xcode7.3
       compiler: clang
       env:
       - MOON_MRUBY_TOOLCHAIN=clang

CMakeLists.txt

@@ -4,12 +4,19 @@ project(moon)
 
 find_library(YAML yaml)
 
+include(cmake/BuildSndfile.cmake)
+
 add_subdirectory("vendor/sil")
 # cmake doesn't like relative paths for include dirs, so we'll need the absolute
 # path instead
 get_filename_component(SIL_INCLUDE_DIR "vendor/sil/include" ABSOLUTE)
 add_subdirectory("vendor/soil")
 add_subdirectory("vendor/gorilla-audio/build")
+set(ENABLE_JACK OFF)
+set(BUILD_EXAMPLE_PROGRAMS OFF)
+set(BUILD_TESTS OFF)
+set(BUILD_DYNAMIC_LIBS OFF)
+add_subdirectory("vendor/libsoundio")
 #add_subdirectory("vendor/glm")
 
 option(freetype-gl_BUILD_DEMOS OFF)
@@ -30,7 +37,7 @@ if(RAKE_VERBOSE)
 endif(RAKE_VERBOSE)
 
 add_custom_target(moon-mruby ALL
-  DEPENDS SIL SOIL glfw freetype-gl gorilla
+  DEPENDS SIL SOIL glfw freetype-gl gorilla libsoundio_static libsndfile
   COMMAND rake ${RAKE_VERBOSE_FLAG} MRUBY_CONFIG="${CMAKE_SOURCE_DIR}/mrb_config.rb"
   WORKING_DIRECTORY "${CMAKE_SOURCE_DIR}/vendor/mruby"
 )

README.md

@@ -4,11 +4,11 @@
 [![Coverity Scan Build Status](https://img.shields.io/coverity/scan/5666.svg)](https://scan.coverity.com/projects/5666)
 
 ## Introduction
-Moon is a experimental prototyping 2D Game Engine written in C++ and scripted using [mruby](https://github.com/mruby/mruby).
+Moon is a experimental 2D game engine prototype written in C++ and scripted using [mruby](https://github.com/mruby/mruby).
 
 
 ## Supported
-Currently testing is done linux, moon may not run or even compile on other systems. If you managed to get Moon running on your system, please open a PR and share your changes to get it built.
+Currently we have builds fo Linux and OS X. Moon may not run or even compile on other systems. If you managed to get Moon running on your system, please open a PR and share your changes to get it built.
 
 
 ## Requirements
@@ -24,14 +24,19 @@ ruby >= 1.9.2
   yard (for docs)
 
 # runtime
-OpenAL
+OpenAL # for gorilla audio
 OpenGL
 
 # For dependency docs
 doxygen
 
 # for mruby-yaml
 yaml
+
+# for libsndfile
+flac
+libogg
+libvorbis
 ```
 
 ## Support

cmake/BuildSndfile.cmake

@@ -0,0 +1,12 @@
+include(ExternalProject)
+
+set(SNDFILE_TARBALL "libsndfile-1.0.27")
+
+ExternalProject_Add(libsndfile
+  URL http://www.mega-nerd.com/libsndfile/files/${SNDFILE_TARBALL}.tar.gz
+  BUILD_IN_SOURCE 1
+  INSTALL_DIR vendor/libsndfile
+  CONFIGURE_COMMAND ./configure --prefix=${CMAKE_BINARY_DIR}/vendor/libsndfile --disable-shared
+  BUILD_COMMAND $(MAKE) V=1
+  INSTALL_COMMAND $(MAKE) install
+)

modules/audio-gorilla/include/moon/gorilla/audio.hxx → modules/audio-gorilla/include/moon/audio/gorilla/audio.hxx

@@ -1,9 +1,10 @@
-#ifndef MOON_AUDIO_H
-#define MOON_AUDIO_H
+#ifndef MOON_AUDIO_GORILLA_H
+#define MOON_AUDIO_GORILLA_H
 
 /* Gorilla Audio */
 #include <gorilla/ga.h>
 #include <gorilla/gau.h>
+#define MOON_AUDIO_BACKEND "gorilla"
 
 namespace Moon {
   class Audio {
@@ -14,6 +15,7 @@ namespace Moon {
     static ga_Mixer* GetMixer();
     static ga_StreamManager* GetStreamMgr();
   protected:
+    static bool m_initialized;
     static gau_Manager* m_mgr;
     static ga_Mixer* m_mixer;
     static ga_StreamManager* m_streamMgr;

modules/audio-gorilla/include/moon/gorilla/music.hxx → modules/audio-gorilla/include/moon/audio/gorilla/music.hxx

@@ -1,7 +1,7 @@
 #ifndef MOON_MUSIC_H
 #define MOON_MUSIC_H
 
-#include "moon/gorilla/audio.hxx"
+#include "moon/audio/gorilla/audio.hxx"
 
 namespace Moon {
   struct Music {

modules/audio-gorilla/mrbgem.rake

@@ -17,9 +17,9 @@ MRuby::Gem::Specification.new('mruby-moon-audio-gorilla') do |spec|
     cc.flags << '-Wextra'
   end
 
-  #spec.cxx do |cxx|
-  #  cxx.flags << '-std=c++11'
-  #end
+  spec.linker do |l|
+    l.libraries << 'gorilla'
+  end
 
   spec.add_dependency 'mruby-moon-system'
 end

modules/audio-gorilla/src/audio.cxx

@@ -1,4 +1,4 @@
-#include "moon/gorilla/audio.hxx"
+#include "moon/audio/gorilla/audio.hxx"
 
 namespace Moon {
   gau_Manager* Audio::m_mgr = NULL;
@@ -41,4 +41,3 @@ namespace Moon {
     return m_streamMgr;
   };
 }
-

modules/audio-gorilla/src/mrb_moon_audio.cxx

@@ -1,8 +1,8 @@
 #include <mruby.h>
 #include <mruby/class.h>
-#include "moon/gorilla/audio.hxx"
-#include "moon/gorilla/mrb/music.hxx"
-#include "moon/gorilla/mrb/sound.hxx"
+#include "moon/audio/gorilla/audio.hxx"
+#include "moon/audio/gorilla/mrb/music.hxx"
+#include "moon/audio/gorilla/mrb/sound.hxx"
 
 /* Call once per step/frame to update the internal Audio module.
 */

modules/audio-gorilla/src/mrb_music.cxx

@@ -2,8 +2,8 @@
 #include <mruby/class.h>
 #include <mruby/data.h>
 #include <mruby/numeric.h>
-#include "moon/gorilla/mrb/music.hxx"
-#include "moon/gorilla/music.hxx"
+#include "moon/audio/gorilla/mrb/music.hxx"
+#include "moon/audio/gorilla/music.hxx"
 #include "moon/api.h"
 #include "moon/intern.h"
 

modules/audio-gorilla/src/mrb_sound.cxx

@@ -2,8 +2,8 @@
 #include <mruby/class.h>
 #include <mruby/data.h>
 #include <mruby/numeric.h>
-#include "moon/gorilla/mrb/sound.hxx"
-#include "moon/gorilla/audio.hxx"
+#include "moon/audio/gorilla/mrb/sound.hxx"
+#include "moon/audio/gorilla/audio.hxx"
 #include "moon/api.h"
 #include "moon/intern.h"
 
@@ -16,7 +16,7 @@ sound_free(mrb_state *mrb, void *p)
   }
 }
 
-MOON_C_API const struct mrb_data_type sound_data_type = { "Sound", sound_free };
+MOON_C_API const struct mrb_data_type sound_data_type = { "Moon::Sound", sound_free };
 
 static inline ga_Sound*
 get_sound(mrb_state *mrb, mrb_value self)

modules/audio-libsoundio/include/moon/audio/libsoundio/audio.hxx

@@ -0,0 +1,45 @@
+#ifndef MOON_AUDIO_H
+#define MOON_AUDIO_H
+
+#include "moon/intern.h"
+#include <vector>
+#include <soundio/soundio.h>
+#define MOON_AUDIO_BACKEND "libsoundio"
+#include "moon/audio/libsoundio/mixer.hxx"
+#include "moon/audio/libsoundio/music.hxx"
+#include "moon/audio/libsoundio/sound.hxx"
+
+namespace Moon {
+	class Audio {
+		public:
+			enum ErrorCode {
+				MOON_AUDIO_OK,
+				// SoundIO failed to create
+				MOON_AUDIO_CREATE_ERROR,
+				// could not establish a connection to the audio server/device
+				MOON_AUDIO_CONNECTION_ERROR,
+				// There is no default device present
+				MOON_AUDIO_NO_DEVICE,
+				// The device specified by the index, has gone away or does not exist
+				MOON_AUDIO_DEVICE_MISSING,
+				// Could not open a stream for audio output
+				MOON_AUDIO_COULD_NOT_OPEN_STREAM,
+				// The specified channel layout is not supported
+				MOON_AUDIO_STREAM_CHANNEL_LAYOUT_ERROR,
+				// Stream could not be started
+				MOON_AUDIO_STREAM_START_ERROR
+			};
+
+			static ErrorCode Initialize();
+			static void Update();
+			static void Terminate();
+            static Mixer* m_mixer;
+		protected:
+			static bool m_initialized;
+			static struct SoundIo* m_soundIO;
+			static struct SoundIoDevice* m_device;
+			static struct SoundIoOutStream* m_outStream;
+	};
+};
+
+#endif

modules/audio-libsoundio/include/moon/audio/libsoundio/handle.hxx

@@ -0,0 +1,28 @@
+#ifndef MOON_AUDIO_LIBSOUNDIO_HANDLE_H
+#define MOON_AUDIO_LIBSOUNDIO_HANDLE_H
+
+#include "moon/intern.h"
+#include <vector>
+#include <soundio/soundio.h>
+#include "moon/audio/libsoundio/source.hxx"
+#include "moon/audio/libsoundio/music.hxx"
+#include "moon/audio/libsoundio/sound.hxx"
+#include "moon/audio/libsoundio/loop.hxx"
+
+namespace Moon {
+  class Handle {
+    public:
+      Handle(Moon::Source* source);
+      ~Handle();
+
+      void mix(struct SoundIoChannelArea *areas, const struct SoundIoChannelLayout &layout, const float sampleRate, unsigned int frames);
+
+      float pan;
+      float pitch;
+      float gain;
+    private:
+      Moon::Source* source; // TODO:mrb_sound/music sources will need to be wrapped... if a source deallocates, the handle will be broken (shared_ptr)
+  };
+};
+
+#endif

modules/audio-libsoundio/include/moon/audio/libsoundio/loop.hxx

@@ -0,0 +1,29 @@
+#ifndef MOON_AUDIO_LIBSOUNDIO_LOOP_H
+#define MOON_AUDIO_LIBSOUNDIO_LOOP_H
+
+#include "moon/intern.h"
+#include <string>
+#include <sndfile.hh>
+#include "moon/audio/libsoundio/source.hxx"
+#include "moon/audio/libsoundio/mixer.hxx"
+
+namespace Moon
+{
+  class Loop : public Source {
+    public:
+      Loop(Moon::Source* source, std::uint32_t trigger, std::uint32_t target);
+      virtual ~Loop();
+
+      int read(float* dst, int frames);
+      std::uint32_t seek(std::uint32_t pos);
+
+      int channels();
+      int sampleRate();
+    private:
+      std::uint32_t trigger;
+      std::uint32_t target;
+      Moon::Source* source; // TODO:mrb_sound/music sources will need to be wrapped... if a source deallocates, the handle will be broken (shared_ptr)
+  };
+};
+
+#endif

modules/audio-libsoundio/include/moon/audio/libsoundio/mixer.hxx

@@ -0,0 +1,21 @@
+#ifndef MOON_AUDIO_LIBSOUNDIO_MIXER_H
+#define MOON_AUDIO_LIBSOUNDIO_MIXER_H
+
+#include "moon/intern.h"
+#include <soundio/soundio.h>
+#include <vector>
+#include "moon/audio/libsoundio/handle.hxx"
+
+namespace Moon
+{
+  class Mixer {
+    public:
+      Mixer();
+
+      void mix(struct SoundIoChannelArea *areas, const struct SoundIoChannelLayout &layout, const float sampleRate, unsigned int frames);
+      std::vector<Handle*> handles;
+    private:
+  };
+}
+
+#endif

modules/audio-libsoundio/include/moon/audio/libsoundio/mrb/music.hxx

@@ -0,0 +1,12 @@
+#ifndef MMRB_MUSIC_H
+#define MMRB_MUSIC_H
+
+#include <mruby.h>
+#include <mruby/class.h>
+#include <mruby/data.h>
+#include "moon/api.h"
+
+MOON_C_API const struct mrb_data_type music_data_type;
+MOON_C_API void mmrb_music_init(mrb_state *mrb, struct RClass *mod);
+
+#endif