Mercurial > audlegacy-plugins
annotate src/alsa-ng/alsa-core.c @ 3203:f5456241bff9 default tip
changed include path from audacious to audlegacy.
author | Yoshiki Yazawa <yaz@honeyplanet.jp> |
---|---|
date | Tue, 10 Nov 2009 05:19:25 +0900 |
parents | 8da9787de69d |
children |
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); |
3194
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
174 long left, right; |
3178
4634dab72608
alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents:
3177
diff
changeset
|
175 |
4634dab72608
alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents:
3177
diff
changeset
|
176 if (elem == NULL) |
3194
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
177 { |
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
178 * l = 50; |
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
179 * r = 50; |
3178
4634dab72608
alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents:
3177
diff
changeset
|
180 return; |
3194
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
181 } |
3178
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 snd_mixer_handle_events(amixer); |
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 if (snd_mixer_selem_is_playback_mono(elem)) |
4634dab72608
alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents:
3177
diff
changeset
|
186 { |
3194
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
187 snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_MONO, & left); |
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
188 snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_MONO, & right); |
3178
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 else |
4634dab72608
alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents:
3177
diff
changeset
|
191 { |
3194
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
192 snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_FRONT_LEFT, |
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
193 & left); |
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
194 snd_mixer_selem_get_playback_volume (elem, SND_MIXER_SCHN_FRONT_RIGHT, |
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
195 & right); |
3178
4634dab72608
alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents:
3177
diff
changeset
|
196 } |
3194
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
197 |
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
198 * l = left; |
bbf2cd0df6c3
alsa-ng: A gint by any other name...
John Lindgren <john.lindgren@tds.net>
parents:
3193
diff
changeset
|
199 * r = right; |
3178
4634dab72608
alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents:
3177
diff
changeset
|
200 } |
4634dab72608
alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents:
3177
diff
changeset
|
201 |
3164
adec82db531c
alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents:
3163
diff
changeset
|
202 /******************************************************************************** |
adec82db531c
alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents:
3163
diff
changeset
|
203 * 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
|
204 ********************************************************************************/ |
adec82db531c
alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents:
3163
diff
changeset
|
205 |
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
|
206 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
|
207 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
|
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 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
|
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 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
|
212 { |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
213 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
|
214 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
|
215 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
216 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
|
217 { |
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 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
|
219 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
|
220 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
|
221 } |
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 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
|
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 gint err = snd_pcm_recover(pcm_handle, wr_frames, 1); |
3200
8da9787de69d
alsa-ng: More paranoid debugging.
John Lindgren <john.lindgren@tds.net>
parents:
3199
diff
changeset
|
225 |
8da9787de69d
alsa-ng: More paranoid debugging.
John Lindgren <john.lindgren@tds.net>
parents:
3199
diff
changeset
|
226 _DEBUG ("snd_pcm_writei error: %s", snd_strerror (wr_frames)); |
8da9787de69d
alsa-ng: More paranoid debugging.
John Lindgren <john.lindgren@tds.net>
parents:
3199
diff
changeset
|
227 |
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
|
228 if (err < 0) |
3200
8da9787de69d
alsa-ng: More paranoid debugging.
John Lindgren <john.lindgren@tds.net>
parents:
3199
diff
changeset
|
229 { |
8da9787de69d
alsa-ng: More paranoid debugging.
John Lindgren <john.lindgren@tds.net>
parents:
3199
diff
changeset
|
230 _ERROR ("snd_pcm_recover error: %s", snd_strerror (err)); |
8da9787de69d
alsa-ng: More paranoid debugging.
John Lindgren <john.lindgren@tds.net>
parents:
3199
diff
changeset
|
231 return; |
8da9787de69d
alsa-ng: More paranoid debugging.
John Lindgren <john.lindgren@tds.net>
parents:
3199
diff
changeset
|
232 } |
3162
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
233 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
234 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
235 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
236 |
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 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
|
238 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
|
239 { |
3188 | 240 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
|
241 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
|
242 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
243 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
|
244 { |
3191
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
245 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
|
246 |
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
|
247 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
|
248 { |
3191
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
249 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
|
250 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
|
251 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
|
252 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
|
253 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
|
254 |
3176
dca77b467ea2
Fix a race condition which can occur when flushing the output buffer, causing
Matti Hamalainen <ccr@tnsp.org>
parents:
3175
diff
changeset
|
255 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
|
256 } |
087abc78516e
alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents:
3164
diff
changeset
|
257 |
3191
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
258 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
|
259 |
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
260 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
|
261 { |
3191
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
262 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
|
263 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
|
264 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
|
265 } |
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 |
3191
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
267 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
|
268 size = sizeof buf; |
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
269 |
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
270 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
|
271 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
|
272 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
|
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 |
3164
adec82db531c
alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents:
3163
diff
changeset
|
275 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
|
276 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
|
277 pcm_handle = NULL; |
3168
7e58928783b3
alsa-ng: Set thread handles to NULL when threads exit.
William Pitcock <nenolod@atheme.org>
parents:
3167
diff
changeset
|
278 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
|
279 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
|
280 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
281 return 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
|
282 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
283 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
284 /******************************************************************************** |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
285 * 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
|
286 ********************************************************************************/ |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
287 |
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 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
|
289 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
|
290 { |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
291 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
|
292 |
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
|
293 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
|
294 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
|
295 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
|
296 |
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
|
297 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
|
298 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
|
299 |
3192
d1d9b159801a
alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents:
3191
diff
changeset
|
300 alsaplug_get_config(); |
d1d9b159801a
alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents:
3191
diff
changeset
|
301 if (alsaplug_cfg.pcm_device == NULL) |
d1d9b159801a
alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents:
3191
diff
changeset
|
302 alsaplug_cfg.pcm_device = g_strdup("default"); |
d1d9b159801a
alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents:
3191
diff
changeset
|
303 if (alsaplug_cfg.mixer_card == NULL) |
d1d9b159801a
alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents:
3191
diff
changeset
|
304 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
|
305 |
3198
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
306 if (!alsaplug_mixer_new(&amixer)) |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
307 mixer_ready = TRUE; |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
308 |
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
|
309 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
|
310 } |
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 |
3198
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
312 static void alsaplug_cleanup(void) |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
313 { |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
314 if (mixer_ready == TRUE) |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
315 { |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
316 snd_mixer_detach(amixer, alsaplug_cfg.mixer_card); |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
317 snd_mixer_close(amixer); |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
318 |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
319 amixer = NULL; |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
320 mixer_ready = FALSE; |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
321 } |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
322 } |
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
323 |
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
|
324 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
|
325 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
|
326 { |
3196
0f7180e3b163
alsa-ng: Enforce a minimum buffer size of 500ms.
William Pitcock <nenolod@atheme.org>
parents:
3194
diff
changeset
|
327 gint err, bitwidth, ringbuf_size, 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
|
328 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
|
329 snd_pcm_hw_params_t *hwparams = NULL; |
3197
d2e01ca06335
alsa-ng: Work around *broken* drivers, such as snd-au88xx.
William Pitcock <nenolod@atheme.org>
parents:
3196
diff
changeset
|
330 guint rate_ = rate; |
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
|
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 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
|
333 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
|
334 { |
2e988f44b85d
alsa-ng: Don't crash on SND_PCM_FORMAT_UNKNOWN.
William Pitcock <nenolod@atheme.org>
parents:
3184
diff
changeset
|
335 _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
|
336 return -1; |
2e988f44b85d
alsa-ng: Don't crash on SND_PCM_FORMAT_UNKNOWN.
William Pitcock <nenolod@atheme.org>
parents:
3184
diff
changeset
|
337 } |
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
|
338 |
3192
d1d9b159801a
alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents:
3191
diff
changeset
|
339 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
|
340 { |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
341 _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
|
342 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
|
343 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
|
344 } |
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 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
|
347 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
|
348 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
|
349 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
|
350 snd_pcm_hw_params_set_channels(pcm_handle, hwparams, nch); |
3197
d2e01ca06335
alsa-ng: Work around *broken* drivers, such as snd-au88xx.
William Pitcock <nenolod@atheme.org>
parents:
3196
diff
changeset
|
351 snd_pcm_hw_params_set_rate_resample(pcm_handle, hwparams, 1); |
d2e01ca06335
alsa-ng: Work around *broken* drivers, such as snd-au88xx.
William Pitcock <nenolod@atheme.org>
parents:
3196
diff
changeset
|
352 |
d2e01ca06335
alsa-ng: Work around *broken* drivers, such as snd-au88xx.
William Pitcock <nenolod@atheme.org>
parents:
3196
diff
changeset
|
353 snd_pcm_hw_params_set_rate_near(pcm_handle, hwparams, &rate_, 0); |
d2e01ca06335
alsa-ng: Work around *broken* drivers, such as snd-au88xx.
William Pitcock <nenolod@atheme.org>
parents:
3196
diff
changeset
|
354 if (rate_ != rate) |
d2e01ca06335
alsa-ng: Work around *broken* drivers, such as snd-au88xx.
William Pitcock <nenolod@atheme.org>
parents:
3196
diff
changeset
|
355 { |
d2e01ca06335
alsa-ng: Work around *broken* drivers, such as snd-au88xx.
William Pitcock <nenolod@atheme.org>
parents:
3196
diff
changeset
|
356 _ERROR("sample rate %d is not supported (got %d)", rate, rate_); |
d2e01ca06335
alsa-ng: Work around *broken* drivers, such as snd-au88xx.
William Pitcock <nenolod@atheme.org>
parents:
3196
diff
changeset
|
357 return -1; |
d2e01ca06335
alsa-ng: Work around *broken* drivers, such as snd-au88xx.
William Pitcock <nenolod@atheme.org>
parents:
3196
diff
changeset
|
358 } |
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
|
359 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
360 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
|
361 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
|
362 { |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
363 _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
|
364 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
|
365 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
366 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
367 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
|
368 bps = (rate * bitwidth * nch) >> 3; |
3196
0f7180e3b163
alsa-ng: Enforce a minimum buffer size of 500ms.
William Pitcock <nenolod@atheme.org>
parents:
3194
diff
changeset
|
369 |
3199
263c7d983100
alsa-ng: 0.1 sec hard minimum buffer size.
John Lindgren <john.lindgren@tds.net>
parents:
3198
diff
changeset
|
370 buf_size = MAX(aud_cfg->output_buffer_size, 100); |
3196
0f7180e3b163
alsa-ng: Enforce a minimum buffer size of 500ms.
William Pitcock <nenolod@atheme.org>
parents:
3194
diff
changeset
|
371 ringbuf_size = buf_size * bps / 1000; |
0f7180e3b163
alsa-ng: Enforce a minimum buffer size of 500ms.
William Pitcock <nenolod@atheme.org>
parents:
3194
diff
changeset
|
372 |
3184
b009fad90e92
alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents:
3183
diff
changeset
|
373 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
|
374 _ERROR("alsaplug_ringbuffer_init failed"); |
b009fad90e92
alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents:
3183
diff
changeset
|
375 return -1; |
b009fad90e92
alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents:
3183
diff
changeset
|
376 } |
3196
0f7180e3b163
alsa-ng: Enforce a minimum buffer size of 500ms.
William Pitcock <nenolod@atheme.org>
parents:
3194
diff
changeset
|
377 |
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
|
378 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
|
379 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
|
380 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
381 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
|
382 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
|
383 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
384 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
385 static 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
|
386 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
|
387 { |
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
|
388 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
|
389 |
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
|
390 pcm_going = FALSE; |
3172
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
391 wr_total = 0; |
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
392 wr_hwframes = 0; |
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
393 bps = 0; |
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
394 |
3191
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
395 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
|
396 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
|
397 |
3167
9739ba93fd79
alsa-ng: Don't try to join threads that have already exited.
William Pitcock <nenolod@atheme.org>
parents:
3166
diff
changeset
|
398 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
|
399 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
|
400 |
3164
adec82db531c
alsa-ng: Everything but mixer (and custom output settings) should be working now.
William Pitcock <nenolod@atheme.org>
parents:
3163
diff
changeset
|
401 audio_thread = NULL; |
3162
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
402 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
403 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
404 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
|
405 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
|
406 { |
3172
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
407 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
|
408 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
|
409 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
|
410 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
|
411 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
|
412 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
413 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
414 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
|
415 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
|
416 { |
3174
8106e1b31115
alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents:
3173
diff
changeset
|
417 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
|
418 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
|
419 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
|
420 |
3174
8106e1b31115
alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents:
3173
diff
changeset
|
421 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
|
422 |
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
|
423 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
|
424 { |
3184
b009fad90e92
alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents:
3183
diff
changeset
|
425 guint d = alsaplug_ringbuffer_used(&pcm_ringbuf); |
b009fad90e92
alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents:
3183
diff
changeset
|
426 |
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
|
427 if (!snd_pcm_delay(pcm_handle, &delay)) |
3184
b009fad90e92
alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents:
3183
diff
changeset
|
428 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
|
429 |
b009fad90e92
alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents:
3183
diff
changeset
|
430 if (bytes < d) |
b009fad90e92
alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents:
3183
diff
changeset
|
431 bytes = 0; |
b009fad90e92
alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents:
3183
diff
changeset
|
432 else |
b009fad90e92
alsa-ng: buffer timing cleanups
Joris van Rantwijk <joris2822@xs4all.nl>
parents:
3183
diff
changeset
|
433 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
|
434 |
3182
631d217913e0
alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents:
3181
diff
changeset
|
435 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
|
436 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
437 |
3174
8106e1b31115
alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents:
3173
diff
changeset
|
438 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
|
439 |
8106e1b31115
alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents:
3173
diff
changeset
|
440 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
|
441 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
442 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
443 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
|
444 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
|
445 { |
3174
8106e1b31115
alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents:
3173
diff
changeset
|
446 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
|
447 |
8106e1b31115
alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents:
3173
diff
changeset
|
448 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
|
449 |
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
|
450 if (pcm_going) |
3183
19e3ec80dac9
alsa-ng: Another arithmetic overflow (hopefully the last one).
John Lindgren <john.lindgren@tds.net>
parents:
3182
diff
changeset
|
451 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
|
452 |
3174
8106e1b31115
alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents:
3173
diff
changeset
|
453 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
|
454 |
8106e1b31115
alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
William Pitcock <nenolod@atheme.org>
parents:
3173
diff
changeset
|
455 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
|
456 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
457 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
458 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
|
459 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
|
460 { |
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
|
461 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
|
462 |
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
|
463 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
|
464 |
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
|
465 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
|
466 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
|
467 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
|
468 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
|
469 |
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
|
470 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
|
471 |
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
|
472 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
|
473 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
474 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
475 static 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
|
476 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
|
477 { |
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
|
478 /* 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
|
479 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
|
480 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
|
481 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
|
482 |
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 /* ...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
|
484 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
|
485 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
|
486 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
487 |
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 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
|
489 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
|
490 { |
3172
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
491 gint ret; |
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
492 |
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
493 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
|
494 |
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
495 if (pcm_going == FALSE) |
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
496 ret = 0; |
3182
631d217913e0
alsa-ng: Fix arithmetic overflow on 32-bit systems.
John Lindgren <john.lindgren@tds.net>
parents:
3181
diff
changeset
|
497 else |
3172
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
498 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
|
499 |
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
500 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
|
501 |
1b2350bdeaef
alsa-ng: Be less stupid if things don't open.
William Pitcock <nenolod@atheme.org>
parents:
3168
diff
changeset
|
502 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
|
503 } |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
504 |
3165
087abc78516e
alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents:
3164
diff
changeset
|
505 static void |
087abc78516e
alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents:
3164
diff
changeset
|
506 alsaplug_pause(short p) |
087abc78516e
alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents:
3164
diff
changeset
|
507 { |
3191
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
508 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
|
509 paused = p; |
3191
a65f440cbed3
alsa-ng: Fix possible race conditions, sluggish pause and seek.
John Lindgren <john.lindgren@tds.net>
parents:
3188
diff
changeset
|
510 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
|
511 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
|
512 } |
087abc78516e
alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents:
3164
diff
changeset
|
513 |
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
|
514 /******************************************************************************** |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
515 * 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
|
516 ********************************************************************************/ |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
517 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
518 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
|
519 .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
|
520 .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
|
521 .init = alsaplug_init, |
3198
83b1a4e5f453
alsa-ng: Keep mixer open even when playback stopped.
John Lindgren <john.lindgren@tds.net>
parents:
3197
diff
changeset
|
522 .cleanup = alsaplug_cleanup, |
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
|
523 .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
|
524 .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
|
525 .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
|
526 .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
|
527 .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
|
528 .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
|
529 .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
|
530 .flush = alsaplug_flush, |
3165
087abc78516e
alsa-ng: implement pause stuff. not perfect yet.
William Pitcock <nenolod@atheme.org>
parents:
3164
diff
changeset
|
531 .pause = alsaplug_pause, |
3177
1117166277f7
alsa-ng: Mixer support. Should be 100% plug-and-play.
William Pitcock <nenolod@atheme.org>
parents:
3176
diff
changeset
|
532 .set_volume = alsaplug_set_volume, |
3178
4634dab72608
alsa-ng: Add get_volume() implementation.
William Pitcock <nenolod@atheme.org>
parents:
3177
diff
changeset
|
533 .get_volume = alsaplug_get_volume, |
3192
d1d9b159801a
alsa-ng: Add configuration settings.
William Pitcock <nenolod@atheme.org>
parents:
3191
diff
changeset
|
534 .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
|
535 }; |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
536 |
e387614b9be9
alsa-ng: Import rewritten ALSA plugin. This is still woefully incomplete, but supports basic playback.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
537 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
|
538 SIMPLE_OUTPUT_PLUGIN(alsa, alsa_oplist); |