From 39938752ce46f32c1fb9d3df6fa59a44b1529b5f Mon Sep 17 00:00:00 2001 From: Josh Glover Date: Thu, 18 Mar 2010 08:41:52 +0000 Subject: [PATCH 1/7] mv src/test/audio/audio_manager.cc src/audio/test_audio_manager.cc --- src/{test/audio/audio_manager.cc => audio/test_audio_manager.cc} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/{test/audio/audio_manager.cc => audio/test_audio_manager.cc} (100%) diff --git a/src/test/audio/audio_manager.cc b/src/audio/test_audio_manager.cc similarity index 100% rename from src/test/audio/audio_manager.cc rename to src/audio/test_audio_manager.cc From 1dd49d9f348b123bb84a46968dcb56b7b8395134 Mon Sep 17 00:00:00 2001 From: Josh Glover Date: Thu, 18 Mar 2010 08:42:52 +0000 Subject: [PATCH 2/7] Added test driver main() to test_audio_manager.cc --- src/audio/test_audio_manager.cc | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/src/audio/test_audio_manager.cc b/src/audio/test_audio_manager.cc index fa26e34..87c4a7b 100644 --- a/src/audio/test_audio_manager.cc +++ b/src/audio/test_audio_manager.cc @@ -29,9 +29,9 @@ */ -#include +#include "audio/audio_manager.h" -#include "audio/audio_manager" +#include namespace audio { @@ -65,3 +65,10 @@ namespace audio } } // namespace{} + + +int main(int argc, char **argv) { + ::testing::InitGoogleTest(&argc, argv); + + return RUN_ALL_TESTS(); +} From f24a96be2a9c842277ae2722a66643f9ce242883 Mon Sep 17 00:00:00 2001 From: Josh Glover Date: Thu, 18 Mar 2010 08:44:10 +0000 Subject: [PATCH 3/7] Added unit test stuff to src/audio/Makefile.am --- src/audio/Makefile.am | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 5dacde1..cfa56bf 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -45,3 +45,11 @@ _sdl_la_LIBADD = $(SDL_LIBS) -lSDL_mixer -ladonthell_audio -lstdc++ ## define dependencies in case of parallel build _sdl_la_DEPENDENCIES = libadonthell_audio.la +## Unit tests +noinst_PROGRAMS = test_audio_manager + +test_audio_manager_SOURCES = test_audio_manager.cc audio_manager.o + +test_audio_manager_LDADD = $(libadonthell_audio_la_LIBADD) -lgtest + +TESTS = test_audio_manager From a6b5ac02a522a8694480b942b39ed446bf106a86 Mon Sep 17 00:00:00 2001 From: Josh Glover Date: Thu, 18 Mar 2010 08:53:03 +0000 Subject: [PATCH 4/7] Added audio_manager to adonthell_audio_SRCS and _HEADERS in src/audio/CMakeLists.txt --- src/audio/CMakeLists.txt | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/audio/CMakeLists.txt b/src/audio/CMakeLists.txt index 842922e..fe2a1cc 100644 --- a/src/audio/CMakeLists.txt +++ b/src/audio/CMakeLists.txt @@ -4,11 +4,13 @@ set(adonthell_audio_SRCS sound.cc audio_event.cc audio_event_manager.cc + audio_manager.cc ) set(adonthell_audio_HEADERS audio_event.h audio_event_manager.h + audio_manager.h audio.h sound.h ) From 2bb949cedd7d33562724b9fa6f952b4212e0b75d Mon Sep 17 00:00:00 2001 From: Josh Glover Date: Thu, 18 Mar 2010 09:01:24 +0000 Subject: [PATCH 5/7] Added test_audio_manager_CXXFLAGS to src/audio/Makefile.am --- src/audio/Makefile.am | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index cfa56bf..79fe03d 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -48,8 +48,8 @@ _sdl_la_DEPENDENCIES = libadonthell_audio.la ## Unit tests noinst_PROGRAMS = test_audio_manager -test_audio_manager_SOURCES = test_audio_manager.cc audio_manager.o - -test_audio_manager_LDADD = $(libadonthell_audio_la_LIBADD) -lgtest +test_audio_manager_SOURCES = $(libadonthell_audio_la_SOURCES) test_audio_manager.cc +test_audio_manager_CXXFLAGS = $(libadonthell_audio_la_CXXFLAGS) +test_audio_manager_LDADD = $(libadonthell_audio_la_LIBADD) -lgtest TESTS = test_audio_manager From 2c4144578168ebd9cedcef138736fe8cd89b187c Mon Sep 17 00:00:00 2001 From: Josh Glover Date: Thu, 18 Mar 2010 09:06:42 +0000 Subject: [PATCH 6/7] Added audio_manager to pkgincludeaudio_HEADERS and libadonthell_audio_la_SOURCES in src/audio/Makefile.am --- src/audio/Makefile.am | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/src/audio/Makefile.am b/src/audio/Makefile.am index 79fe03d..5abad45 100644 --- a/src/audio/Makefile.am +++ b/src/audio/Makefile.am @@ -8,6 +8,7 @@ pkgincludeaudio_HEADERS = \ audio.h \ audio_event.h \ audio_event_manager.h \ + audio_manager.h \ sound.h ## Main library @@ -17,7 +18,8 @@ libadonthell_audio_la_SOURCES = \ audio.cc \ sound.cc \ audio_event.cc \ - audio_event_manager.cc + audio_event_manager.cc \ + audio_manager.cc libadonthell_audio_la_CXXFLAGS = $(PY_CFLAGS) -DPKGLIBDIR=\"$(pkglibdir)\" $(AM_CXXFLAGS) libadonthell_audio_la_LIBADD = $(PY_LIBS) -lltdl -lstdc++ \ From 587563a1ed03667ed3bae47832c67e7face978ee Mon Sep 17 00:00:00 2001 From: Josh Glover Date: Thu, 18 Mar 2010 09:58:23 +0000 Subject: [PATCH 7/7] Added all static members to audio_manager.cc --- src/audio/audio_manager.cc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/src/audio/audio_manager.cc b/src/audio/audio_manager.cc index 22b6d13..07bb556 100644 --- a/src/audio/audio_manager.cc +++ b/src/audio/audio_manager.cc @@ -33,6 +33,13 @@ namespace audio { + // Static data must be initialised + int audio_manager::audio_rate_; + u_int16 audio_manager::audio_format_; + int audio_manager::audio_channels_; + int audio_manager::audio_buffers_; + int audio_manager::audio_mixchannels_; + bool audio_manager::set_audio_rate(const int audio_rate) { audio_rate_ = audio_rate;