annotate src/alsa-ng/alsa-core.c @ 3177:1117166277f7

alsa-ng: Mixer support. Should be 100% plug-and-play. alsaplug_guess_mixer_elem() tries to determine the best choice for the mixer. It may need tweaking.
author William Pitcock <nenolod@atheme.org>
date Tue, 09 Jun 2009 23:34:50 -0500
parents dca77b467ea2
children 4634dab72608
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
1 /*
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
2 * Audacious ALSA Plugin (-ng)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
3 * Copyright (c) 2009 William Pitcock <nenolod@dereferenced.org>
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
4 *
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
5 * This program is free software; you can redistribute it and/or modify
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
6 * it under the terms of the GNU General Public License as published by
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
7 * the Free Software Foundation; either version 2 of the License, or
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
8 * (at your option) any later version.
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
9 *
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
10 * This program is distributed in the hope that it will be useful,
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
11 * but WITHOUT ANY WARRANTY; without even the implied warranty of
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
12 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
13 * GNU General Public License for more details.
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
14 *
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
15 * You should have received a copy of the GNU General Public License
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
16 * along with this program; if not, write to the Free Software
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
17 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
18 */
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
19
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
20 #define ALSA_DEBUG
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
21 #include "alsa-stdinc.h"
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
22
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
23 static snd_pcm_t *pcm_handle = NULL;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
24 static alsaplug_ringbuf_t pcm_ringbuf;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
25 static gboolean pcm_going = FALSE;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
26 static GThread *audio_thread = NULL;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
27 static gint bps;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
28
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
29 static gsize wr_total = 0;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
30 static gsize wr_hwframes = 0;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
31
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
32 static gint flush_request, paused;
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
33
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
34 static GMutex *pcm_pause_mutex, *pcm_state_mutex;
3176
dca77b467ea2 Fix a race condition which can occur when flushing the output buffer, causing
Matti Hamalainen <ccr@tnsp.org>
parents: 3175
diff changeset
35 static GCond *pcm_pause_cond, *pcm_state_cond, *pcm_flush_cond;
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
36
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
37 /********************************************************************************
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
38 * ALSA Mixer setting functions. *
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
39 ********************************************************************************/
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
40
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
41 static snd_mixer_t *amixer = NULL;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
42 static gboolean mixer_ready = FALSE;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
43
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
44 static snd_mixer_elem_t *
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
45 alsaplug_get_mixer_elem_by_name(snd_mixer_t *mixer, gchar *name)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
46 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
47 snd_mixer_selem_id_t *selem_id;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
48 snd_mixer_elem_t *elem;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
49
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
50 g_return_val_if_fail(mixer != NULL, NULL);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
51 g_return_val_if_fail(name != NULL, NULL);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
52
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
53 snd_mixer_selem_id_alloca(&selem_id);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
54 snd_mixer_selem_id_set_name(selem_id, name);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
55
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
56 elem = snd_mixer_find_selem(mixer, selem_id);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
57 if (elem == NULL) {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
58 _ERROR("Requested mixer element %p/%s not found", mixer, name);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
59 return NULL;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
60 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
61
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
62 snd_mixer_selem_set_playback_volume_range(elem, 0, 100);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
63
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
64 return elem;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
65 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
66
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
67 /* try to determine the best choice... may need tweaking. --nenolod */
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
68 static snd_mixer_elem_t *
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
69 alsaplug_guess_mixer_elem(snd_mixer_t *mixer)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
70 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
71 gchar *elem_names[] = { "Wave", "PCM", "Front", "Master" };
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
72 gint i;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
73 snd_mixer_elem_t *elem;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
74
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
75 for (i = 0; i < G_N_ELEMENTS(elem_names); i++)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
76 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
77 elem = alsaplug_get_mixer_elem_by_name(mixer, elem_names[i]);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
78 if (elem != NULL)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
79 return elem;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
80 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
81
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
82 return NULL;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
83 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
84
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
85 static gint
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
86 alsaplug_mixer_new(snd_mixer_t **mixer)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
87 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
88 gint ret;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
89
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
90 _ERROR("setting up mixer");
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
91
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
92 ret = snd_mixer_open(mixer, 0);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
93 if (ret < 0)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
94 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
95 _ERROR("mixer initialization failed: %s", snd_strerror(ret));
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
96 return ret;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
97 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
98
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
99 ret = snd_mixer_attach(*mixer, "default");
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
100 if (ret < 0)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
101 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
102 snd_mixer_close(*mixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
103 _ERROR("failed to attach to hardware mixer: %s", snd_strerror(ret));
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
104 return ret;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
105 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
106
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
107 ret = snd_mixer_selem_register(*mixer, NULL, NULL);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
108 if (ret < 0)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
109 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
110 snd_mixer_detach(*mixer, "default");
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
111 snd_mixer_close(*mixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
112 _ERROR("failed to register hardware mixer: %s", snd_strerror(ret));
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
113 return ret;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
114 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
115
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
116 ret = snd_mixer_load(*mixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
117 if (ret < 0)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
118 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
119 snd_mixer_detach(*mixer, "default");
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
120 snd_mixer_close(*mixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
121 _ERROR("failed to load hardware mixer controls: %s", snd_strerror(ret));
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
122 return ret;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
123 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
124
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
125 return 0;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
126 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
127
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
128 static void
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
129 alsaplug_set_volume(gint l, gint r)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
130 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
131 snd_mixer_elem_t *elem = alsaplug_guess_mixer_elem(amixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
132
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
133 if (elem == NULL)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
134 return;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
135
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
136 if (snd_mixer_selem_is_playback_mono(elem))
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
137 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
138 gint vol = (l > r) ? l : r;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
139
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
140 snd_mixer_selem_set_playback_volume(elem, SND_MIXER_SCHN_MONO, vol);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
141
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
142 if (snd_mixer_selem_has_playback_switch(elem))
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
143 snd_mixer_selem_set_playback_switch(elem, SND_MIXER_SCHN_MONO, vol != 0);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
144 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
145 else
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
146 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
147 snd_mixer_selem_set_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT, l);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
148 snd_mixer_selem_set_playback_volume(elem, SND_MIXER_SCHN_FRONT_RIGHT, r);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
149
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
150 if (snd_mixer_selem_has_playback_switch(elem) && !snd_mixer_selem_has_playback_switch_joined(elem))
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
151 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
152 snd_mixer_selem_set_playback_switch(elem, SND_MIXER_SCHN_FRONT_LEFT, l != 0);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
153 snd_mixer_selem_set_playback_switch(elem, SND_MIXER_SCHN_FRONT_RIGHT, r != 0);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
154 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
155 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
156
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
157 snd_mixer_handle_events(amixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
158 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
159
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
160 /********************************************************************************
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
161 * ALSA PCM I/O functions. *
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
162 ********************************************************************************/
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
163
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
164 static void
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
165 alsaplug_write_buffer(gpointer data, gint length)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
166 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
167 snd_pcm_sframes_t wr_frames;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
168
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
169 while (length > 0)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
170 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
171 gint frames = snd_pcm_bytes_to_frames(pcm_handle, length);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
172 wr_frames = snd_pcm_writei(pcm_handle, data, frames);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
173
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
174 if (wr_frames > 0)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
175 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
176 gint written = snd_pcm_frames_to_bytes(pcm_handle, wr_frames);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
177 length -= written;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
178 data += written;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
179 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
180 else
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
181 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
182 gint err = snd_pcm_recover(pcm_handle, wr_frames, 1);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
183 if (err < 0)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
184 _ERROR("(write) snd_pcm_recover: %s", snd_strerror(err));
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
185
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
186 return;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
187 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
188 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
189 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
190
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
191 static gpointer
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
192 alsaplug_loop(gpointer unused)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
193 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
194 gchar buf[2048];
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
195
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
196 while (pcm_going)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
197 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
198 if (flush_request != -1)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
199 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
200 snd_pcm_drop(pcm_handle);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
201 snd_pcm_prepare(pcm_handle);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
202 wr_total = flush_request * (bps / 1000);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
203 flush_request = -1;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
204
3176
dca77b467ea2 Fix a race condition which can occur when flushing the output buffer, causing
Matti Hamalainen <ccr@tnsp.org>
parents: 3175
diff changeset
205 g_cond_broadcast(pcm_flush_cond);
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
206 }
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
207
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
208 if (alsaplug_ringbuffer_read(&pcm_ringbuf, buf, 2048) == -1)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
209 {
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
210 /* less than 2048 bytes to go...? */
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
211 gint remain = alsaplug_ringbuffer_used(&pcm_ringbuf);
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
212 if (remain <= 2048 && remain > 0)
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
213 {
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
214 alsaplug_ringbuffer_read(&pcm_ringbuf, buf, remain);
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
215 alsaplug_write_buffer(buf, remain);
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
216 }
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
217 else
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
218 {
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
219 g_mutex_lock(pcm_state_mutex);
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
220 g_cond_wait(pcm_state_cond, pcm_state_mutex);
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
221 g_mutex_unlock(pcm_state_mutex);
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
222 }
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
223
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
224 continue;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
225 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
226
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
227 alsaplug_write_buffer(buf, 2048);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
228 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
229
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
230 snd_pcm_drain(pcm_handle);
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
231 snd_pcm_close(pcm_handle);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
232 pcm_handle = NULL;
3168
7e58928783b3 alsa-ng: Set thread handles to NULL when threads exit.
William Pitcock <nenolod@atheme.org>
parents: 3167
diff changeset
233 audio_thread = NULL;
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
234 alsaplug_ringbuffer_destroy(&pcm_ringbuf);
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
235
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
236 return NULL;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
237 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
238
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
239 /********************************************************************************
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
240 * Output Plugin API implementation. *
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
241 ********************************************************************************/
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
242
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
243 static OutputPluginInitStatus
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
244 alsaplug_init(void)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
245 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
246 gint card = -1;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
247
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
248 pcm_pause_mutex = g_mutex_new();
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
249 pcm_pause_cond = g_cond_new();
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
250
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
251 pcm_state_mutex = g_mutex_new();
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
252 pcm_state_cond = g_cond_new();
3176
dca77b467ea2 Fix a race condition which can occur when flushing the output buffer, causing
Matti Hamalainen <ccr@tnsp.org>
parents: 3175
diff changeset
253 pcm_flush_cond = g_cond_new();
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
254
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
255 if (snd_card_next(&card) != 0)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
256 return OUTPUT_PLUGIN_INIT_NO_DEVICES;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
257
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
258 if (!alsaplug_mixer_new(&amixer))
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
259 mixer_ready = TRUE;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
260
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
261 return OUTPUT_PLUGIN_INIT_FOUND_DEVICES;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
262 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
263
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
264 static gint
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
265 alsaplug_open_audio(AFormat fmt, gint rate, gint nch)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
266 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
267 gint err, bitwidth, ringbuf_size;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
268 snd_pcm_format_t afmt;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
269 snd_pcm_hw_params_t *hwparams = NULL;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
270
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
271 afmt = alsaplug_format_convert(fmt);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
272
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
273 if ((err = snd_pcm_open(&pcm_handle, "default", SND_PCM_STREAM_PLAYBACK, 0)) < 0)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
274 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
275 _ERROR("snd_pcm_open: %s", snd_strerror(err));
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
276 pcm_handle = NULL;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
277 return -1;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
278 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
279
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
280 snd_pcm_hw_params_alloca(&hwparams);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
281 snd_pcm_hw_params_any(pcm_handle, hwparams);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
282 snd_pcm_hw_params_set_access(pcm_handle, hwparams, SND_PCM_ACCESS_RW_INTERLEAVED);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
283 snd_pcm_hw_params_set_format(pcm_handle, hwparams, afmt);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
284 snd_pcm_hw_params_set_channels(pcm_handle, hwparams, nch);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
285 snd_pcm_hw_params_set_rate(pcm_handle, hwparams, rate, 0);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
286
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
287 err = snd_pcm_hw_params(pcm_handle, hwparams);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
288 if (err < 0)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
289 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
290 _ERROR("snd_pcm_hw_params failed: %s", snd_strerror(err));
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
291 return -1;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
292 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
293
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
294 bitwidth = snd_pcm_format_physical_width(afmt);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
295 bps = (rate * bitwidth * nch) >> 3;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
296 ringbuf_size = aud_cfg->output_buffer_size * bps / 1000;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
297 alsaplug_ringbuffer_init(&pcm_ringbuf, ringbuf_size);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
298 pcm_going = TRUE;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
299 flush_request = -1;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
300
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
301 audio_thread = g_thread_create(alsaplug_loop, NULL, TRUE, NULL);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
302 return 1;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
303 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
304
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
305 static void
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
306 alsaplug_close_audio(void)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
307 {
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
308 g_mutex_lock(pcm_state_mutex);
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
309
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
310 pcm_going = FALSE;
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
311 wr_total = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
312 wr_hwframes = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
313 bps = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
314
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
315 g_mutex_unlock(pcm_state_mutex);
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
316 g_cond_broadcast(pcm_state_cond);
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
317
3167
9739ba93fd79 alsa-ng: Don't try to join threads that have already exited.
William Pitcock <nenolod@atheme.org>
parents: 3166
diff changeset
318 if (audio_thread != NULL)
9739ba93fd79 alsa-ng: Don't try to join threads that have already exited.
William Pitcock <nenolod@atheme.org>
parents: 3166
diff changeset
319 g_thread_join(audio_thread);
9739ba93fd79 alsa-ng: Don't try to join threads that have already exited.
William Pitcock <nenolod@atheme.org>
parents: 3166
diff changeset
320
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
321 audio_thread = NULL;
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
322 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
323
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
324 static void
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
325 alsaplug_write_audio(gpointer data, gint length)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
326 {
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
327 /* software pause... snd_pcm_pause() is not safe. --nenolod */
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
328 if (paused)
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
329 {
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
330 g_mutex_lock(pcm_pause_mutex);
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
331 g_cond_wait(pcm_pause_cond, pcm_pause_mutex);
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
332 g_mutex_unlock(pcm_pause_mutex);
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
333 }
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
334
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
335 g_mutex_lock(pcm_state_mutex);
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
336 wr_total += length;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
337 alsaplug_ringbuffer_write(&pcm_ringbuf, data, length);
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
338 g_mutex_unlock(pcm_state_mutex);
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
339 g_cond_broadcast(pcm_state_cond);
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
340 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
341
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
342 static gint
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
343 alsaplug_output_time(void)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
344 {
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
345 gint ret = 0;
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
346 snd_pcm_sframes_t delay;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
347 gsize bytes = wr_total;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
348
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
349 g_mutex_lock(pcm_state_mutex);
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
350
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
351 if (pcm_going && pcm_handle != NULL)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
352 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
353 if (!snd_pcm_delay(pcm_handle, &delay))
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
354 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
355 guint d = snd_pcm_frames_to_bytes(pcm_handle, delay);
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
356 if (bytes < d)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
357 bytes = 0;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
358 else
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
359 bytes -= d;
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
360 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
361
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
362 ret = (bytes * 1000) / bps;
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
363 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
364
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
365 g_mutex_unlock(pcm_state_mutex);
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
366
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
367 return ret;
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
368 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
369
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
370 static gint
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
371 alsaplug_written_time(void)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
372 {
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
373 gint ret = 0;
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
374
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
375 g_mutex_lock(pcm_state_mutex);
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
376
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
377 if (pcm_going)
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
378 ret = (wr_total * 1000) / bps;
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
379
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
380 g_mutex_unlock(pcm_state_mutex);
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
381
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
382 return ret;
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
383 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
384
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
385 static gint
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
386 alsaplug_buffer_free(void)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
387 {
3173
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
388 gint ret;
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
389
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
390 g_mutex_lock(pcm_state_mutex);
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
391
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
392 if (pcm_going == FALSE)
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
393 ret = 0;
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
394 else
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
395 ret = alsaplug_ringbuffer_free(&pcm_ringbuf);
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
396
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
397 g_mutex_unlock(pcm_state_mutex);
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
398
3fd0d762371c alsa-ng: alsaplug_buffer_free(): Make sure we don't try to access the ringbuffer when it's not yet allocated.
William Pitcock <nenolod@atheme.org>
parents: 3172
diff changeset
399 return ret;
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
400 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
401
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
402 static void
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
403 alsaplug_flush(gint time)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
404 {
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
405 /* make the request... */
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
406 g_mutex_lock(pcm_state_mutex);
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
407 flush_request = time;
3175
1bb4cad57923 alsa-ng: alsaplug_flush(): It is good practise to lock the same mutex as the waiting threads while calling g_cond_broadcast.
Tomasz Mon <desowin@gmail.com>
parents: 3174
diff changeset
408 g_cond_broadcast(pcm_state_cond);
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
409
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
410 /* ...then wait for the transaction to complete. */
3176
dca77b467ea2 Fix a race condition which can occur when flushing the output buffer, causing
Matti Hamalainen <ccr@tnsp.org>
parents: 3175
diff changeset
411 g_cond_wait(pcm_flush_cond, pcm_state_mutex);
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
412 g_mutex_unlock(pcm_state_mutex);
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
413 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
414
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
415 static gint
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
416 alsaplug_buffer_playing(void)
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
417 {
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
418 gint ret;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
419
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
420 g_mutex_lock(pcm_state_mutex);
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
421
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
422 if (pcm_going == FALSE)
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
423 ret = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
424 else
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
425 ret = alsaplug_ringbuffer_used(&pcm_ringbuf) != 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
426
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
427 g_mutex_unlock(pcm_state_mutex);
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
428
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
429 return ret;
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
430 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
431
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
432 static void
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
433 alsaplug_pause(short p)
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
434 {
3166
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
435 g_mutex_lock(pcm_pause_mutex);
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
436 paused = p;
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
437 g_mutex_unlock(pcm_pause_mutex);
8cbf077ba5d0 alsa-ng: Software pause, so we don't have to use snd_pcm_pause(), which is not part of the safe ALSA subset.
William Pitcock <nenolod@atheme.org>
parents: 3165
diff changeset
438 g_cond_broadcast(pcm_pause_cond);
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
439 }
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
440
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
441 /********************************************************************************
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
442 * Plugin glue. *
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
443 ********************************************************************************/
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
444
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
445 static OutputPlugin alsa_op = {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
446 .description = "ALSA Output Plugin (-ng)",
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
447 .probe_priority = 1,
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
448 .init = alsaplug_init,
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
449 .open_audio = alsaplug_open_audio,
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
450 .close_audio = alsaplug_close_audio,
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
451 .write_audio = alsaplug_write_audio,
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
452 .output_time = alsaplug_output_time,
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
453 .written_time = alsaplug_written_time,
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
454 .buffer_free = alsaplug_buffer_free,
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
455 .buffer_playing = alsaplug_buffer_playing,
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
456 .flush = alsaplug_flush,
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
457 .pause = alsaplug_pause,
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
458 .set_volume = alsaplug_set_volume,
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
459 };
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
460
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
461 OutputPlugin *alsa_oplist[] = { &alsa_op, NULL };
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
462 SIMPLE_OUTPUT_PLUGIN(alsa, alsa_oplist);