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

Oops! Audio engine has vanished :D

Browse Source
This commit is contained in:
Juan Linietsky
2017-01-15 16:06:14 -03:00
parent b24b52d56b
commit b400c69cd4
160 changed files with 618 additions and 24650 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
drivers/alsa/audio_driver_alsa.cpp
View File

@ -46,7 +46,7 @@ Error AudioDriverALSA::init() {
samples_out = NULL;
mix_rate = GLOBAL_DEF("audio/mix_rate",44100);
output_format = OUTPUT_STEREO;
output_format = SPEAKER_MODE_STEREO;
channels = 2;
@ -205,7 +205,7 @@ int AudioDriverALSA::get_mix_rate() const {
return mix_rate;
};
AudioDriverSW::OutputFormat AudioDriverALSA::get_output_format() const {
AudioDriver::SpeakerMode AudioDriverALSA::get_speaker_mode() const {
return output_format;
};

8
drivers/alsa/audio_driver_alsa.h
View File

@ -26,7 +26,7 @@
/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */
/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */
/*************************************************************************/
#include "servers/audio/audio_server_sw.h"
#include "servers/audio_server.h"
#ifdef ALSA_ENABLED
@ -35,7 +35,7 @@
#include <alsa/asoundlib.h>
class AudioDriverALSA : public AudioDriverSW {
class AudioDriverALSA : public AudioDriver {
Thread* thread;
Mutex* mutex;
@ -48,7 +48,7 @@ class AudioDriverALSA : public AudioDriverSW {
static void thread_func(void* p_udata);
unsigned int mix_rate;
OutputFormat output_format;
SpeakerMode output_format;
snd_pcm_uframes_t buffer_size;
snd_pcm_uframes_t period_size;
@ -68,7 +68,7 @@ public:
virtual Error init();
virtual void start();
virtual int get_mix_rate() const;
virtual OutputFormat get_output_format() const;
virtual SpeakerMode get_speaker_mode() const;
virtual void lock();
virtual void unlock();
virtual void finish();