From 80d60a1736ff82e65fd7634cd415779c47bc13ed Mon Sep 17 00:00:00 2001 From: Bent Bisballe Nyeng Date: Wed, 24 Sep 2014 08:46:35 +0200 Subject: Virtualise backend and prepare for pulseaudio. --- src/soundplayer.cc | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'src/soundplayer.cc') diff --git a/src/soundplayer.cc b/src/soundplayer.cc index 42196d4..aa05358 100644 --- a/src/soundplayer.cc +++ b/src/soundplayer.cc @@ -27,9 +27,7 @@ */ #include "soundplayer.h" -#include - -#include "mediaconfig.h" +#include "audiobackend.h" #define BUFSZ 512 @@ -49,17 +47,6 @@ SoundPlayer::~SoundPlayer() void SoundPlayer::run() { - ao_initialize(); - - ao_sample_format sf; - memset(&sf, 0, sizeof(sf)); - sf.bits = 16; - sf.rate = SAMPLERATE; - sf.channels = 1; - sf.byte_format = AO_FMT_NATIVE; - - ao_device *dev = ao_open_live(ao_default_driver_id(), &sf, 0); - running = true; short s[BUFSZ]; @@ -71,11 +58,8 @@ void SoundPlayer::run() pread++; } - ao_play(dev, (char *)s, sizeof(s)); + g_audiobackend->write((const char *)s, sizeof(s)); } - - ao_close(dev); - ao_shutdown(); } void SoundPlayer::playSamples(int peer, const char *pcm, size_t size) -- cgit v1.2.3