use software volume for ALSA

git-svn-id: svn://svn.code.sf.net/p/rdesktop/code/trunk/rdesktop@1260 423420c4-83ab-492f-b58f-81f9feb106b5
This commit is contained in:
Michael Gernoth 2006-09-17 15:33:29 +00:00
parent 7ef82f75c7
commit 306a72ffe9

View File

@ -22,6 +22,7 @@
#include "rdesktop.h" #include "rdesktop.h"
#include "rdpsnd.h" #include "rdpsnd.h"
#include "rdpsnd_dsp.h"
#include <unistd.h> #include <unistd.h>
#include <fcntl.h> #include <fcntl.h>
#include <errno.h> #include <errno.h>
@ -206,18 +207,6 @@ alsa_set_format(WAVEFORMATEX * pwfx)
return True; return True;
} }
void
alsa_volume(uint16 left, uint16 right)
{
static int warned = 0;
if (!warned)
{
warning("volume changes currently not supported with alsa-output\n");
warned = 1;
}
}
void void
alsa_play(void) alsa_play(void)
{ {
@ -293,7 +282,7 @@ alsa_register(char *options)
alsa_driver.wave_out_close = alsa_close; alsa_driver.wave_out_close = alsa_close;
alsa_driver.wave_out_format_supported = alsa_format_supported; alsa_driver.wave_out_format_supported = alsa_format_supported;
alsa_driver.wave_out_set_format = alsa_set_format; alsa_driver.wave_out_set_format = alsa_set_format;
alsa_driver.wave_out_volume = alsa_volume; alsa_driver.wave_out_volume = rdpsnd_dsp_softvol_set;
alsa_driver.wave_out_play = alsa_play; alsa_driver.wave_out_play = alsa_play;
alsa_driver.name = xstrdup("alsa"); alsa_driver.name = xstrdup("alsa");
alsa_driver.description = xstrdup("ALSA output driver, default device: " DEFAULTDEVICE); alsa_driver.description = xstrdup("ALSA output driver, default device: " DEFAULTDEVICE);