annotate src/alsa-ng/alsa-core.c @ 3193:93cf4d0a0dde

alsa-ng: Prefer "PCM" volume control over "Wave" on systems that have both, for consistency with OSS plugin and maybe other apps (closes AUD-34 and AUD-36).
author John Lindgren <john.lindgren@tds.net>
date Mon, 29 Jun 2009 23:05:56 -0400
parents d1d9b159801a
children bbf2cd0df6c3
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
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
23 alsaplug_cfg_t alsaplug_cfg;
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
24
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
25 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
26 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
27 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
28 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
29 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
30
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 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
32 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
33
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
34 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
35
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
36 static GMutex * pcm_state_mutex;
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
37 static GCond * 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
38
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
39 extern void alsaplug_configure(void);
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
40 extern void alsaplug_get_config(void);
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
41
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
42 /********************************************************************************
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
43 * 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
44 ********************************************************************************/
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
45
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
46 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
47 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
48
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
49 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
50 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
51 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
52 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
53 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
54
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
55 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
56 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
57
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
58 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
59 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
60
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
61 elem = snd_mixer_find_selem(mixer, selem_id);
3180
2e7a64bb33cd alsa-ng: Remove debug notice.
William Pitcock <nenolod@atheme.org>
parents: 3178
diff changeset
62 if (elem == NULL)
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
63 return NULL;
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 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
66
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
67 return elem;
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
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
70 /* 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
71 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
72 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
73 {
3193
93cf4d0a0dde alsa-ng: Prefer "PCM" volume control over "Wave" on systems that have both, for consistency with OSS plugin and maybe other apps (closes AUD-34 and AUD-36).
John Lindgren <john.lindgren@tds.net>
parents: 3192
diff changeset
74 gchar * elem_names[] = {"PCM", "Wave", "Front", "Master"};
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
75 gint i;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
76 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
77
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
78 if (alsaplug_cfg.mixer_device != NULL)
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
79 return alsaplug_get_mixer_elem_by_name(mixer, alsaplug_cfg.mixer_device);
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
80
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
81 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
82 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
83 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
84 if (elem != NULL)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
85 return elem;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
86 }
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 return NULL;
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
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
91 gint
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
92 alsaplug_mixer_new_for_card(snd_mixer_t **mixer, const gchar *card)
3177
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 gint ret;
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
95
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
96 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
97 if (ret < 0)
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 _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
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
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
103 ret = snd_mixer_attach(*mixer, card);
3177
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_close(*mixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
107 _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
108 return ret;
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
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
111 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
112 if (ret < 0)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
113 {
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
114 snd_mixer_detach(*mixer, card);
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
115 snd_mixer_close(*mixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
116 _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
117 return ret;
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
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
120 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
121 if (ret < 0)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
122 {
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
123 snd_mixer_detach(*mixer, card);
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
124 snd_mixer_close(*mixer);
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
125 _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
126 return ret;
3182
631d217913e0 alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents: 3181
diff changeset
127 }
3177
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 return 0;
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
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
132 gint
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
133 alsaplug_mixer_new(snd_mixer_t **mixer)
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
134 {
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
135 return alsaplug_mixer_new_for_card(mixer, alsaplug_cfg.mixer_card);
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
136 }
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
137
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
138 static void
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
139 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
140 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
141 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
142
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
143 if (elem == NULL)
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
144 return;
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_is_playback_mono(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 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
149
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
150 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
151
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
152 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
153 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
154 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
155 else
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_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
158 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
159
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
160 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
161 {
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
162 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
163 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
164 }
3182
631d217913e0 alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents: 3181
diff changeset
165 }
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
166
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
167 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
168 }
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
169
3178
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
170 static void
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
171 alsaplug_get_volume(gint *l, gint *r)
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 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
174
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
175 if (elem == NULL)
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
176 return;
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 snd_mixer_handle_events(amixer);
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 *l = 0;
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
181 *r = 0;
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 if (snd_mixer_selem_is_playback_mono(elem))
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
184 {
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
185 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
186 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
187 }
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
188 else
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
189 {
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
190 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
191 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
192 }
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
193 }
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
194
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
195 /********************************************************************************
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
196 * 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
197 ********************************************************************************/
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
198
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
199 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
200 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
201 {
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 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
203
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 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
205 {
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 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
207 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
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 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
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 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
212 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
213 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
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 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
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 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
218 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
219 _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
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 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
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 }
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
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 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
227 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
228 {
3188
68bb898b8ae0 alsa-ng: Some fixes
William Pitcock <nenolod@atheme.org>
parents: 3186
diff changeset
229 guchar buf[2048];
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
230 int size;
3162
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
231
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
232 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
233 {
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
234 g_mutex_lock (pcm_state_mutex);
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
235
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
236 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
237 {
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
238 alsaplug_ringbuffer_reset (& 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
239 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
240 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
241 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
242 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
243
3176
dca77b467ea2 Fix a race condition which can occur when flushing the output buffer, causing
Matti Hamalainen <ccr@tnsp.org>
parents: 3175
diff changeset
244 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
245 }
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
246
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
247 size = alsaplug_ringbuffer_used (& pcm_ringbuf);
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
248
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
249 if (size == 0 || paused)
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
250 {
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
251 g_cond_wait (pcm_state_cond, pcm_state_mutex);
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
252 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
253 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
254 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
255
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
256 if (size > sizeof buf)
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
257 size = sizeof buf;
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
258
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
259 alsaplug_ringbuffer_read (& pcm_ringbuf, buf, size);
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
260 g_mutex_unlock (pcm_state_mutex);
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
261 alsaplug_write_buffer (buf, size);
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
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
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
264 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
265 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
266 pcm_handle = NULL;
3168
7e58928783b3 alsa-ng: Set thread handles to NULL when threads exit.
William Pitcock <nenolod@atheme.org>
parents: 3167
diff changeset
267 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
268 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
269
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 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
271 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
272
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
273 /********************************************************************************
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
274 * 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
275 ********************************************************************************/
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
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 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
278 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
279 {
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
280 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
281
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
282 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
283 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
284 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
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 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
287 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
288
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
289 alsaplug_get_config();
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
290 if (alsaplug_cfg.pcm_device == NULL)
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
291 alsaplug_cfg.pcm_device = g_strdup("default");
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
292 if (alsaplug_cfg.mixer_card == NULL)
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
293 alsaplug_cfg.mixer_card = g_strdup("default");
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
294
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
295 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
296 }
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 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
299 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
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 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
302 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
303 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
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 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
306 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
307 {
2e988f44b85d alsa-ng: Don't crash on SND_PCM_FORMAT_UNKNOWN.
William Pitcock <nenolod@atheme.org>
parents: 3184
diff changeset
308 _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
309 return -1;
2e988f44b85d alsa-ng: Don't crash on SND_PCM_FORMAT_UNKNOWN.
William Pitcock <nenolod@atheme.org>
parents: 3184
diff changeset
310 }
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
311
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
312 if (!alsaplug_mixer_new(&amixer))
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
313 mixer_ready = TRUE;
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
314
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
315 if ((err = snd_pcm_open(&pcm_handle, alsaplug_cfg.pcm_device, SND_PCM_STREAM_PLAYBACK, 0)) < 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
316 {
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 _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
318 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
319 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
320 }
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
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 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
323 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
324 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
325 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
326 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
327 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
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 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
330 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
331 {
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 _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
333 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
334 }
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
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 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
337 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
338 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
339 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
340 _ERROR("alsaplug_ringbuffer_init failed");
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
341 return -1;
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
342 }
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
343 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
344 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
345
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 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
347 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
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
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 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
351 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
352 {
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 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
354
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
355 pcm_going = FALSE;
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
356 wr_total = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
357 wr_hwframes = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
358 bps = 0;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
359
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
360 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
361 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
362
3167
9739ba93fd79 alsa-ng: Don't try to join threads that have already exited.
William Pitcock <nenolod@atheme.org>
parents: 3166
diff changeset
363 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
364 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
365
3164
adec82db531c alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents: 3163
diff changeset
366 audio_thread = NULL;
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
367
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
368 if (mixer_ready == TRUE)
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
369 {
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
370 snd_mixer_detach(amixer, alsaplug_cfg.mixer_card);
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
371 snd_mixer_close(amixer);
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
372
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
373 amixer = NULL;
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
374 mixer_ready = FALSE;
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
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 }
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 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
379 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
380 {
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
381 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
382 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
383 alsaplug_ringbuffer_write(&pcm_ringbuf, data, length);
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
384 g_cond_broadcast (pcm_state_cond);
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
385 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
386 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
387
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 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
389 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
390 {
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
391 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
392 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
393 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
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_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
396
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
397 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
398 {
3184
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
399 guint d = alsaplug_ringbuffer_used(&pcm_ringbuf);
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
400
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
401 if (!snd_pcm_delay(pcm_handle, &delay))
3184
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
402 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
403
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
404 if (bytes < d)
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
405 bytes = 0;
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
406 else
b009fad90e92 alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents: 3183
diff changeset
407 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
408
3182
631d217913e0 alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents: 3181
diff changeset
409 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
410 }
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
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
412 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
413
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
414 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
415 }
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
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 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
418 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
419 {
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
420 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
421
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
422 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
423
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
424 if (pcm_going)
3183
19e3ec80dac9 alsa-ng: Another arithmetic overflow (hopefully the last one).
John Lindgren <john.lindgren@tds.net>
parents: 3182
diff changeset
425 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
426
3174
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
diff changeset
427 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
428
8106e1b31115 alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents: 3173
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 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
433 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
434 {
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
435 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
436
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
437 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
438
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
439 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
440 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
441 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
442 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
443
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
444 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
445
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
446 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
447 }
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
448
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
449 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
450 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
451 {
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
452 /* 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
453 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
454 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
455 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
456
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
457 /* ...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
458 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
459 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
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
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
462 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
463 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
464 {
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
465 gint ret;
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
466
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
467 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
468
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
469 if (pcm_going == FALSE)
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
470 ret = 0;
3182
631d217913e0 alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents: 3181
diff changeset
471 else
3172
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
472 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
473
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
474 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
475
1b2350bdeaef alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents: 3168
diff changeset
476 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
477 }
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
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
479 static void
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
480 alsaplug_pause(short p)
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
481 {
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
482 g_mutex_lock (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
483 paused = p;
3191
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
484 g_cond_broadcast (pcm_state_cond);
a65f440cbed3 alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents: 3188
diff changeset
485 g_mutex_unlock (pcm_state_mutex);
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
486 }
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
487
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
488 /********************************************************************************
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
489 * 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
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 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
493 .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
494 .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
495 .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
496 .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
497 .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
498 .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
499 .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
500 .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
501 .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
502 .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
503 .flush = alsaplug_flush,
3165
087abc78516e alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents: 3164
diff changeset
504 .pause = alsaplug_pause,
3177
1117166277f7 alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents: 3176
diff changeset
505 .set_volume = alsaplug_set_volume,
3178
4634dab72608 alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents: 3177
diff changeset
506 .get_volume = alsaplug_get_volume,
3192
d1d9b159801a alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents: 3191
diff changeset
507 .configure = alsaplug_configure,
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
508 };
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
509
e387614b9be9 alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff changeset
510 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
511 SIMPLE_OUTPUT_PLUGIN(alsa, alsa_oplist);