chiark
/
gitweb
/
~mdw
/
disorder
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
e83d096
)
alsa code builds again
author
rjk@greenend.org.uk
<>
Sun, 16 Sep 2007 15:20:45 +0000
(16:20 +0100)
committer
rjk@greenend.org.uk
<>
Sun, 16 Sep 2007 15:20:45 +0000
(16:20 +0100)
server/speaker.c
patch
|
blob
|
blame
|
history
diff --git
a/server/speaker.c
b/server/speaker.c
index 98ed297a7896467fe0b9de699a76af19e6b9e77e..b3d62ab800718db677423e189e149fd755b70eec 100644
(file)
--- a/
server/speaker.c
+++ b/
server/speaker.c
@@
-586,7
+586,7
@@
static void play(size_t frames) {
switch(config->speaker_backend) {
#if API_ALSA
switch(config->speaker_backend) {
#if API_ALSA
- case BACKEND_ALSA:
+ case BACKEND_ALSA:
{
snd_pcm_sframes_t pcm_written_frames;
size_t avail_frames;
int err;
snd_pcm_sframes_t pcm_written_frames;
size_t avail_frames;
int err;
@@
-618,6
+618,7
@@
static void play(size_t frames) {
written_frames = pcm_written_frames;
written_bytes = written_frames * bpf;
break;
written_frames = pcm_written_frames;
written_bytes = written_frames * bpf;
break;
+ }
#endif
case BACKEND_COMMAND:
if(avail_bytes > frames * bpf)
#endif
case BACKEND_COMMAND:
if(avail_bytes > frames * bpf)
@@
-903,7
+904,7
@@
int main(int argc, char **argv) {
}
break;
#if API_ALSA
}
break;
#if API_ALSA
- case BACKEND_ALSA:
+ case BACKEND_ALSA:
{
/* We send sample data to ALSA as fast as it can accept it, relying on
* the fact that it has a relatively small buffer to minimize pause
* latency. */
/* We send sample data to ALSA as fast as it can accept it, relying on
* the fact that it has a relatively small buffer to minimize pause
* latency. */
@@
-925,6
+926,7
@@
int main(int argc, char **argv) {
if(alsa_nslots >= 0)
fdno += alsa_nslots;
break;
if(alsa_nslots >= 0)
fdno += alsa_nslots;
break;
+ }
#endif
default:
assert(!"unknown backend");
#endif
default:
assert(!"unknown backend");