godotengine
/
godot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'libao'

This commit is contained in:
Anton Yabchinskiy 2014-11-28 17:16:55 +03:00
parent 6bfdfa041a c29239a6f9
commit fff056bdc5
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/ao/audio_driver_ao.cpp
View File

@ -6,6 +6,7 @@
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014 Anton Yabchinskiy. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */
@ -28,6 +29,8 @@
/*************************************************************************/ /*************************************************************************/
#include "audio_driver_ao.h" #include "audio_driver_ao.h"
#ifdef AO_ENABLED
#include "globals.h" #include "globals.h"
#include "os/os.h" #include "os/os.h"
@ -154,3 +157,5 @@ AudioDriverAO::AudioDriverAO() {
AudioDriverAO::~AudioDriverAO() { AudioDriverAO::~AudioDriverAO() {
ao_shutdown(); ao_shutdown();
}; };
#endif

1
drivers/ao/audio_driver_ao.h
View File

@ -6,6 +6,7 @@
/* http://www.godotengine.org */ /* http://www.godotengine.org */
/*************************************************************************/ /*************************************************************************/
/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ /* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */
/* Copyright (c) 2014 Anton Yabchinskiy. */
/* */ /* */
/* Permission is hereby granted, free of charge, to any person obtaining */ /* Permission is hereby granted, free of charge, to any person obtaining */
/* a copy of this software and associated documentation files (the */ /* a copy of this software and associated documentation files (the */