annotate src/alsa-ng/alsa-core.c @ 3178:4634dab72608

alsa-ng: Add get_volume() implementation.
author William Pitcock <nenolod@atheme.org>
date Wed, 10 Jun 2009 00:06:15 -0500
parents 1117166277f7
children 2e7a64bb33cd
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
3178
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
160 static void
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
161 alsaplug_get_volume(gint *l, gint *r)
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
162 {
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
163 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
164
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
165 if (elem == NULL)
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
166 return;
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
167
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
168 snd_mixer_handle_events(amixer);
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
169
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
170 *l = 0;
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
171 *r = 0;
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
172
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
173 if (snd_mixer_selem_is_playback_mono(elem))
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
174 {
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
175 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
176 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
177 }
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
178 else
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 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
181 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
182 }
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
183 }
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
184
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
185 /********************************************************************************
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
186 * 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
187 ********************************************************************************/
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
188
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
189 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
190 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
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 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
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 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
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 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
197 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
198
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 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
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 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
202 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
203 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
204 }
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 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
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 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
208 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
209 _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
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 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
212 }
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 }
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
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 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
217 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
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 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
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 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
222 {
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 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
224 {
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 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
226 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
227 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
228 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
229
3176
dca77b467ea2 Fix a race condition which can occur when flushing the output buffer, causing
Matti Hamalainen <ccr@tnsp.org>
parents: 3175
diff changeset
230 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
231 }
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
232
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
233 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
234 {
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
235 /* 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
236 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
237 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
238 {
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
239 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
240 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
241 }
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
242 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
243 {
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
244 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
245 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
246 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
247 }
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
248
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 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
250 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
251
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 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
253 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
254
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
255 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
256 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
257 pcm_handle = NULL;
3168
7e58928783b3 alsa-ng: Set thread handles to NULL when threads exit.
William Pitcock <nenolod@atheme.org>
parents: 3167
diff changeset
258 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
259 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
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 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
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 /********************************************************************************
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 * 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
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
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 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
269 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
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 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
272
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
273 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
274 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
275
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
276 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
277 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
278 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
279
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
280 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
281 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
282
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
283 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
284 mixer_ready = TRUE;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
285
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
286 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
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
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 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
290 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
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 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
293 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
294 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
295
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 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
297
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 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
299 {
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 _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
301 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
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 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
306 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
307 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
308 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
309 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
310 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
311
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 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
313 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
314 {
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 _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
316 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
317 }
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 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
320 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
321 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
322 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
323 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
324 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
325
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 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
327 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
328 }
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 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
331 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
332 {
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
333 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
334
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
335 pcm_going = FALSE;
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
336 wr_total = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
337 wr_hwframes = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
338 bps = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
339
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
340 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
341 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
342
3167
9739ba93fd79 alsa-ng: Don't try to join threads that have already exited.
William Pitcock <nenolod@atheme.org>
parents: 3166
diff changeset
343 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
344 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
345
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
346 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
347 }
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
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
349 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
350 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
351 {
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
352 /* 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
353 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
354 {
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
355 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
356 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
357 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
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
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
360 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
361 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
362 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
363 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
364 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
365 }
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
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
367 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
368 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
369 {
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
370 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
371 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
372 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
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 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
375
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
376 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
377 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
378 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
379 {
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 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
381 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
382 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
383 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
384 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
385 }
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
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
387 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
388 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
389
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
390 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
391
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
392 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
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
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
395 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
396 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
397 {
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
398 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
399
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
400 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
401
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
402 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
403 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
404
3174
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_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
406
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
407 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
408 }
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
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
410 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
411 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
412 {
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
413 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
414
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
415 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
416
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
417 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
418 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
419 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
420 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
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 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
423
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 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
425 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
426
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
427 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
428 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
429 {
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
430 /* 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
431 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
432 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
433 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
434
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 /* ...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
436 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
437 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
438 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
439
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
440 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
441 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
442 {
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
443 gint ret;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
444
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
445 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
446
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
447 if (pcm_going == FALSE)
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
448 ret = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
449 else
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
450 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
451
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
452 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
453
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
454 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
455 }
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
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
457 static void
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
458 alsaplug_pause(short p)
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
459 {
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
460 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
461 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
462 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
463 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
464 }
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
465
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
466 /********************************************************************************
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
467 * 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
468 ********************************************************************************/
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
469
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
470 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
471 .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
472 .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
473 .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
474 .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
475 .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
476 .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
477 .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
478 .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
479 .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
480 .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
481 .flush = alsaplug_flush,
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
482 .pause = alsaplug_pause,
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
483 .set_volume = alsaplug_set_volume,
3178
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
484 .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
485 };
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
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
487 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
488 SIMPLE_OUTPUT_PLUGIN(alsa, alsa_oplist);