annotate src/alsa-ng/alsa-core.c @ 3186:2e988f44b85d

alsa-ng: Don't crash on SND_PCM_FORMAT_UNKNOWN.
author William Pitcock <nenolod@atheme.org>
date Fri, 19 Jun 2009 08:23:51 -0500
parents b009fad90e92
children 68bb898b8ae0
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);
3180
2e7a64bb33cd alsa-ng: Remove debug notice.
William Pitcock <nenolod@atheme.org>
parents: 3178
diff changeset
57 if (elem == NULL)
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
58 return NULL;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
59
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
60 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
61
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
62 return elem;
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
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
65 /* 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
66 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
67 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
68 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
69 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
70 gint i;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
71 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
72
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
73 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
74 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
75 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
76 if (elem != NULL)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
77 return elem;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
78 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
79
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
80 return NULL;
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
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
83 static gint
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
84 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
85 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
86 gint ret;
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 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
89 if (ret < 0)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
90 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
91 _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
92 return ret;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
93 }
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 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
96 if (ret < 0)
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 snd_mixer_close(*mixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
99 _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
100 return ret;
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
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
103 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
104 if (ret < 0)
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 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
107 snd_mixer_close(*mixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
108 _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
109 return ret;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
110 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
111
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
112 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
113 if (ret < 0)
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 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
116 snd_mixer_close(*mixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
117 _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
118 return ret;
3182
631d217913e0 alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents: 3181
diff changeset
119 }
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
120
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
121 return 0;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
122 }
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 static void
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
125 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
126 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
127 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
128
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
129 if (elem == NULL)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
130 return;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
131
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
132 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
133 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
134 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
135
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
136 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
137
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
138 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
139 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
140 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
141 else
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
142 {
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_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
144 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
145
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
146 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
147 {
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_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
149 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
150 }
3182
631d217913e0 alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents: 3181
diff changeset
151 }
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
152
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
153 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
154 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
155
3178
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
156 static void
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
157 alsaplug_get_volume(gint *l, gint *r)
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
158 {
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
159 snd_mixer_elem_t *elem = alsaplug_guess_mixer_elem(amixer);
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
160
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
161 if (elem == NULL)
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
162 return;
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
163
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
164 snd_mixer_handle_events(amixer);
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
165
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
166 *l = 0;
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
167 *r = 0;
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
168
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
169 if (snd_mixer_selem_is_playback_mono(elem))
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
170 {
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
171 snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, (glong *) l);
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
172 snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_MONO, (glong *) r);
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
173 }
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
174 else
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
175 {
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
176 snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_LEFT, (glong *) l);
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
177 snd_mixer_selem_get_playback_volume(elem, SND_MIXER_SCHN_FRONT_RIGHT, (glong *) r);
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
178 }
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
179 }
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
180
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
181 /********************************************************************************
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
182 * 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
183 ********************************************************************************/
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
184
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
185 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
186 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
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 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
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 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
191 {
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 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
193 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
194
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 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
196 {
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 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
198 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
199 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
200 }
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 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
202 {
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 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
204 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
205 _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
206
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
207 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
208 }
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 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
210 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
211
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
212 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
213 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
214 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
215 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
216
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
217 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
218 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
219 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
220 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
221 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
222 snd_pcm_prepare(pcm_handle);
3182
631d217913e0 alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents: 3181
diff changeset
223 wr_total = flush_request * (long long) bps / 1000;
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
224 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
225
3176
dca77b467ea2 Fix a race condition which can occur when flushing the output buffer, causing
Matti Hamalainen <ccr@tnsp.org>
parents: 3175
diff changeset
226 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
227 }
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
228
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
229 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
230 {
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
231 /* 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
232 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
233 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
234 {
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
235 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
236 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
237 }
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
238 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
239 {
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
240 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
241 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
242 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
243 }
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
244
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 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
246 }
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
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
248 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
249 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
250
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
251 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
252 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
253 pcm_handle = NULL;
3168
7e58928783b3 alsa-ng: Set thread handles to NULL when threads exit.
William Pitcock <nenolod@atheme.org>
parents: 3167
diff changeset
254 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
255 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
256
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 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
258 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
259
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
260 /********************************************************************************
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 * 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
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 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
265 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
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 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
268
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
269 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
270 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
271
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
272 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
273 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
274 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
275
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
276 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
277 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
278
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
279 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
280 mixer_ready = TRUE;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
281
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
282 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
283 }
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
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 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
286 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
287 {
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 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
289 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
290 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
291
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 afmt = alsaplug_format_convert(fmt);
3186
2e988f44b85d alsa-ng: Don't crash on SND_PCM_FORMAT_UNKNOWN.
William Pitcock <nenolod@atheme.org>
parents: 3184
diff changeset
293 if (afmt == SND_PCM_FORMAT_UNKNOWN)
2e988f44b85d alsa-ng: Don't crash on SND_PCM_FORMAT_UNKNOWN.
William Pitcock <nenolod@atheme.org>
parents: 3184
diff changeset
294 {
2e988f44b85d alsa-ng: Don't crash on SND_PCM_FORMAT_UNKNOWN.
William Pitcock <nenolod@atheme.org>
parents: 3184
diff changeset
295 _ERROR("unsupported format requested: %d -> %d", fmt, afmt);
2e988f44b85d alsa-ng: Don't crash on SND_PCM_FORMAT_UNKNOWN.
William Pitcock <nenolod@atheme.org>
parents: 3184
diff changeset
296 return -1;
2e988f44b85d alsa-ng: Don't crash on SND_PCM_FORMAT_UNKNOWN.
William Pitcock <nenolod@atheme.org>
parents: 3184
diff changeset
297 }
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
298
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 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
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 _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
302 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
303 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
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
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 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
307 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
308 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
309 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
310 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
311 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
312
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
313 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
314 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
315 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
316 _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
317 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
318 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
319
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
320 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
321 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
322 ringbuf_size = aud_cfg->output_buffer_size * bps / 1000;
3184
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
323 if (alsaplug_ringbuffer_init(&pcm_ringbuf, ringbuf_size) == -1) {
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
324 _ERROR("alsaplug_ringbuffer_init failed");
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
325 return -1;
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
326 }
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
327 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
328 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
329
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
330 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
331 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
332 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
333
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
334 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
335 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
336 {
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
337 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
338
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
339 pcm_going = FALSE;
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
340 wr_total = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
341 wr_hwframes = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
342 bps = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
343
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
344 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
345 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
346
3167
9739ba93fd79 alsa-ng: Don't try to join threads that have already exited.
William Pitcock <nenolod@atheme.org>
parents: 3166
diff changeset
347 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
348 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
349
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
350 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
351 }
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 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
354 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
355 {
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
356 /* 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
357 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
358 {
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
359 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
360 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
361 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
362 }
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
363
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
364 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
365 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
366 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
367 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
368 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
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
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 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
372 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
373 {
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
374 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
375 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
376 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
377
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
378 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
379
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
380 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
381 {
3184
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
382 guint d = alsaplug_ringbuffer_used(&pcm_ringbuf);
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
383
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
384 if (!snd_pcm_delay(pcm_handle, &delay))
3184
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
385 d += snd_pcm_frames_to_bytes(pcm_handle, delay);
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
386
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
387 if (bytes < d)
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
388 bytes = 0;
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
389 else
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
390 bytes -= d;
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
391
3182
631d217913e0 alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents: 3181
diff changeset
392 ret = bytes * (long long) 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
393 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
394
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
395 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
396
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
397 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
398 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
399
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 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
401 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
402 {
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
403 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
404
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
405 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
406
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 if (pcm_going)
3183
19e3ec80dac9 alsa-ng: Another arithmetic overflow (hopefully the last one).
John Lindgren <john.lindgren@tds.net>
parents: 3182
diff changeset
408 ret = wr_total * (long long) 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
409
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
410 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
411
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
412 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
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_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
417 {
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
418 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
419
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
420 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
421
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
422 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
423 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
424 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
425 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
426
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
427 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
428
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
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
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
432 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
433 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
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 /* 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
436 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
437 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
438 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
439
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
440 /* ...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
441 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
442 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
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 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
446 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
447 {
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
448 gint ret;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
449
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
450 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
451
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
452 if (pcm_going == FALSE)
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
453 ret = 0;
3182
631d217913e0 alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents: 3181
diff changeset
454 else
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
455 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
456
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
457 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
458
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
459 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
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
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
462 static void
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
463 alsaplug_pause(short p)
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
464 {
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
465 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
466 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
467 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
468 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
469 }
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
470
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
471 /********************************************************************************
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
472 * 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
473 ********************************************************************************/
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
474
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
475 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
476 .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
477 .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
478 .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
479 .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
480 .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
481 .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
482 .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
483 .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
484 .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
485 .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
486 .flush = alsaplug_flush,
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
487 .pause = alsaplug_pause,
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
488 .set_volume = alsaplug_set_volume,
3178
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
489 .get_volume = alsaplug_get_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
490 };
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
491
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
492 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
493 SIMPLE_OUTPUT_PLUGIN(alsa, alsa_oplist);