From 3e09c0991561d0068b38f054bba81bdc2d21c1e2 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Mon, 24 Nov 2014 15:56:02 +0300 Subject: [PATCH 1/2] Update the list of authors in libao driver sources --- drivers/ao/audio_driver_ao.cpp | 1 + drivers/ao/audio_driver_ao.h | 1 + 2 files changed, 2 insertions(+) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index b42e3af6bb9..50c3ef7fa58 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -6,6 +6,7 @@ /* http://www.godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014 Anton Yabchinskiy. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ diff --git a/drivers/ao/audio_driver_ao.h b/drivers/ao/audio_driver_ao.h index b64b8dce9d6..023e051c8b2 100644 --- a/drivers/ao/audio_driver_ao.h +++ b/drivers/ao/audio_driver_ao.h @@ -6,6 +6,7 @@ /* http://www.godotengine.org */ /*************************************************************************/ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* Copyright (c) 2014 Anton Yabchinskiy. */ /* */ /* Permission is hereby granted, free of charge, to any person obtaining */ /* a copy of this software and associated documentation files (the */ From c29239a6f9b04f0050266b6c4ed8641500d9ed10 Mon Sep 17 00:00:00 2001 From: Anton Yabchinskiy Date: Fri, 28 Nov 2014 17:09:22 +0300 Subject: [PATCH 2/2] Add missing check for AO_ENABLED in audio_driver_ao.cpp --- drivers/ao/audio_driver_ao.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/drivers/ao/audio_driver_ao.cpp b/drivers/ao/audio_driver_ao.cpp index 50c3ef7fa58..a484a5882e5 100644 --- a/drivers/ao/audio_driver_ao.cpp +++ b/drivers/ao/audio_driver_ao.cpp @@ -29,6 +29,8 @@ /*************************************************************************/ #include "audio_driver_ao.h" +#ifdef AO_ENABLED + #include "globals.h" #include "os/os.h" @@ -155,3 +157,5 @@ AudioDriverAO::AudioDriverAO() { AudioDriverAO::~AudioDriverAO() { ao_shutdown(); }; + +#endif