Mercurial > audlegacy
annotate src/audacious/output.c @ 3395:df609e7e7bcf
updated romanian translation
| author | Cristi Magherusan <majeru@atheme-project.org> |
|---|---|
| date | Sun, 26 Aug 2007 03:06:40 +0300 |
| parents | f1c756f39e6c |
| children | 3092a8b3fe34 |
| rev | line source |
|---|---|
| 2313 | 1 /* Audacious - Cross-platform multimedia player |
| 2 * Copyright (C) 2005-2007 Audacious team | |
| 3 * | |
| 4 * Based on BMP: | |
| 5 * Copyright (C) 2003-2004 BMP development team. | |
| 6 * | |
| 7 * Based on XMMS: | |
| 8 * Copyright (C) 1998-2003 XMMS development team. | |
| 9 * | |
| 10 * This program is free software; you can redistribute it and/or modify | |
| 11 * it under the terms of the GNU General Public License as published by | |
|
3121
3b6d316f8b09
GPL3 relicensing.
William Pitcock <nenolod@atheme-project.org>
parents:
2813
diff
changeset
|
12 * the Free Software Foundation; under version 3 of the License. |
| 2313 | 13 * |
| 14 * This program is distributed in the hope that it will be useful, | |
| 15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
| 16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
| 17 * GNU General Public License for more details. | |
| 18 * | |
| 19 * You should have received a copy of the GNU General Public License | |
|
3121
3b6d316f8b09
GPL3 relicensing.
William Pitcock <nenolod@atheme-project.org>
parents:
2813
diff
changeset
|
20 * along with this program. If not, see <http://www.gnu.org/licenses>. |
|
3123
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
21 * |
|
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
22 * The Audacious team does not consider modular code linking to |
|
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
23 * Audacious or using our public API to be a derived work. |
| 2313 | 24 */ |
| 25 | |
| 26 #ifdef HAVE_CONFIG_H | |
| 27 # include "config.h" | |
| 28 #endif | |
| 29 | |
| 30 #include "output.h" | |
| 31 #include "iir.h" | |
| 32 #include "main.h" | |
| 33 #include "input.h" | |
| 2328 | 34 #include "playback.h" |
| 2313 | 35 |
| 36 #include "playlist.h" | |
| 2717 | 37 #include "configdb.h" |
| 2542 | 38 |
|
2811
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
39 #include "effect.h" |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
40 |
| 2542 | 41 #include <math.h> |
| 42 | |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
43 #ifdef USE_SRC |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
44 #include <samplerate.h> |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
45 #endif |
| 2313 | 46 |
| 47 OutputPluginData op_data = { | |
| 48 NULL, | |
| 49 NULL | |
| 50 }; | |
| 51 | |
| 52 OutputPluginState op_state = { | |
| 53 0, | |
| 54 0, | |
| 55 0 | |
| 56 }; | |
| 57 | |
| 58 OutputPlugin psuedo_output_plugin = { | |
| 59 NULL, | |
| 60 NULL, | |
| 61 "XMMS reverse compatibility output plugin", | |
| 62 NULL, | |
| 63 NULL, | |
| 64 NULL, | |
| 65 NULL, | |
| 66 output_get_volume, | |
| 67 output_set_volume, | |
| 68 output_open_audio, | |
| 69 output_write_audio, | |
| 70 output_close_audio, | |
| 71 | |
| 72 output_flush, | |
| 73 output_pause, | |
| 74 output_buffer_free, | |
| 75 output_buffer_playing, | |
| 76 get_output_time, | |
| 77 get_written_time, | |
| 78 NULL | |
| 79 }; | |
| 80 | |
| 81 OutputPlugin * | |
| 82 get_current_output_plugin(void) | |
| 83 { | |
| 84 return op_data.current_output_plugin; | |
| 85 } | |
| 86 | |
| 87 void | |
| 88 set_current_output_plugin(gint i) | |
| 89 { | |
| 90 gboolean playing; | |
| 91 OutputPlugin *op = get_current_output_plugin(); | |
| 92 | |
| 93 GList *node = g_list_nth(op_data.output_list, i); | |
| 94 if (!node) { | |
| 95 op_data.current_output_plugin = NULL; | |
| 96 return; | |
| 97 } | |
| 98 | |
| 99 op_data.current_output_plugin = node->data; | |
| 100 | |
| 101 playing = playback_get_playing(); | |
| 102 | |
| 103 if (playing == TRUE) | |
| 104 { | |
| 105 guint time, pos; | |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
106 PlaylistEntry *entry; |
| 2313 | 107 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
108 /* don't stop yet, get the seek time and playlist position first */ |
| 2313 | 109 pos = playlist_get_position(playlist_get_active()); |
| 110 time = op->output_time(); | |
| 111 | |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
112 /* reset the audio system */ |
| 2313 | 113 mainwin_stop_pushed(); |
| 114 op->close_audio(); | |
| 115 | |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
116 g_usleep(300000); |
| 2313 | 117 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
118 /* wait for the playback thread to come online */ |
| 2313 | 119 while (playback_get_playing()) |
| 120 g_message("waiting for audio system shutdown..."); | |
| 121 | |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
122 /* wait for the playback thread to come online */ |
| 2313 | 123 playlist_set_position(playlist_get_active(), pos); |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
124 entry = playlist_get_entry_to_play(playlist_get_active()); |
| 2313 | 125 playback_play_file(entry); |
| 126 | |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
127 while (!playback_get_playing()) |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
128 { |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
129 gtk_main_iteration(); |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
130 g_message("waiting for audio system startup..."); |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
131 } |
| 2313 | 132 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
133 /* and signal a reseek */ |
| 2313 | 134 if (playlist_get_current_length(playlist_get_active()) > -1 && |
| 135 time <= (playlist_get_current_length(playlist_get_active()))) | |
| 136 playback_seek(time / 1000); | |
| 137 } | |
| 138 } | |
| 139 | |
| 140 GList * | |
| 141 get_output_list(void) | |
| 142 { | |
| 143 return op_data.output_list; | |
| 144 } | |
| 145 | |
| 146 void | |
| 147 output_about(gint i) | |
| 148 { | |
| 149 OutputPlugin *out = g_list_nth(op_data.output_list, i)->data; | |
| 150 if (out && out->about) | |
| 151 out->about(); | |
| 152 } | |
| 153 | |
| 154 void | |
| 155 output_configure(gint i) | |
| 156 { | |
| 157 OutputPlugin *out = g_list_nth(op_data.output_list, i)->data; | |
| 158 if (out && out->configure) | |
| 159 out->configure(); | |
| 160 } | |
| 161 | |
| 162 void | |
| 163 output_get_volume(gint * l, gint * r) | |
| 164 { | |
| 165 *l = *r = -1; | |
| 166 | |
| 167 if (!op_data.current_output_plugin) | |
| 168 return; | |
| 169 | |
| 170 if (!op_data.current_output_plugin->get_volume) | |
| 171 return; | |
| 172 | |
| 173 op_data.current_output_plugin->get_volume(l, r); | |
| 174 } | |
| 175 | |
| 176 void | |
| 177 output_set_volume(gint l, gint r) | |
| 178 { | |
| 179 if (!op_data.current_output_plugin) | |
| 180 return; | |
| 181 | |
| 182 if (!op_data.current_output_plugin->set_volume) | |
| 183 return; | |
| 184 | |
| 185 op_data.current_output_plugin->set_volume(l, r); | |
| 186 } | |
| 187 | |
| 188 void | |
| 189 output_set_eq(gboolean active, gfloat pre, gfloat * bands) | |
| 190 { | |
| 191 int i; | |
| 192 preamp[0] = 1.0 + 0.0932471 * pre + 0.00279033 * pre * pre; | |
| 193 preamp[1] = 1.0 + 0.0932471 * pre + 0.00279033 * pre * pre; | |
| 194 | |
| 195 for (i = 0; i < 10; ++i) | |
| 196 { | |
|
2813
49f3d1b43518
[svn] - code cleanups involving SRC patch and indentation
nenolod
parents:
2811
diff
changeset
|
197 set_gain(i, 0, 0.03 * bands[i] + 0.000999999 * bands[i] * bands[i]); |
|
49f3d1b43518
[svn] - code cleanups involving SRC patch and indentation
nenolod
parents:
2811
diff
changeset
|
198 set_gain(i, 1, 0.03 * bands[i] + 0.000999999 * bands[i] * bands[i]); |
| 2313 | 199 } |
| 200 } | |
| 201 | |
| 202 /* this should be in BYTES, NOT gint16s */ | |
| 203 static void | |
| 204 byteswap(size_t size, | |
| 205 gint16 * buf) | |
| 206 { | |
| 207 gint16 *it; | |
| 208 size &= ~1; /* must be multiple of 2 */ | |
| 209 for (it = buf; it < buf + size / 2; ++it) | |
| 210 *(guint16 *) it = GUINT16_SWAP_LE_BE(*(guint16 *) it); | |
| 211 } | |
| 212 | |
| 213 /* called by input plugin to peek at the output plugin's write progress */ | |
| 214 gint | |
| 215 get_written_time(void) | |
| 216 { | |
| 217 OutputPlugin *op = get_current_output_plugin(); | |
| 218 | |
| 219 return op->written_time(); | |
| 220 } | |
| 221 | |
| 222 /* called by input plugin to peek at the output plugin's output progress */ | |
| 223 gint | |
| 224 get_output_time(void) | |
| 225 { | |
| 226 OutputPlugin *op = get_current_output_plugin(); | |
| 227 | |
| 228 return op->output_time(); | |
| 229 } | |
| 230 | |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
231 #ifdef USE_SRC |
|
2813
49f3d1b43518
[svn] - code cleanups involving SRC patch and indentation
nenolod
parents:
2811
diff
changeset
|
232 |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
233 static SRC_STATE *src_state; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
234 static SRC_DATA src_data; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
235 static int overSamplingFs = 96000; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
236 static int converter_type = SRC_SINC_BEST_QUALITY; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
237 static int srcError = 0; |
|
2648
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
238 |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
239 static float *srcIn = NULL, *srcOut = NULL; |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
240 static short int *wOut = NULL; |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
241 static int lengthOfSrcIn = 0; |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
242 static int lengthOfSrcOut = 0; |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
243 |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
244 static void freeSRC() |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
245 { |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
246 if(src_state != NULL) |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
247 src_state = src_delete(src_state); |
|
2648
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
248 free(srcIn); |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
249 free(srcOut); |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
250 free(wOut); |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
251 srcIn = NULL; |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
252 srcOut = NULL; |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
253 wOut = NULL; |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
254 lengthOfSrcIn = 0; |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
255 lengthOfSrcOut = 0; |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
256 } |
|
2813
49f3d1b43518
[svn] - code cleanups involving SRC patch and indentation
nenolod
parents:
2811
diff
changeset
|
257 |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
258 #endif |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
259 |
| 2313 | 260 gint |
| 261 output_open_audio(AFormat fmt, gint rate, gint nch) | |
| 262 { | |
| 263 gint ret; | |
| 264 OutputPlugin *op; | |
| 265 | |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
266 #ifdef USE_SRC |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
267 ConfigDb *db; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
268 gboolean src_enabled; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
269 gint src_rate, src_type; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
270 db = bmp_cfg_db_open(); |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
271 |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
272 if (bmp_cfg_db_get_bool(db, NULL, "enable_src", &src_enabled) == FALSE) |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
273 src_enabled = FALSE; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
274 |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
275 if (bmp_cfg_db_get_int(db, NULL, "src_rate", &src_rate) == FALSE) |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
276 overSamplingFs = 48000; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
277 else |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
278 overSamplingFs = src_rate; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
279 |
|
2649
153dc928115a
[svn] - don't resample if source rate matches the internal clock rate. closes #881.
nenolod
parents:
2648
diff
changeset
|
280 /* don't resample if sampling rates are the same --nenolod */ |
|
153dc928115a
[svn] - don't resample if source rate matches the internal clock rate. closes #881.
nenolod
parents:
2648
diff
changeset
|
281 if (rate == overSamplingFs) |
|
153dc928115a
[svn] - don't resample if source rate matches the internal clock rate. closes #881.
nenolod
parents:
2648
diff
changeset
|
282 src_enabled = FALSE; |
|
153dc928115a
[svn] - don't resample if source rate matches the internal clock rate. closes #881.
nenolod
parents:
2648
diff
changeset
|
283 |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
284 if (bmp_cfg_db_get_int(db, NULL, "src_type", &src_type) == FALSE) |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
285 converter_type = SRC_SINC_BEST_QUALITY; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
286 else |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
287 converter_type = src_type; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
288 |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
289 bmp_cfg_db_close(db); |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
290 |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
291 freeSRC(); |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
292 |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
293 if(src_enabled&& |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
294 (fmt == FMT_S16_NE||(fmt == FMT_S16_LE && G_BYTE_ORDER == G_LITTLE_ENDIAN)|| |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
295 (fmt == FMT_S16_BE && G_BYTE_ORDER == G_BIG_ENDIAN))) |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
296 { |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
297 src_state = src_new(converter_type, nch, &srcError); |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
298 if (src_state != NULL) |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
299 { |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
300 src_data.src_ratio = (float)overSamplingFs/(float)rate; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
301 rate = overSamplingFs; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
302 } |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
303 else |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
304 fprintf(stderr, "src_new(): %s\n\n", src_strerror(srcError)); |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
305 } |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
306 #endif |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
307 |
| 2313 | 308 op = get_current_output_plugin(); |
| 309 | |
| 310 if (op == NULL) | |
| 311 return -1; | |
| 312 | |
| 313 /* Is our output port already open? */ | |
| 314 if ((op_state.rate != 0 && op_state.nch != 0) && | |
|
2813
49f3d1b43518
[svn] - code cleanups involving SRC patch and indentation
nenolod
parents:
2811
diff
changeset
|
315 (op_state.rate == rate && op_state.nch == nch && op_state.fmt == fmt)) |
| 2313 | 316 { |
|
2813
49f3d1b43518
[svn] - code cleanups involving SRC patch and indentation
nenolod
parents:
2811
diff
changeset
|
317 /* Yes, and it's the correct sampling rate. Reset the counter and go. */ |
|
49f3d1b43518
[svn] - code cleanups involving SRC patch and indentation
nenolod
parents:
2811
diff
changeset
|
318 op->flush(0); |
| 2313 | 319 return 1; |
| 320 } | |
| 321 else if (op_state.rate != 0 && op_state.nch != 0) | |
|
2813
49f3d1b43518
[svn] - code cleanups involving SRC patch and indentation
nenolod
parents:
2811
diff
changeset
|
322 op->close_audio(); |
| 2313 | 323 |
| 324 ret = op->open_audio(fmt, rate, nch); | |
| 325 | |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
326 if (ret == 1) /* Success? */ |
| 2313 | 327 { |
| 328 op_state.fmt = fmt; | |
| 329 op_state.rate = rate; | |
| 330 op_state.nch = nch; | |
| 331 } | |
| 332 | |
| 333 return ret; | |
| 334 } | |
| 335 | |
| 336 void | |
| 337 output_write_audio(gpointer ptr, gint length) | |
| 338 { | |
| 339 OutputPlugin *op = get_current_output_plugin(); | |
| 340 | |
| 341 /* Sanity check. */ | |
| 342 if (op == NULL) | |
| 343 return; | |
| 344 | |
| 345 op->write_audio(ptr, length); | |
| 346 } | |
| 347 | |
| 348 void | |
| 349 output_close_audio(void) | |
| 350 { | |
| 351 OutputPlugin *op = get_current_output_plugin(); | |
| 352 | |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
353 #ifdef USE_SRC |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
354 freeSRC(); |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
355 #endif |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
356 |
| 2313 | 357 /* Do not close if there are still songs to play and the user has |
| 358 * not requested a stop. --nenolod | |
| 359 */ | |
| 360 if (ip_data.stop == FALSE && | |
| 2673 | 361 (playlist_get_position_nolock(playlist_get_active()) < |
| 362 playlist_get_length(playlist_get_active()) - 1)) | |
| 2313 | 363 return; |
| 364 | |
| 365 /* Sanity check. */ | |
| 366 if (op == NULL) | |
| 367 return; | |
| 368 | |
| 369 op->close_audio(); | |
| 370 | |
| 371 /* Reset the op_state. */ | |
| 372 op_state.fmt = op_state.rate = op_state.nch = 0; | |
| 373 } | |
| 374 | |
| 375 void | |
| 376 output_flush(gint time) | |
| 377 { | |
| 378 OutputPlugin *op = get_current_output_plugin(); | |
| 379 | |
| 380 if (op == NULL) | |
| 381 return; | |
| 382 | |
| 383 op->flush(time); | |
| 384 } | |
| 385 | |
| 386 void | |
| 387 output_pause(gshort paused) | |
| 388 { | |
| 389 OutputPlugin *op = get_current_output_plugin(); | |
| 390 | |
| 391 if (op == NULL) | |
| 392 return; | |
| 393 | |
| 394 op->pause(paused); | |
| 395 } | |
| 396 | |
| 397 gint | |
| 398 output_buffer_free(void) | |
| 399 { | |
| 400 OutputPlugin *op = get_current_output_plugin(); | |
| 401 | |
| 402 if (op == NULL) | |
| 403 return 0; | |
| 404 | |
| 405 return op->buffer_free(); | |
| 406 } | |
| 407 | |
| 408 gint | |
| 409 output_buffer_playing(void) | |
| 410 { | |
| 411 OutputPlugin *op = get_current_output_plugin(); | |
| 412 | |
| 413 if (op == NULL) | |
| 414 return 0; | |
| 415 | |
| 416 return op->buffer_playing(); | |
| 417 } | |
| 418 | |
| 419 /* called by input plugin when data is ready */ | |
| 420 void | |
| 421 produce_audio(gint time, /* position */ | |
| 422 AFormat fmt, /* output format */ | |
| 423 gint nch, /* channels */ | |
| 424 gint length, /* length of sample */ | |
| 425 gpointer ptr, /* data */ | |
| 426 int *going /* 0 when time to stop */ | |
| 427 ) | |
| 428 { | |
| 429 static int init = 0; | |
| 430 int swapped = 0; | |
| 431 guint myorder = G_BYTE_ORDER == G_LITTLE_ENDIAN ? FMT_S16_LE : FMT_S16_BE; | |
| 432 int caneq = (fmt == FMT_S16_NE || fmt == myorder); | |
| 433 OutputPlugin *op = get_current_output_plugin(); | |
|
2811
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
434 EffectPlugin *ep = get_current_effect_plugin(); |
| 2313 | 435 int writeoffs; |
|
2811
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
436 AFormat new_format; |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
437 gint new_rate; |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
438 gint new_nch; |
| 2313 | 439 |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
440 #ifdef USE_SRC |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
441 if(src_state != NULL&&length > 0) |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
442 { |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
443 int lrLength = length/2; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
444 int overLrLength = (int)floor(lrLength*(src_data.src_ratio+1)); |
|
2648
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
445 if(lengthOfSrcIn < lrLength) |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
446 { |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
447 lengthOfSrcIn = lrLength; |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
448 free(srcIn); |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
449 srcIn = (float*)malloc(sizeof(float)*lrLength); |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
450 } |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
451 if(lengthOfSrcOut < overLrLength) |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
452 { |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
453 lengthOfSrcOut = overLrLength; |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
454 free(srcOut); |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
455 free(wOut); |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
456 srcOut = (float*)malloc(sizeof(float)*overLrLength); |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
457 wOut = (short int*)malloc(sizeof(short int)*overLrLength); |
|
51495131e4ae
[svn] - synchronize SRC conversion patch with upstream
nenolod
parents:
2542
diff
changeset
|
458 } |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
459 src_short_to_float_array((short int*)ptr, srcIn, lrLength); |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
460 src_data.data_in = srcIn; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
461 src_data.data_out = srcOut; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
462 src_data.end_of_input = 0; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
463 src_data.input_frames = lrLength/2; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
464 src_data.output_frames = overLrLength/2; |
| 2542 | 465 if ((srcError = src_process(src_state, &src_data)) > 0) |
|
2538
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
466 { |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
467 fprintf(stderr, "src_process(): %s\n", src_strerror(srcError)); |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
468 } |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
469 else |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
470 { |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
471 src_float_to_short_array(srcOut, wOut, src_data.output_frames_gen*2); |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
472 ptr = wOut; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
473 length = src_data.output_frames_gen*4; |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
474 } |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
475 } |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
476 #endif |
|
719e0898ff3c
[svn] - Patch to use libsamplerate for high-quality interpolated upsampling,
nenolod
parents:
2373
diff
changeset
|
477 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
478 if (!caneq && cfg.equalizer_active) { /* wrong byte order */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
479 byteswap(length, ptr); /* so convert */ |
| 2313 | 480 ++swapped; |
| 481 ++caneq; | |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
482 } /* can eq now, mark swapd */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
483 else if (caneq && !cfg.equalizer_active) /* right order but no eq */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
484 caneq = 0; /* so don't eq */ |
| 2313 | 485 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
486 if (caneq) { /* if eq enab */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
487 if (!init) { /* if first run */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
488 init_iir(); /* then init eq */ |
| 2313 | 489 ++init; |
| 490 } | |
| 491 | |
| 492 iir(&ptr, length, nch); | |
| 493 | |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
494 if (swapped) /* if was swapped */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
495 byteswap(length, ptr); /* swap back for output */ |
| 2313 | 496 } |
| 497 | |
| 498 /* do vis plugin(s) */ | |
| 499 input_add_vis_pcm(time, fmt, nch, length, ptr); | |
| 500 | |
|
2811
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
501 /* do effect plugin(s) */ |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
502 if (effects_enabled() && ep && ep->query_format) { |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
503 new_format = op_state.fmt; |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
504 new_rate = op_state.rate; |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
505 new_nch = op_state.nch; |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
506 |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
507 ep->query_format(&new_format, &new_rate, &new_nch); |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
508 |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
509 if (new_format != op_state.fmt || |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
510 new_rate != op_state.rate || |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
511 new_nch != op_state.nch) { |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
512 /* |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
513 * The effect plugin changes the stream format. Reopen the |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
514 * audio device. |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
515 */ |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
516 if (0 == output_open_audio(new_format, new_rate, new_nch)) { |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
517 /* |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
518 * Fatal error. |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
519 */ |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
520 return; |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
521 } |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
522 } |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
523 } |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
524 |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
525 if (effects_enabled() && ep && ep->mod_samples) |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
526 length = ep->mod_samples(&ptr, length, op_state.fmt, |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
527 op_state.rate, op_state.nch); |
|
1c7ee5ed3a10
[svn] Move effect plugin handling into the main thread
ertzing
parents:
2717
diff
changeset
|
528 |
| 2313 | 529 writeoffs = 0; |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
530 while (writeoffs < length) |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
531 { |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
532 int writable = length - writeoffs; |
| 2313 | 533 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
534 if (writable > 2048) |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
535 writable = 2048; |
| 2313 | 536 |
|
2813
49f3d1b43518
[svn] - code cleanups involving SRC patch and indentation
nenolod
parents:
2811
diff
changeset
|
537 if (writable == 0) |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
538 return; |
| 2313 | 539 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
540 while (op->buffer_free() < writable) { /* wait output buf */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
541 if (going && !*going) /* thread stopped? */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
542 return; /* so finish */ |
| 2313 | 543 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
544 if (ip_data.stop) /* has a stop been requested? */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
545 return; /* yes, so finish */ |
| 2313 | 546 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
547 g_usleep(10000); /* else sleep for retry */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
548 } |
| 2313 | 549 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
550 if (ip_data.stop) |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
551 return; |
| 2313 | 552 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
553 if (going && !*going) /* thread stopped? */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
554 return; /* so finish */ |
| 2313 | 555 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
556 /* do output */ |
|
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
557 op->write_audio(((guint8 *) ptr) + writeoffs, writable); |
| 2313 | 558 |
|
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
559 writeoffs += writable; |
| 2313 | 560 } |
| 561 } |
