Mercurial > audlegacy-plugins
annotate src/crossfade/crossfade.c @ 3065:a0ba6102131d
crossfade-ng: remove more cruft, kill some warnings.
author | William Pitcock <nenolod@atheme.org> |
---|---|
date | Fri, 24 Apr 2009 06:38:48 -0500 |
parents | 43a336a7791b |
children | c0ae2a5a15e8 |
rev | line source |
---|---|
3059
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1 /* |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2 * XMMS Crossfade Plugin |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
3 * Copyright (C) 2000-2007 Peter Eisenlohr <peter@eisenlohr.org> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
4 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
5 * based on the original OSS Output Plugin |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
6 * Copyright (C) 1998-2000 Peter Alm, Mikael Alm, Olle Hallnas, Thomas Nilsson and 4Front Technologies |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
7 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
8 * This program is free software; you can redistribute it and/or modify |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
9 * it under the terms of the GNU General Public License as published by |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
10 * the Free Software Foundation; either version 2 of the License, or |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
11 * (at your option) any later version. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
12 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
13 * This program is distributed in the hope that it will be useful, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
16 * GNU General Public License for more details. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
17 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
18 * You should have received a copy of the GNU General Public License |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
19 * along with this program; if not, write to the Free Software |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
20 * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
21 * USA. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
22 */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
23 /* indent -i8 -ts8 -hnl -bli0 -l128 -npcs -cli8 */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
24 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
25 #ifdef HAVE_CONFIG_H |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
26 # include "config.h" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
27 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
28 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
29 #include "crossfade.h" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
30 #include "cfgutil.h" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
31 #include "format.h" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
32 #include "convert.h" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
33 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
34 #include "configure.h" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
35 #include "monitor.h" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
36 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
37 #include "interface-2.0.h" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
38 #include "support-2.0.h" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
39 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
40 #ifdef HAVE_LIBFFTW |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
41 # include "fft.h" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
42 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
43 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
44 #include <stdio.h> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
45 #include <string.h> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
46 #include <stdlib.h> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
47 #include <ctype.h> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
48 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
49 #ifdef HAVE_DLFCN_H |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
50 # include <dlfcn.h> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
51 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
52 #include <unistd.h> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
53 #include <signal.h> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
54 #include <sys/time.h> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
55 #include <sys/types.h> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
56 #include <sys/ioctl.h> |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
57 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
58 #undef DEBUG_HARDCORE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
59 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
60 /* output plugin callback prototypes */ |
3065
a0ba6102131d
crossfade-ng: remove more cruft, kill some warnings.
William Pitcock <nenolod@atheme.org>
parents:
3064
diff
changeset
|
61 static OutputPluginInitStatus xfade_init(); |
3059
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
62 static void xfade_cleanup(); /* audacious and patched only */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
63 static void xfade_set_volume(int l, int r); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
64 static void xfade_get_volume(int *l, int *r); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
65 static gint xfade_open_audio(AFormat fmt, int rate, int nch); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
66 static void xfade_write_audio(void *ptr, int length); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
67 static void xfade_close_audio(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
68 static void xfade_flush(int time); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
69 static void xfade_pause(short paused); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
70 static gint xfade_buffer_free(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
71 static gint xfade_buffer_playing(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
72 static gint xfade_written_time(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
73 static gint xfade_output_time(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
74 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
75 /* output plugin callback table (extended, needs patched player) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
76 static struct |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
77 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
78 OutputPlugin xfade_op; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
79 void (*cleanup) (void); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
80 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
81 xfade_op_private = |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
82 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
83 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
84 .description = "Crossfade Plugin", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
85 .init = xfade_init, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
86 .cleanup = xfade_cleanup, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
87 .get_volume = xfade_get_volume, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
88 .set_volume = xfade_set_volume, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
89 .open_audio = xfade_open_audio, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
90 .write_audio = xfade_write_audio, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
91 .close_audio = xfade_close_audio, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
92 .flush = xfade_flush, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
93 .pause = xfade_pause, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
94 .buffer_free = xfade_buffer_free, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
95 .buffer_playing = xfade_buffer_playing, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
96 .output_time = xfade_output_time, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
97 .written_time = xfade_written_time, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
98 .about = xfade_about, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
99 .configure = xfade_configure, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
100 .probe_priority = 2, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
101 }, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
102 NULL |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
103 }; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
104 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
105 static OutputPlugin *xfade_op = &xfade_op_private.xfade_op; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
106 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
107 static OutputPlugin *xfade_oplist[] = { &xfade_op_private.xfade_op, NULL }; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
108 DECLARE_PLUGIN(crossfade, NULL, NULL, NULL, xfade_oplist, NULL, NULL, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
109 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
110 /* internal prototypes */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
111 static void load_symbols(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
112 static void output_list_hack(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
113 static gint open_output(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
114 static void buffer_reset(buffer_t *buf, config_t *cfg); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
115 static void *buffer_thread_f(void *arg); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
116 static void sync_output(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
117 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
118 /* special XMMS symbols (dynamically looked up, see xfade_init) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
119 static gboolean *xmms_playlist_get_info_going = NULL; /* XMMS */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
120 static gboolean *xmms_is_quitting = NULL; /* XMMS */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
121 static gboolean *input_stopped_for_restart = NULL; /* XMMS */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
122 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
123 /* This function has been stolen from libxmms/util.c. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
124 void xfade_usleep(gint usec) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
125 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
126 #if defined(HAVE_G_USLEEP) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
127 g_usleep(usec); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
128 #elif defined(HAVE_NANOSLEEP) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
129 struct timespec req; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
130 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
131 req.tv_sec = usec / 1000000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
132 usec -= req.tv_sec * 1000000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
133 req.tv_nsec = usec * 1000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
134 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
135 nanosleep(&req, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
136 #else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
137 struct timeval tv; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
138 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
139 tv.tv_sec = usec / 1000000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
140 usec -= tv.tv_sec * 1000000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
141 tv.tv_usec = usec; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
142 select(0, NULL, NULL, NULL, &tv); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
143 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
144 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
145 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
146 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
147 /* local variables */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
148 static gboolean realtime; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
149 static gboolean is_http; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
150 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
151 static gint64 streampos; /* position within current song (input bps) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
152 static gboolean playing; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
153 gboolean opened; /* TRUE between open_audio() and close_audio() */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
154 static gboolean paused; /* TRUE: no playback (but still filling buffer) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
155 static gboolean stopped; /* TRUE: stop buffer thread ASAP */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
156 static gboolean eop; /* TRUE: wait until buffer is empty then sync() */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
157 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
158 #ifdef HAVE_OSS /* avoid 'defined but not used' compiler warning */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
159 static plugin_config_t default_op_config = DEFAULT_OP_CONFIG; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
160 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
161 static plugin_config_t the_op_config = DEFAULT_OP_CONFIG; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
162 OutputPlugin *the_op = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
163 gint the_rate = 44100; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
164 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
165 static gboolean input_playing = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
166 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
167 gboolean output_opened = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
168 gboolean output_restart = FALSE; /* used by XMMS 'songchange' patch */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
169 static gint output_flush_time = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
170 gint output_offset = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
171 static gint64 output_written = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
172 gint64 output_streampos = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
173 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
174 static gchar zero_4k[4096]; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
175 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
176 /* |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
177 * Available fade configs: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
178 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
179 * fc_start: First song, only in_len and in_level are used |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
180 * fc_xfade: Automatic crossfade at end of song |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
181 * fc_album: Like xfade but for consecutive songs of the same album |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
182 * fc_manual: Manual crossfade (triggered by Next or Prev) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
183 * fc_stop: Last song, only out_len and out_level are used |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
184 * fc_eop: Last song, only out_len and out_level are used |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
185 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
186 * NOTE: As of version 0.2 of xmms-crossfade, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
187 * only xfade and manual are implemented. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
188 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
189 * With version 0.2.3, fc_album has been added. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
190 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
191 * With 0.2.4, all configs are implemented: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
192 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
193 * Available parameters: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
194 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
195 * | start | xfade | manual | album | stop | eop |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
196 * ------------+-------+-------+--------+-------+------+------ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
197 * in_len | yes | yes | yes | no | no | no |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
198 * in_volume | yes | yes | yes | no | no | no |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
199 * offset | no | yes | yes | no | +yes | +yes |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
200 * out_len | no | yes | yes | no | yes | yes |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
201 * out_volume | no | yes | yes | no | yes | yes |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
202 * flush (*) | no | no | yes | no | yes | no |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
203 * ------------+-------+-------+--------+-------+------+------ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
204 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
205 * Parameters marked with (*) are not configureable by the user |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
206 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
207 * The offset parameters for 'stop' and 'eop' is used to store the |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
208 * length of the additional silence to be added. It may be >= 0 only. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
209 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
210 */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
211 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
212 static struct timeval last_close; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
213 static struct timeval last_write; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
214 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
215 static gchar *last_filename = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
216 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
217 static format_t in_format; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
218 static format_t out_format; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
219 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
220 static buffer_t the_buffer; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
221 buffer_t *buffer = &the_buffer; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
222 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
223 static THREAD buffer_thread; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
224 MUTEX buffer_mutex = MUTEX_INITIALIZER; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
225 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
226 static convert_context_t convert_context; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
227 #ifdef HAVE_LIBFFTW |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
228 static fft_context_t fft_context; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
229 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
230 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
231 static config_t the_config; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
232 config_t *config = &the_config; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
233 config_t config_default = CONFIG_DEFAULT; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
234 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
235 static fade_config_t *fade_config = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
236 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
237 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
238 /* this is the entry point for XMMS */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
239 OutputPlugin * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
240 get_oplugin_info() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
241 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
242 return xfade_op; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
243 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
244 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
245 OutputPlugin * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
246 get_crossfade_oplugin_info() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
247 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
248 return xfade_op; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
249 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
250 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
251 static gboolean |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
252 open_output_f(gpointer data) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
253 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
254 DEBUG(("[crossfade] open_output_f: pid=%d\n", getpid())); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
255 open_output(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
256 return FALSE; /* FALSE = 'do not call me again' */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
257 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
258 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
259 void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
260 xfade_realize_config() /* also called by xfade_init() */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
261 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
262 /* 0.3.0: keep device opened */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
263 if (config->output_keep_opened && !output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
264 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
265 DEBUG(("[crossfade] realize_config: keeping output opened...\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
266 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
267 /* 0.3.1: HACK: this will make sure that we start playing silence after startup */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
268 gettimeofday(&last_close, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
269 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
270 /* 0.3.1: HACK: Somehow, if we open output here at XMMS startup, there |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
271 will be leftover filedescriptors later when closing output again. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
272 Opening output in a timeout function seems to work around this... */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
273 DEBUG(("[crossfade] realize_config: adding timeout (pid=%d)\n", (int) getpid())); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
274 g_timeout_add(0, open_output_f, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
275 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
276 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
277 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
278 static gint |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
279 output_list_f(gconstpointer a, gconstpointer b) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
280 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
281 OutputPlugin *op = (OutputPlugin *) a; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
282 gchar *name = (gchar *) b; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
283 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
284 return strcmp(g_basename(op->filename), name); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
285 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
286 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
287 static OutputPlugin * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
288 find_output() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
289 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
290 GList *list, *element; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
291 OutputPlugin *op = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
292 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
293 /* find output plugin */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
294 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
295 if (config->op_name && (list = xfplayer_get_output_list())) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
296 if ((element = g_list_find_custom(list, config->op_name, output_list_f))) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
297 op = element->data; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
298 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
299 if (op == xfade_op) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
300 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
301 DEBUG(("[crossfade] find_output: can't use myself as output plugin!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
302 op = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
303 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
304 else if (!op) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
305 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
306 DEBUG(("[crossfade] find_output: could not find output plugin \"%s\"\n", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
307 config->op_name ? config->op_name : "#NULL#")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
308 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
309 else /* ok, we have a plugin. last, get its compatibility options */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
310 xfade_load_plugin_config(config->op_config_string, config->op_name, &the_op_config); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
311 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
312 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
313 return op; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
314 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
315 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
316 static gint |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
317 open_output() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
318 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
319 /* sanity check */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
320 if (output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
321 DEBUG(("[crossfade] open_output: WARNING: output_opened=TRUE!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
322 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
323 /* reset output_* */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
324 output_opened = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
325 output_flush_time = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
326 output_offset = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
327 output_written = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
328 output_streampos = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
329 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
330 /* get output plugin (this will also init the_op_config) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
331 if (!(the_op = find_output())) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
332 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
333 DEBUG(("[crossfade] open_output: could not find any output!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
334 return -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
335 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
336 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
337 /* print output plugin info */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
338 DEBUG(("[crossfade] open_output: using \"%s\" for output", the_op->description ? the_op->description : "#NULL#")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
339 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
340 if (realtime) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
341 DEBUG((" (RT)")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
342 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
343 if (the_op_config.throttle_enable) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
344 DEBUG((realtime ? " (throttled (disabled with RT))" : " (throttled)")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
345 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
346 if (the_op_config.max_write_enable) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
347 DEBUG((" (max_write=%d)", the_op_config.max_write_len)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
348 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
349 DEBUG(("\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
350 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
351 /* setup sample rate (note that OUTPUT_RATE is #defined as the_rate) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
352 the_rate = config->output_rate; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
353 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
354 /* setup out_format. use host byte order for easy math */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
355 setup_format(FMT_S16_NE, OUTPUT_RATE, OUTPUT_NCH, &out_format); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
356 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
357 /* open plugin */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
358 if (!the_op->open_audio(out_format.fmt, out_format.rate, out_format.nch)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
359 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
360 DEBUG(("[crossfade] open_output: open_audio() failed!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
361 the_op = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
362 return -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
363 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
364 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
365 /* clear buffer struct */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
366 memset(buffer, 0, sizeof(*buffer)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
367 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
368 /* calculate buffer size */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
369 buffer->mix_size = MS2B(xfade_mix_size_ms(config)) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
370 buffer->sync_size = MS2B(config->sync_size_ms) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
371 buffer->preload_size = MS2B(config->preload_size_ms) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
372 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
373 buffer->size = (buffer->mix_size + /* mixing area */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
374 buffer->sync_size + /* additional sync */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
375 buffer->preload_size); /* preload */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
376 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
377 DEBUG(("[crossfade] open_output: buffer: size=%d (%d+%d+%d=%d ms) (%d Hz)\n", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
378 buffer->size, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
379 B2MS(buffer->mix_size), |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
380 B2MS(buffer->preload_size), |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
381 B2MS(buffer->sync_size), |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
382 B2MS(buffer->size), |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
383 the_rate)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
384 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
385 /* allocate buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
386 if (!(buffer->data = g_malloc0(buffer->size))) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
387 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
388 DEBUG(("[crossfade] open_output: error allocating buffer!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
389 the_op->close_audio(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
390 the_op = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
391 return -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
392 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
393 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
394 /* reset buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
395 buffer_reset(buffer, config); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
396 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
397 /* make sure stopped is TRUE -- otherwise the buffer thread would |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
398 * stop again immediatelly after it has been started. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
399 stopped = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
400 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
401 /* create and run buffer thread */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
402 if (THREAD_CREATE(buffer_thread, buffer_thread_f)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
403 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
404 PERROR("[crossfade] open_output: thread_create()"); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
405 g_free(buffer->data); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
406 the_op->close_audio(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
407 the_op = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
408 return -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
409 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
410 SCHED_YIELD; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
411 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
412 /* start updating monitor */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
413 xfade_start_monitor(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
414 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
415 /* done */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
416 output_opened = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
417 return 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
418 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
419 |
3065
a0ba6102131d
crossfade-ng: remove more cruft, kill some warnings.
William Pitcock <nenolod@atheme.org>
parents:
3064
diff
changeset
|
420 static OutputPluginInitStatus |
3059
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
421 xfade_init() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
422 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
423 /* load config */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
424 memset(config, 0, sizeof(*config)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
425 *config = config_default; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
426 xfade_load_config(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
427 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
428 /* set default strings if there is no existing config */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
429 if (!config->oss_alt_audio_device) config->oss_alt_audio_device = g_strdup(DEFAULT_OSS_ALT_AUDIO_DEVICE); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
430 if (!config->oss_alt_mixer_device) config->oss_alt_mixer_device = g_strdup(DEFAULT_OSS_ALT_MIXER_DEVICE); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
431 if (!config->op_config_string) config->op_config_string = g_strdup(DEFAULT_OP_CONFIG_STRING); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
432 if (!config->op_name) config->op_name = g_strdup(DEFAULT_OP_NAME); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
433 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
434 /* check for realtime priority, it needs some special attention */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
435 realtime = xfplayer_check_realtime_priority(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
436 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
437 /* show monitor win if enabled in config */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
438 xfade_check_monitor_win(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
439 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
440 /* init contexts */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
441 convert_init(&convert_context); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
442 #ifdef HAVE_LIBFFTW |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
443 fft_init(&fft_context); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
444 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
445 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
446 /* reset */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
447 stopped = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
448 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
449 /* find current output plugin early so that volume control works |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
450 * even if playback has not started yet. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
451 if (!(the_op = find_output())) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
452 DEBUG(("[crossfade] init: could not find any output!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
453 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
454 /* load any dynamic linked symbols */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
455 load_symbols(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
456 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
457 /* HACK: make sure we are at the beginning of XMMS' output plugin list */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
458 output_list_hack(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
459 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
460 /* realize config -- will also setup the pre-mixing effect plugin */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
461 xfade_realize_config(); |
3065
a0ba6102131d
crossfade-ng: remove more cruft, kill some warnings.
William Pitcock <nenolod@atheme.org>
parents:
3064
diff
changeset
|
462 |
a0ba6102131d
crossfade-ng: remove more cruft, kill some warnings.
William Pitcock <nenolod@atheme.org>
parents:
3064
diff
changeset
|
463 return OUTPUT_PLUGIN_INIT_NO_DEVICES; |
3059
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
464 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
465 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
466 static void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
467 load_symbols() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
468 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
469 #ifdef HAVE_DLFCN_H |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
470 void *handle; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
471 char *error; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
472 gchar **xmms_cfg; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
473 gchar * (*get_gentitle_format)(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
474 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
475 /* open ourselves (that is, the XMMS binary) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
476 handle = dlopen(NULL, RTLD_NOW); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
477 if (!handle) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
478 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
479 DEBUG(("[crossfade] init: dlopen(NULL) failed!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
480 return; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
481 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
482 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
483 /* check for XMMS patches */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
484 DEBUG(("[crossfade] load_symbols: input_stopped_for_restart:")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
485 input_stopped_for_restart = dlsym(handle, "input_stopped_for_restart"); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
486 DEBUG((!(error = dlerror())? " found\n" : " missing\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
487 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
488 DEBUG(("[crossfade] load_symbols: is_quitting:")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
489 xmms_is_quitting = dlsym(handle, "is_quitting"); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
490 DEBUG((!(error = dlerror())? " found\n" : " missing\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
491 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
492 DEBUG(("[crossfade] load_symbols: playlist_get_fadeinfo:")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
493 playlist_get_fadeinfo = dlsym(handle, "playlist_get_fadeinfo"); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
494 DEBUG((!(error = dlerror())? " found\n" : " missing\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
495 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
496 /* check for some XMMS functions */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
497 xmms_playlist_get_info_going = dlsym(handle, "playlist_get_info_going"); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
498 xmms_input_get_song_info = dlsym(handle, "input_get_song_info"); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
499 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
500 /* HACK: direct access to XMMS' config 'gentitle_format' */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
501 xmms_cfg = dlsym(handle, "cfg"); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
502 get_gentitle_format = dlsym(handle, "xmms_get_gentitle_format"); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
503 if (xmms_cfg && get_gentitle_format) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
504 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
505 gchar *format = get_gentitle_format(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
506 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
507 int i = 128; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
508 gchar **p = (gchar **)xmms_cfg; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
509 for (i = 128; i > 0 && *p != format; i--, p++); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
510 if (*p == format) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
511 xmms_gentitle_format = p; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
512 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
513 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
514 dlclose(handle); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
515 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
516 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
517 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
518 /* |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
519 HACK: Try to move ourselves to the beginning of XMMS output plugin list, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
520 so that we will be freed first when XMMS is quitting. This way, we |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
521 avoid the segfault when using ALSA as the output plugin. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
522 */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
523 static void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
524 output_list_hack() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
525 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
526 GList *output_list = xfplayer_get_output_list(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
527 if (!output_list) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
528 return; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
529 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
530 int i0 = g_list_index(output_list, xfade_op), i1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
531 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
532 GList *first = g_list_first(output_list); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
533 GList *xfade = g_list_find(output_list, xfade_op); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
534 xfade->data = first->data; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
535 first->data = xfade_op; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
536 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
537 i1 = g_list_index(output_list, xfade_op); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
538 if (i0 != i1) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
539 DEBUG(("[crossfade] output_list_hack: crossfade moved from index %d to %d\n", i0, i1)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
540 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
541 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
542 void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
543 xfade_get_volume(int *l, int *r) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
544 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
545 if (config->mixer_software) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
546 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
547 *l = config->mixer_reverse |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
548 ? config->mixer_vol_right |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
549 : config->mixer_vol_left; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
550 *r = config->mixer_reverse |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
551 ? config->mixer_vol_left |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
552 : config->mixer_vol_right; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
553 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
554 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
555 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
556 if (the_op && the_op->get_volume) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
557 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
558 if (config->mixer_reverse) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
559 the_op->get_volume(r, l); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
560 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
561 the_op->get_volume(l, r); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
562 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
563 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
564 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
565 /* DEBUG(("[crossfade] xfade_get_volume: l=%d r=%d\n", *l, *r)); */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
566 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
567 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
568 void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
569 xfade_set_volume(int l, int r) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
570 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
571 /* DEBUG(("[crossfade] xfade_set_volume: l=%d r=%d\n", l, r)); */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
572 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
573 if (!config->enable_mixer) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
574 return; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
575 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
576 if (the_op && the_op->set_volume) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
577 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
578 if (config->mixer_reverse) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
579 the_op->set_volume(r, l); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
580 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
581 the_op->set_volume(l, r); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
582 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
583 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
584 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
585 /*** buffer stuff ***********************************************************/ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
586 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
587 static void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
588 buffer_mfg_reset(buffer_t *buf, config_t *cfg) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
589 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
590 buf->mix = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
591 buf->fade = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
592 buf->gap = (cfg->gap_lead_enable ? MS2B(cfg->gap_lead_len_ms) & -4 : 0); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
593 buf->gap_len = buf->gap; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
594 buf->gap_level = cfg->gap_lead_level; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
595 buf->gap_killed = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
596 buf->skip = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
597 buf->skip_len = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
598 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
599 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
600 static void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
601 buffer_reset(buffer_t *buf, config_t *cfg) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
602 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
603 buffer_mfg_reset(buf, cfg); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
604 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
605 buf->rd_index = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
606 buf->used = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
607 buf->preload = buf->preload_size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
608 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
609 buf->silence = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
610 buf->silence_len = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
611 buf->reopen = -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
612 buf->pause = -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
613 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
614 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
615 /****************************************************************************/ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
616 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
617 static void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
618 xfade_apply_fade_config(fade_config_t *fc) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
619 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
620 gint out_skip, in_skip; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
621 gint avail, out_len, in_len, offset, preload; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
622 gint index, length, fade, n; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
623 gfloat out_scale, in_scale; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
624 gboolean out_skip_clipped = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
625 gboolean out_len_clipped = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
626 gboolean offset_clipped = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
627 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
628 /* Overwrites mix and fade; may add silence */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
629 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
630 /* |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
631 * Example 1: offset < 0 --> mix streams together |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
632 * Example 2: offset > 0 --> insert pause between streams |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
633 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
634 * |----- out_len -----| * |out_len| |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
635 * | | * | | |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
636 * ~~~~~-_ /T~~~~~~~T~~ * ~~~~~\ | /T~~ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
637 * ~-_ / | | * \ | / | |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
638 * ~-_/ | | * \ | / | |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
639 * /~-_| | * \ | / | |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
640 * / T-_ | * \ | / | |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
641 * / | ~-_ | * \ | / | |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
642 * _________/______|_____~-|__ * ___________\__________/______|__ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
643 * |in_len| | * | |in_len| |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
644 * |<-- offset ---| * |offset-->| |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
645 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
646 * a) avail: max(0, used - preload) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
647 * b) out_len: 0 .. avail |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
648 * c) in_len: 0 .. # |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
649 * d) offset: -avail .. buffer->mix_size - out_size |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
650 * e) skip: min(used, preload) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
651 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
652 */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
653 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
654 out_scale = 1.0f - (gfloat) xfade_cfg_fadeout_volume(fc) / 100.0f; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
655 in_scale = 1.0f - (gfloat) xfade_cfg_fadein_volume (fc) / 100.0f; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
656 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
657 /* rules (see above) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
658 /* a: leave preload untouched */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
659 avail = buffer->used - buffer->preload_size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
660 if (avail < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
661 avail = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
662 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
663 /* skip end of song */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
664 out_skip = MS2B(xfade_cfg_out_skip(fc)) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
665 if (out_skip > avail) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
666 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
667 DEBUG(("[crossfade] apply_fade_config: WARNING: clipping out_skip (%d -> %d)!\n", B2MS(out_skip), B2MS(avail))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
668 out_skip = avail; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
669 out_skip_clipped = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
670 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
671 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
672 if (out_skip > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
673 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
674 buffer->used -= out_skip; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
675 avail -= out_skip; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
676 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
677 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
678 /* b: fadeout */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
679 out_len = MS2B(xfade_cfg_fadeout_len(fc)) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
680 if (out_len > avail) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
681 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
682 DEBUG(("[crossfade] apply_fade_config: WARNING: clipping out_len (%d -> %d)!\n", B2MS(out_len), B2MS(avail))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
683 out_len = avail; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
684 out_len_clipped = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
685 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
686 else if (out_len < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
687 out_len = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
688 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
689 /* skip beginning of song */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
690 in_skip = MS2B(xfade_cfg_in_skip(fc)) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
691 if (in_skip < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
692 in_skip = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
693 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
694 /* c: fadein */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
695 in_len = MS2B(xfade_cfg_fadein_len(fc)) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
696 if (in_len < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
697 in_len = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
698 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
699 /* d: offset (mixing point) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
700 offset = MS2B(xfade_cfg_offset(fc)) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
701 if (offset < -avail) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
702 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
703 DEBUG(("[crossfade] apply_fade_config: WARNING: clipping offset (%d -> %d)!\n", B2MS(offset), -B2MS(avail))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
704 offset = -avail; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
705 offset_clipped = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
706 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
707 if (offset > (buffer->mix_size - out_len)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
708 offset = buffer->mix_size - out_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
709 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
710 /* e */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
711 preload = buffer->preload_size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
712 if (preload > buffer->used) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
713 preload = buffer->used; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
714 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
715 /* cut off rest of stream (decreases latency on manual songchange) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
716 if (fc->flush) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
717 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
718 gint cutoff = avail - MAX(out_len, -offset); /* MAX() -> glib.h */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
719 if (cutoff > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
720 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
721 DEBUG(("[crossfade] apply_fade_config: %d ms flushed\n", B2MS(cutoff))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
722 buffer->used -= cutoff; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
723 avail -= cutoff; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
724 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
725 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
726 /* make sure there is no pending silence */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
727 buffer->silence = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
728 buffer->silence_len = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
729 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
730 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
731 /* begin modifying buffer at index */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
732 index = (buffer->rd_index + buffer->used - out_len) % buffer->size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
733 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
734 /* fade out (modifies buffer directly) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
735 fade = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
736 length = out_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
737 while (length > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
738 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
739 gint16 *p = buffer->data + index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
740 gint blen = buffer->size - index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
741 if (blen > length) blen = length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
742 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
743 for (n = blen / 4; n > 0; n--) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
744 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
745 gfloat factor = 1.0f - (((gfloat) fade / out_len) * out_scale); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
746 *p = (gfloat)*p * factor; p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
747 *p = (gfloat)*p * factor; p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
748 fade += 4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
749 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
750 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
751 index = (index + blen) % buffer->size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
752 length -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
753 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
754 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
755 /* Initialize fadein. Note that the actual fading / mixing will be done |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
756 * on-the-fly when audio data is received by xfade_write_audio() */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
757 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
758 /* start skipping */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
759 if (in_skip > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
760 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
761 buffer->skip = in_skip; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
762 buffer->skip_len = in_skip; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
763 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
764 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
765 buffer->skip = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
766 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
767 /* start fading in */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
768 if (in_len > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
769 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
770 buffer->fade = in_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
771 buffer->fade_len = in_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
772 buffer->fade_scale = in_scale; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
773 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
774 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
775 buffer->fade = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
776 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
777 /* start mixing */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
778 if (offset < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
779 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
780 length = -offset; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
781 buffer->mix = length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
782 buffer->used -= length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
783 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
784 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
785 buffer->mix = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
786 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
787 /* start silence if applicable (will be applied in buffer_thread_f) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
788 if (offset > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
789 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
790 if ((buffer->silence > 0) || (buffer->silence_len > 0)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
791 DEBUG(("[crossfade] apply_config: WARNING: silence in progress (%d/%d ms)\n", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
792 B2MS(buffer->silence), B2MS(buffer->silence_len))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
793 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
794 buffer->silence = buffer->used; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
795 buffer->silence_len = offset; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
796 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
797 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
798 /* done */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
799 if (in_skip || out_skip) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
800 DEBUG(("[crossfade] apply_fade_config: out_skip=%d in_skip=%d\n", B2MS(out_skip), B2MS(in_skip))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
801 DEBUG(("[crossfade] apply_fade_config: avail=%d out=%d in=%d offset=%d preload=%d\n", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
802 B2MS(avail), B2MS(out_len), B2MS(in_len), B2MS(offset), B2MS(preload))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
803 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
804 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
805 static gint |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
806 extract_track(const gchar *name) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
807 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
808 #if 1 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
809 /* skip non-digits at beginning */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
810 while (*name && !isdigit(*name)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
811 name++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
812 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
813 return atoi(name); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
814 #else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
815 /* Remove all but numbers. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
816 * Will not work if a filename has number in the title, like "track-03-U2.mp3" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
817 * Ideally, should look into id3 track entry and fallback to filename |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
818 * */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
819 gchar temp[8]; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
820 int t = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
821 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
822 memset(temp, 0, sizeof(temp)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
823 while (*name != '\0' && t < sizeof(temp)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
824 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
825 if (strcmp(name, "mp3") == 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
826 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
827 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
828 if (isdigit(*name)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
829 temp[t++] = *name; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
830 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
831 name++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
832 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
833 return atoi(temp); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
834 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
835 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
836 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
837 static gint |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
838 album_match(gchar *old, gchar *new) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
839 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
840 gchar *old_dir, *new_dir; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
841 gboolean same_dir; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
842 gint old_track = 0, new_track = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
843 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
844 if (!old || !new) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
845 return 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
846 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
847 old_dir = g_dirname(old); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
848 new_dir = g_dirname(new); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
849 same_dir = !strcmp(old_dir, new_dir); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
850 g_free(old_dir); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
851 g_free(new_dir); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
852 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
853 if (!same_dir) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
854 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
855 DEBUG(("[crossfade] album_match: no match (different dirs)\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
856 return 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
857 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
858 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
859 old_track = extract_track(g_basename(old)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
860 new_track = extract_track(g_basename(new)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
861 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
862 if (new_track <= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
863 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
864 DEBUG(("[crossfade] album_match: can't parse track number:\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
865 DEBUG(("[crossfade] album_match: ... \"%s\"\n", g_basename(new))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
866 return 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
867 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
868 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
869 if ((old_track < 0) || (old_track + 1 != new_track)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
870 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
871 DEBUG(("[crossfade] album_match: no match (same dir, but non-successive (%d, %d))\n", old_track, new_track)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
872 return 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
873 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
874 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
875 DEBUG(("[crossfade] album_match: match detected (same dir, successive tracks (%d, %d))\n", old_track, new_track)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
876 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
877 return old_track; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
878 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
879 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
880 static gint |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
881 xfade_open_audio(AFormat fmt, int rate, int nch) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
882 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
883 gint pos; |
3064
43a336a7791b
crossfade-ng: Remove remaining TIMING_COMMENTS cruft.
William Pitcock <nenolod@atheme.org>
parents:
3059
diff
changeset
|
884 gchar *file, *title; |
3059
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
885 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
886 struct timeval tv; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
887 glong dt; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
888 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
889 DEBUG(("[crossfade]\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
890 DEBUG(("[crossfade] open_audio: pid=%d\n", (int) getpid())); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
891 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
892 /* sanity... don't do anything about it */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
893 if (opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
894 DEBUG(("[crossfade] open_audio: WARNING: already opened!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
895 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
896 /* get filename */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
897 pos = xfplaylist_get_position (); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
898 file = xfplaylist_get_filename (pos); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
899 title = xfplaylist_get_songtitle(pos); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
900 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
901 if (!file) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
902 file = g_strdup(title); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
903 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
904 DEBUG(("[crossfade] open_audio: bname=\"%s\"\n", g_basename(file))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
905 DEBUG(("[crossfade] open_audio: title=\"%s\"\n", title)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
906 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
907 #if 0 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
908 /* HACK: try to get comment and track number from xmms by sneaking in a custom title format */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
909 if (xmms_gentitle_format) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
910 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
911 gchar *old_gentitle_format = *xmms_gentitle_format; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
912 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
913 gchar *temp_title = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
914 gint temp_length = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
915 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
916 xmms_input_get_song_info(file, &temp_title, &temp_length); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
917 DEBUG(("[crossfade] open_audio: TITLE: %s\n", temp_title)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
918 g_free(temp_title); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
919 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
920 *xmms_gentitle_format = "%n/%c"; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
921 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
922 xmms_input_get_song_info(file, &temp_title, &temp_length); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
923 DEBUG(("[crossfade] open_audio: TRACK/COMMENT: %s\n", temp_title)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
924 g_free(temp_title); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
925 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
926 *xmms_gentitle_format = old_gentitle_format; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
927 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
928 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
929 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
930 /* is this an automatic crossfade? */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
931 if (last_filename && (fade_config == &config->fc[FADE_CONFIG_XFADE])) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
932 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
933 /* check if next song is the same as the current one */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
934 if (config->no_xfade_if_same_file && !strcmp(last_filename, file)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
935 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
936 DEBUG(("[crossfade] open_audio: same file, disabling crossfade\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
937 fade_config = &config->fc[FADE_CONFIG_ALBUM]; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
938 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
939 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
940 /* check if next song is the next song from the same album */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
941 else if (config->album_detection && album_match(last_filename, file)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
942 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
943 gboolean use_fc_album = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
944 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
945 if (xfade_cfg_gap_trail_enable(config)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
946 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
947 DEBUG(("[crossfade] album_match: " |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
948 "trailing gap: length=%d/%d ms\n", B2MS(buffer->gap_killed), B2MS(buffer->gap_len))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
949 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
950 if (buffer->gap_killed < buffer->gap_len) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
951 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
952 DEBUG(("[crossfade] album_match: " |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
953 "trailing gap: -> no silence, probably pre-faded\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
954 use_fc_album = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
955 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
956 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
957 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
958 DEBUG(("[crossfade] album_match: " "trailing gap: -> silence, sticking to XFADE\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
959 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
960 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
961 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
962 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
963 DEBUG(("[crossfade] album_match: " "trailing gap killer disabled\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
964 use_fc_album = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
965 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
966 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
967 if (use_fc_album) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
968 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
969 DEBUG(("[crossfade] album_match: " "-> using FADE_CONFIG_ALBUM\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
970 fade_config = &config->fc[FADE_CONFIG_ALBUM]; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
971 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
972 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
973 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
974 g_free(last_filename); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
975 last_filename = g_strdup(file); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
976 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
977 /* cleanup */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
978 g_free(file); file = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
979 g_free(title); title = NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
980 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
981 /* check for HTTP streaming */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
982 if (config->enable_http_workaround && (0 == strncasecmp(file, "http://", 7))) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
983 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
984 DEBUG(("[crossfade] open_audio: HTTP underrun workaround enabled.\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
985 is_http = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
986 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
987 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
988 is_http = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
989 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
990 /* lock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
991 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
992 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
993 /* reset writer timeout */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
994 gettimeofday(&last_write, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
995 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
996 /* calculate time since last close() (don't care about overflows at 24h) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
997 if (output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
998 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
999 gettimeofday(&tv, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1000 dt = (tv.tv_sec - last_close.tv_sec) * 1000 + (tv.tv_usec - last_close.tv_usec) / 1000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1001 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1002 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1003 dt = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1004 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1005 DEBUG(("[crossfade] open_audio: fmt=%s rate=%d nch=%d dt=%ld ms\n", format_name(fmt), rate, nch, dt)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1006 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1007 /* check format */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1008 if (setup_format(fmt, rate, nch, &in_format) < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1009 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1010 DEBUG(("[crossfade] open_audio: format not supported!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1011 return 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1012 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1013 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1014 /* (re)open the device if necessary */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1015 if (!output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1016 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1017 if (open_output()) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1018 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1019 DEBUG(("[crossfade] open_audio: error opening/configuring output!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1020 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1021 return 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1022 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1023 fade_config = &config->fc[FADE_CONFIG_START]; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1024 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1025 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1026 /* reset */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1027 streampos = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1028 playing = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1029 opened = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1030 paused = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1031 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1032 /* reset mix/fade/gap */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1033 buffer_mfg_reset(buffer, config); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1034 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1035 /* enable gap killer / zero crossing only for automatic/album songchange */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1036 switch (fade_config->config) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1037 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1038 case FADE_CONFIG_XFADE: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1039 case FADE_CONFIG_ALBUM: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1040 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1041 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1042 default: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1043 buffer->gap = GAP_SKIPPING_DONE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1044 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1045 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1046 /* restart realtime throttling */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1047 output_written = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1048 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1049 /* start mixing */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1050 switch (fade_config ? fade_config->type : -1) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1051 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1052 case FADE_TYPE_FLUSH: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1053 DEBUG(("[crossfade] open_audio: FLUSH:\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1054 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1055 /* flush output plugin */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1056 the_op->flush(0); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1057 output_streampos = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1058 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1059 /* flush buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1060 buffer_reset(buffer, config); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1061 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1062 /* apply fade config (pause/fadein after flush) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1063 xfade_apply_fade_config(fade_config); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1064 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1065 /* also repopen device (if configured so in the plugin compat. options) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1066 if (the_op_config.force_reopen) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1067 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1068 buffer->reopen = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1069 buffer->reopen_sync = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1070 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1071 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1072 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1073 case FADE_TYPE_REOPEN: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1074 DEBUG(("[crossfade] open_audio: REOPEN:\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1075 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1076 /* flush buffer if applicable */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1077 if (fade_config->flush) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1078 buffer_reset(buffer, config); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1079 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1080 if (buffer->reopen >= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1081 DEBUG(("[crossfade] open_audio: REOPEN: WARNING: reopen in progress (%d ms)\n", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1082 B2MS(buffer->reopen))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1083 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1084 /* start reopen countdown (will be executed in buffer_thread_f) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1085 buffer->reopen = buffer->used; /* may be 0 */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1086 buffer->reopen_sync = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1087 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1088 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1089 case FADE_TYPE_NONE: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1090 case FADE_TYPE_PAUSE: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1091 case FADE_TYPE_SIMPLE_XF: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1092 case FADE_TYPE_ADVANCED_XF: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1093 case FADE_TYPE_FADEIN: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1094 case FADE_TYPE_FADEOUT: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1095 DEBUG(("[crossfade] open_audio: XFADE:\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1096 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1097 /* apply fade config (do fadeout, init mix/fade/gap, add silence) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1098 xfade_apply_fade_config(fade_config); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1099 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1100 /* set reopen countdown. after buffer_thread_f has written |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1101 * buffer->reopen bytes, it will close/reopen the output plugin. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1102 if (the_op_config.force_reopen && !(fade_config->config == FADE_CONFIG_START)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1103 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1104 if (buffer->reopen >= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1105 DEBUG(("[crossfade] open_audio: XFADE: WARNING: reopen in progress (%d ms)\n", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1106 B2MS(buffer->reopen))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1107 buffer->reopen = buffer->used; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1108 buffer->reopen_sync = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1109 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1110 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1111 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1112 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1113 /* calculate offset of the output plugin */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1114 output_offset = the_op->written_time() + B2MS(buffer->used) + B2MS(buffer->silence_len); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1115 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1116 /* unlock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1117 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1118 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1119 /* done */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1120 return 1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1121 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1122 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1123 void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1124 xfade_write_audio(void *ptr, int length) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1125 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1126 gint free; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1127 gint ofs = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1128 format_t format; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1129 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1130 #ifdef DEBUG_HARDCORE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1131 DEBUG(("[crossfade] write_audio: ptr=0x%08lx, length=%d\n", (long) ptr, length)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1132 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1133 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1134 /* sanity */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1135 if (length <= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1136 return; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1137 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1138 if (length & 3) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1139 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1140 DEBUG(("[crossfade] write_audio: truncating %d bytes!\n", length & 3)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1141 length &= -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1142 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1143 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1144 /* update input accumulator (using input format size) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1145 streampos += length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1146 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1147 /* convert sample format (signed-16bit-ne 44100hz stereo) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1148 format_copy(&format, &in_format); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1149 length = convert_flow(&convert_context, (gpointer *) &ptr, length, &format); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1150 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1151 /* lock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1152 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1153 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1154 /* check if device has been closed, reopen if necessary */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1155 if (!output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1156 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1157 if (open_output()) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1158 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1159 DEBUG(("[crossfade] write_audio: reopening failed!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1160 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1161 return; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1162 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1163 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1164 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1165 /* reset timeout */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1166 gettimeofday(&last_write, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1167 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1168 /* calculate free buffer space, check for overflow (should never happen :) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1169 free = buffer->size - buffer->used; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1170 if (length > free) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1171 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1172 DEBUG(("[crossfade] write_audio: %d bytes truncated!\n", length - free)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1173 length = free; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1174 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1175 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1176 /* skip beginning of song */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1177 if ((length > 0) && (buffer->skip > 0)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1178 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1179 gint blen = MIN(length, buffer->skip); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1180 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1181 buffer->skip -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1182 length -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1183 ptr += blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1184 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1185 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1186 /* kill leading gap */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1187 if ((length > 0) && (buffer->gap > 0)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1188 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1189 gint blen = MIN(length, buffer->gap); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1190 gint16 *p = ptr; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1191 gint index = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1192 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1193 gint16 left, right; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1194 while (index < blen) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1195 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1196 left = *p++, right = *p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1197 if (ABS(left) >= buffer->gap_level) break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1198 if (ABS(right) >= buffer->gap_level) break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1199 index += 4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1200 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1201 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1202 buffer->gap -= index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1203 length -= index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1204 ptr += index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1205 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1206 if ((index < blen) || (buffer->gap <= 0)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1207 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1208 buffer->gap_killed = buffer->gap_len - buffer->gap; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1209 buffer->gap = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1210 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1211 DEBUG(("[crossfade] write_audio: leading gap size: %d/%d ms\n", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1212 B2MS(buffer->gap_killed), B2MS(buffer->gap_len))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1213 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1214 /* fix streampos */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1215 streampos -= (gint64) buffer->gap_killed * in_format.bps / out_format.bps; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1216 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1217 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1218 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1219 /* start skipping to next crossing (if enabled) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1220 if (buffer->gap == 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1221 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1222 if (config->gap_crossing) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1223 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1224 buffer->gap = GAP_SKIPPING_POSITIVE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1225 buffer->gap_skipped = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1226 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1227 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1228 buffer->gap = GAP_SKIPPING_DONE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1229 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1230 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1231 /* skip until next zero crossing (pos -> neg) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1232 if ((length > 0) && (buffer->gap == GAP_SKIPPING_POSITIVE)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1233 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1234 gint16 *p = ptr; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1235 gint index = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1236 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1237 gint16 left; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1238 while (index < length) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1239 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1240 left = *p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1241 p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1242 if (left < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1243 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1244 index += 4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1245 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1246 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1247 buffer->gap_skipped += index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1248 length -= index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1249 ptr += index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1250 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1251 if (index < length) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1252 buffer->gap = GAP_SKIPPING_NEGATIVE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1253 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1254 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1255 /* skip until next zero crossing (neg -> pos) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1256 if ((length > 0) && (buffer->gap == GAP_SKIPPING_NEGATIVE)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1257 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1258 gint16 *p = ptr; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1259 gint index = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1260 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1261 gint16 left; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1262 while (index < length) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1263 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1264 left = *p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1265 p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1266 if (left >= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1267 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1268 index += 4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1269 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1270 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1271 buffer->gap_skipped += index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1272 length -= index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1273 ptr += index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1274 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1275 if (index < length) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1276 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1277 DEBUG(("[crossfade] write_audio: %d samples to next crossing\n", buffer->gap_skipped)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1278 buffer->gap = GAP_SKIPPING_DONE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1279 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1280 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1281 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1282 /* update preload. the buffer thread will not write any |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1283 * data to the device before preload is decreased below 1. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1284 if ((length > 0) && (buffer->preload > 0)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1285 buffer->preload -= length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1286 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1287 /* fadein -- FIXME: is modifying the input/effect buffer safe? */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1288 if ((length > 0) && (buffer->fade > 0)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1289 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1290 gint16 *p = ptr; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1291 gint blen = MIN(length, buffer->fade); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1292 gint n; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1293 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1294 for (n = blen / 4; n > 0; n--) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1295 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1296 gfloat factor = 1.0f - (((gfloat) buffer->fade / buffer->fade_len) * buffer->fade_scale); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1297 *p = (gfloat)*p * factor; p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1298 *p = (gfloat)*p * factor; p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1299 buffer->fade -= 4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1300 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1301 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1302 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1303 /* mix */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1304 while ((length > 0) && (buffer->mix > 0)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1305 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1306 gint wr_index = (buffer->rd_index + buffer->used) % buffer->size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1307 gint blen = buffer->size - wr_index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1308 gint16 *p1 = buffer->data + wr_index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1309 gint16 *p2 = ptr + ofs; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1310 gint n; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1311 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1312 if (blen > length) blen = length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1313 if (blen > buffer->mix) blen = buffer->mix; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1314 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1315 for (n = blen / 2; n > 0; n--) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1316 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1317 gint out = (gint)*p1 + *p2++; /* add */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1318 if (out > 32767) /* clamp */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1319 *p1++ = 32767; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1320 else if (out < -32768) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1321 *p1++ = -32768; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1322 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1323 *p1++ = out; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1324 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1325 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1326 buffer->used += blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1327 buffer->mix -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1328 length -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1329 ofs += blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1330 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1331 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1332 /* normal write */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1333 while (length > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1334 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1335 gint wr_index = (buffer->rd_index + buffer->used) % buffer->size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1336 gint blen = buffer->size - wr_index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1337 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1338 if (blen > length) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1339 blen = length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1340 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1341 memcpy(buffer->data + wr_index, ptr + ofs, blen); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1342 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1343 buffer->used += blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1344 length -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1345 ofs += blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1346 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1347 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1348 /* unlock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1349 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1350 #ifdef DEBUG_HARDCORE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1351 DEBUG(("[crossfade] write_audio: done.\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1352 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1353 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1354 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1355 /* sync_output: wait for output plugin to finish playback */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1356 /* is only called from within buffer_thread_f */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1357 static void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1358 sync_output() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1359 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1360 glong dt, total; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1361 gint opt, opt_last; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1362 struct timeval tv, tv_start, tv_last_change; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1363 gboolean was_closed = !opened; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1364 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1365 if (!the_op->buffer_playing || !the_op->buffer_playing()) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1366 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1367 DEBUG(("[crossfade] sync_output: nothing to do\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1368 return; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1369 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1370 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1371 DEBUG(("[crossfade] sync_output: waiting for plugin...\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1372 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1373 dt = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1374 opt_last = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1375 gettimeofday(&tv_start, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1376 gettimeofday(&tv_last_change, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1377 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1378 while ((dt < SYNC_OUTPUT_TIMEOUT) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1379 && !stopped && output_opened && !(was_closed && opened) && the_op && the_op->buffer_playing()) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1380 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1381 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1382 /* use output_time() to check if the output plugin is still active */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1383 if (the_op->output_time) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1384 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1385 opt = the_op->output_time(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1386 if (opt != opt_last) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1387 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1388 /* output_time has changed */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1389 opt_last = opt; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1390 gettimeofday(&tv_last_change, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1391 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1392 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1393 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1394 /* calculate time since last change of the_op->output_time() */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1395 gettimeofday(&tv, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1396 dt = (tv.tv_sec - tv_last_change.tv_sec) * 1000 + (tv.tv_usec - tv_last_change.tv_usec) / 1000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1397 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1398 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1399 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1400 /* yield */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1401 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1402 xfade_usleep(10000); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1403 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1404 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1405 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1406 /* calculate total time we spent in here */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1407 gettimeofday(&tv, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1408 total = (tv.tv_sec - tv_start.tv_sec) * 1000 + (tv.tv_usec - tv_start.tv_usec) / 1000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1409 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1410 /* print some debug info */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1411 /* *INDENT-OFF* */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1412 if (stopped) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1413 DEBUG(("[crossfade] sync_output: ... stopped\n")) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1414 else if (was_closed && opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1415 DEBUG(("[crossfade] sync_output: ... reopened\n")) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1416 else if (dt >= SYNC_OUTPUT_TIMEOUT) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1417 DEBUG(("[crossfade] sync_output: ... TIMEOUT! (%ld ms)\n", total)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1418 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1419 DEBUG(("[crossfade] sync_output: ... done (%ld ms)\n", total)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1420 /* *INDENT-ON* */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1421 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1422 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1423 void * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1424 buffer_thread_f(void *arg) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1425 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1426 gpointer data; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1427 gint sync; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1428 gint op_free; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1429 gint length_bak, length, blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1430 glong timeout, dt; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1431 gboolean stopping; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1432 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1433 struct timeval tv; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1434 struct timeval mark; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1435 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1436 DEBUG(("[crossfade] buffer_thread_f: thread started (pid=%d)\n", (int) getpid())); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1437 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1438 /* lock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1439 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1440 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1441 while (!stopped) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1442 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1443 /* yield */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1444 #ifdef DEBUG_HARDCORE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1445 DEBUG(("[crossfade] buffer_thread_f: yielding...\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1446 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1447 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1448 xfade_usleep(10000); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1449 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1450 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1451 /* --------------------------------------------------------------------- */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1452 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1453 stopping = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1454 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1455 /* V0.3.0: New timeout detection */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1456 if (!opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1457 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1458 gboolean current = xfplayer_input_playing(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1459 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1460 /* also see fini() */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1461 if (last_close.tv_sec || last_close.tv_usec) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1462 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1463 gettimeofday(&tv, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1464 timeout = (tv.tv_sec - last_close.tv_sec) * 1000 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1465 + (tv.tv_usec - last_close.tv_usec) / 1000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1466 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1467 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1468 timeout = -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1469 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1470 if (current != input_playing) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1471 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1472 input_playing = current; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1473 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1474 if (current) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1475 DEBUG(("[crossfade] buffer_thread_f: input restarted after %ld ms\n", timeout)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1476 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1477 DEBUG(("[crossfade] buffer_thread_f: input stopped after + %ld ms\n", timeout)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1478 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1479 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1480 /* 0.3.0: HACK: output_keep_opened: play silence during prebuffering */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1481 if (input_playing && config->output_keep_opened && (buffer->used == 0)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1482 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1483 buffer->silence = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1484 buffer->silence_len = MS2B(100); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1485 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1486 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1487 /* 0.3.9: Check for timeout only if we have not been stopped for restart */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1488 /* 0.3.11: When using the songchange hack, depend on it's output_restart |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1489 * flag. Without the hack, use the configuration's dialog songchange |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1490 * timeout setting instead of a fixed timeout value. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1491 if (input_stopped_for_restart && !output_restart) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1492 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1493 if (playing) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1494 DEBUG(("[crossfade] buffer_thread_f: timeout:" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1495 " stopping after %ld ms (songchange patch)\n", timeout)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1496 stopping = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1497 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1498 else if (((timeout < 0) || (timeout >= config->songchange_timeout && !output_restart)) && !input_playing) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1499 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1500 if (playing) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1501 DEBUG(("[crossfade] buffer_thread_f: timeout:" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1502 " input did not restart after %ld ms\n", timeout)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1503 stopping = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1504 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1505 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1506 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1507 /* V0.2.4: Moved the timeout checks in front of the buffer_free() check |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1508 * below. Before, buffer_thread_f could (theoretically) loop |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1509 * endlessly if buffer_free() returned 0 all the time. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1510 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1511 /* calculate time since last write to the buffer (ignore overflows) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1512 gettimeofday(&tv, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1513 timeout = (tv.tv_sec - last_write.tv_sec) * 1000 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1514 + (tv.tv_usec - last_write.tv_usec) / 1000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1515 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1516 /* check for timeout/eop (note this is the only way out of this loop) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1517 if (stopping) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1518 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1519 if (playing) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1520 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1521 DEBUG(("[crossfade] buffer_thread_f: timeout: manual stop\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1522 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1523 /* if CONFIG_STOP is of TYPE_NONE, immediatelly close the device... */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1524 if ((config->fc[FADE_CONFIG_STOP].type == FADE_TYPE_NONE) && !config->output_keep_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1525 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1526 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1527 /* special handling for pause */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1528 if (paused) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1529 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1530 DEBUG(("[crossfade] buffer_thread_f: timeout: paused, closing now...\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1531 paused = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1532 if (config->output_keep_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1533 the_op->pause(0); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1534 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1535 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1536 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1537 else if (buffer->pause >= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1538 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1539 DEBUG(("[crossfade] buffer_thread_f: timeout: cancelling pause countdown\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1540 buffer->pause = -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1541 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1542 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1543 /* ...otherwise, do the fadeout first */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1544 xfade_apply_fade_config(&config->fc[FADE_CONFIG_STOP]); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1545 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1546 /* force CONFIG_START in case the user restarts playback during fadeout */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1547 fade_config = &config->fc[FADE_CONFIG_START]; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1548 playing = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1549 eop = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1550 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1551 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1552 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1553 if (!eop) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1554 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1555 DEBUG(("[crossfade] buffer_thread_f: timeout: end of playback\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1556 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1557 /* 0.3.3: undo trailing gap killer at end of playlist */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1558 if (buffer->gap_killed) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1559 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1560 buffer->used += buffer->gap_killed; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1561 DEBUG(("[crossfade] buffer_thread_f: timeout:" |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1562 " undoing trailing gap (%d ms)\n", B2MS(buffer->gap_killed))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1563 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1564 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1565 /* do the fadeout if applicable */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1566 if (config->fc[FADE_CONFIG_EOP].type != FADE_TYPE_NONE) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1567 xfade_apply_fade_config(&config->fc[FADE_CONFIG_EOP]); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1568 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1569 fade_config = &config->fc[FADE_CONFIG_START]; /* see above */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1570 eop = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1571 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1572 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1573 if (buffer->used == 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1574 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1575 if (config->output_keep_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1576 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1577 /* 0.3.0: play silence while keeping the output opened */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1578 buffer->silence = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1579 buffer->silence_len = MS2B(100); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1580 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1581 else if (buffer->silence_len <= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1582 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1583 sync_output(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1584 if (opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1585 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1586 DEBUG(("[crossfade] buffer_thread_f: timeout, eop: device has been reopened\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1587 DEBUG(("[crossfade] buffer_thread_f: timeout, eop: -> continuing playback\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1588 eop = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1589 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1590 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1591 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1592 DEBUG(("[crossfade] buffer_thread_f: timeout, eop: closing output...\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1593 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1594 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1595 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1596 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1597 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1598 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1599 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1600 eop = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1601 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1602 /* --------------------------------------------------------------------- */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1603 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1604 /* get free space in device output buffer |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1605 * NOTE: disk_writer always returns <big int> here */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1606 op_free = the_op->buffer_free() & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1607 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1608 /* continue waiting if there is no room in the device buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1609 if (op_free == 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1610 continue; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1611 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1612 /* --- Limit OP buffer use (decreases latency) ------------------------- */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1613 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1614 /* HACK: limit output plugin buffer usage to decrease latency */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1615 if (config->enable_op_max_used) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1616 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1617 gint output_time = the_op->output_time(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1618 gint output_used = the_op->written_time() - output_time; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1619 gint output_limit = MS2B(config->op_max_used_ms - MIN(output_used, config->op_max_used_ms)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1620 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1621 if (output_flush_time != output_time) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1622 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1623 /* slow down output, but always write _some_ data */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1624 if (output_limit < in_format.bps / 100 / 2) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1625 output_limit = in_format.bps / 100 / 2; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1626 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1627 if (op_free > output_limit) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1628 op_free = output_limit; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1629 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1630 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1631 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1632 /* --- write silence --------------------------------------------------- */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1633 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1634 if (!paused && (buffer->silence <= 0) && (buffer->silence_len >= 4)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1635 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1636 /* write as much silence as a) there is left and b) the device can take */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1637 length = buffer->silence_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1638 if (length > op_free) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1639 length = op_free; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1640 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1641 /* make sure we always operate on stereo sample boundary */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1642 length &= -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1643 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1644 /* HACK: don't stay in here too long when in realtime mode (see below) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1645 if (realtime) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1646 gettimeofday(&mark, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1647 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1648 /* write length bytes to the device */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1649 length_bak = length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1650 while (length > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1651 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1652 data = zero_4k; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1653 blen = sizeof(zero_4k); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1654 if (blen > length) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1655 blen = length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1656 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1657 /* make sure zero_4k is cleared. The effect plugin within |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1658 * the output plugin may have modified this buffer! (0.2.8) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1659 memset(zero_4k, 0, blen); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1660 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1661 /* HACK: the original OSS plugin hangs when writing large |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1662 * blocks (greater than device buffer size) in realtime mode */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1663 if (the_op_config.max_write_enable && (blen > the_op_config.max_write_len)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1664 blen = the_op_config.max_write_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1665 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1666 /* finally, write data */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1667 the_op->write_audio(data, blen); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1668 length -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1669 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1670 /* HACK: don't stay in here too long (force yielding every 10 ms) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1671 if (realtime) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1672 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1673 gettimeofday(&tv, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1674 dt = (tv.tv_sec - mark.tv_sec) * 1000 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1675 + (tv.tv_usec - mark.tv_usec) / 1000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1676 if (dt >= 10) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1677 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1678 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1679 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1680 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1681 /* calculate how many bytes actually have been written */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1682 length = length_bak - length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1683 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1684 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1685 /* --- write data ------------------------------------------------- */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1686 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1687 else if (!paused && (buffer->preload <= 0) && (buffer->used >= 4)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1688 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1689 /* write as much data as a) is available and b) the device can take */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1690 length = buffer->used; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1691 if (length > op_free) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1692 length = op_free; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1693 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1694 /* HACK: throttle output (used with fast output plugins) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1695 if (the_op_config.throttle_enable && !realtime && opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1696 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1697 sync = buffer->sync_size - (buffer->size - buffer->used); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1698 if (sync < 0) length = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1699 else if (sync < length) length = sync; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1700 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1701 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1702 /* clip length to silence countdown (if applicable) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1703 if ((buffer->silence >= 4) && (length > buffer->silence)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1704 length = buffer->silence; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1705 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1706 /* clip length to reopen countdown (if applicable) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1707 if ((buffer->reopen >= 0) && (length > buffer->reopen)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1708 length = buffer->reopen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1709 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1710 /* clip length to pause countdown (if applicable) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1711 if ((buffer->pause >= 0) && (length > buffer->pause)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1712 length = buffer->pause; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1713 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1714 /* make sure we always operate on stereo sample boundary */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1715 length &= -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1716 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1717 /* HACK: don't stay in here too long when in realtime mode (see below) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1718 if (realtime) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1719 gettimeofday(&mark, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1720 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1721 /* write length bytes to the device */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1722 length_bak = length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1723 while (length > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1724 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1725 data = buffer->data + buffer->rd_index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1726 blen = buffer->size - buffer->rd_index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1727 if (blen > length) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1728 blen = length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1729 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1730 /* HACK: the original OSS plugin hangs when writing large |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1731 * blocks (greater than device buffer size) in realtime mode */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1732 if (the_op_config.max_write_enable && (blen > the_op_config.max_write_len)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1733 blen = the_op_config.max_write_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1734 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1735 #ifdef HAVE_LIBFFTW |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1736 /* fft playground */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1737 fft_flow(&fft_context, (gpointer) data, blen); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1738 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1739 /* finally, write data */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1740 the_op->write_audio(data, blen); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1741 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1742 buffer->rd_index = (buffer->rd_index + blen) % buffer->size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1743 buffer->used -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1744 length -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1745 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1746 /* HACK: don't stay in here too long (force yielding every 10 ms) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1747 if (realtime) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1748 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1749 gettimeofday(&tv, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1750 dt = (tv.tv_sec - mark.tv_sec) * 1000 + (tv.tv_usec - mark.tv_usec) / 1000; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1751 if (dt >= 10) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1752 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1753 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1754 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1755 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1756 /* calculate how many bytes actually have been written */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1757 length = length_bak - length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1758 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1759 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1760 length = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1761 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1762 /* update realtime throttling */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1763 output_written += length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1764 output_streampos += length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1765 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1766 /* --- check countdowns ------------------------------------------------ */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1767 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1768 if (buffer->silence > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1769 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1770 buffer->silence -= length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1771 if (buffer->silence < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1772 DEBUG(("[crossfade] buffer_thread_f: WARNING: silence overrun: %d\n", buffer->silence)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1773 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1774 else if (buffer->silence_len > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1775 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1776 buffer->silence_len -= length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1777 if (buffer->silence_len <= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1778 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1779 if (buffer->silence_len < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1780 DEBUG(("[crossfade] buffer_thread_f: WARNING: silence_len overrun: %d\n", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1781 buffer->silence_len)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1782 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1783 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1784 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1785 if ((buffer->reopen >= 0) && !((buffer->silence <= 0) && (buffer->silence_len > 0))) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1786 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1787 buffer->reopen -= length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1788 if (buffer->reopen <= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1789 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1790 if (buffer->reopen < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1791 DEBUG(("[crossfade] buffer_thread_f: WARNING: reopen overrun: %d\n", buffer->reopen)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1792 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1793 DEBUG(("[crossfade] buffer_thread_f: closing/reopening device\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1794 if (buffer->reopen_sync) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1795 sync_output(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1796 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1797 if (the_op->close_audio) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1798 the_op->close_audio(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1799 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1800 if (!the_op->open_audio(out_format.fmt, out_format.rate, out_format.nch)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1801 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1802 DEBUG(("[crossfade] buffer_thread_f: reopening output plugin failed!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1803 g_free(buffer->data); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1804 output_opened = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1805 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1806 THREAD_EXIT(0); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1807 return NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1808 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1809 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1810 output_flush_time = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1811 output_written = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1812 output_streampos = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1813 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1814 /* We need to take the leading gap killer into account here: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1815 * It will fix streampos only after gapkilling has finished. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1816 * So, if gapkilling is still in progress at this point, we |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1817 * have to fix it ourselves. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1818 output_offset = buffer->used; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1819 if ((buffer->gap_len > 0) && (buffer->gap > 0)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1820 output_offset += buffer->gap_len - buffer->gap; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1821 output_offset = B2MS(output_offset) - xfade_written_time(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1822 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1823 /* make sure reopen is not 0 */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1824 buffer->reopen = -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1825 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1826 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1827 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1828 if (buffer->pause >= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1829 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1830 buffer->pause -= length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1831 if (buffer->pause <= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1832 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1833 if (buffer->pause < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1834 DEBUG(("[crossfade] buffer_thread_f: WARNING: pause overrun: %d\n", buffer->pause)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1835 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1836 DEBUG(("[crossfade] buffer_thread_f: pausing output\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1837 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1838 paused = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1839 sync_output(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1840 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1841 if (paused) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1842 the_op->pause(1); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1843 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1844 DEBUG(("[crossfade] buffer_thread_f: unpause during sync\n")) buffer->pause = -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1845 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1846 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1847 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1848 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1849 /* ----------------------------------------------------------------------- */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1850 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1851 /* cleanup: close output */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1852 if (output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1853 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1854 xfade_stop_monitor(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1855 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1856 DEBUG(("[crossfade] buffer_thread_f: closing output...\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1857 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1858 if (the_op->close_audio) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1859 the_op->close_audio(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1860 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1861 DEBUG(("[crossfade] buffer_thread_f: closing output... done\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1862 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1863 g_free(buffer->data); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1864 output_opened = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1865 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1866 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1867 DEBUG(("[crossfade] buffer_thread_f: output already closed!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1868 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1869 /* ----------------------------------------------------------------------- */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1870 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1871 /* unlock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1872 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1873 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1874 /* done */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1875 DEBUG(("[crossfade] buffer_thread_f: thread finished\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1876 THREAD_EXIT(0); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1877 return NULL; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1878 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1879 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1880 void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1881 xfade_close_audio() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1882 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1883 DEBUG(("[crossfade] close:\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1884 DEBUG(("[crossfade] close: playing=%d filename=%s\n", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1885 xfplayer_input_playing(), xfplaylist_get_filename(xfplaylist_get_position()))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1886 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1887 /* lock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1888 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1889 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1890 /* sanity... the vorbis plugin likes to call close_audio() twice */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1891 if (!opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1892 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1893 DEBUG(("[crossfade] close: WARNING: not opened!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1894 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1895 return; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1896 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1897 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1898 #if defined(COMPILE_FOR_AUDACIOUS) && AUDACIOUS_ABI_VERSION >= 2 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1899 /* HACK: to distinguish between STOP and EOP, check Audacious' |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1900 input_playing() variable. It seems to be TRUE at this point |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1901 only when the end of the playlist is reached. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1902 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1903 Normally, 'playing' is constantly being updated in the |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1904 xfade_buffer_playing() callback, but Audacious does not seem |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1905 to use it. Therefore, we can set 'playing' to FALSE here, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1906 which later 'buffer_thread' will interpret as EOP (see above). |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1907 */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1908 if (xfplayer_input_playing()) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1909 playing = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1910 #else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1911 /* HACK: use patched XMMS 'input_stopped_for_restart' */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1912 if (input_stopped_for_restart && *input_stopped_for_restart) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1913 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1914 DEBUG(("[crossfade] close: playback will restart soon\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1915 output_restart = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1916 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1917 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1918 output_restart = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1919 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1920 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1921 if (playing) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1922 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1923 /* immediatelly close output when paused */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1924 if (paused) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1925 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1926 buffer->pause = -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1927 paused = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1928 if (config->output_keep_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1929 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1930 buffer->used = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1931 the_op->flush(0); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1932 the_op->pause(0); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1933 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1934 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1935 stopped = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1936 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1937 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1938 /* HACK: If playlist_get_info_going is not true here, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1939 * XMMS is about to exit. In this case, we stop |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1940 * the buffer thread before returning from this |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1941 * function. Otherwise, SEGFAULT may occur when |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1942 * XMMS tries to cleanup an output plugin which |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1943 * we are still using. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1944 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1945 * NOTE: This hack has become obsolete as of 0.3.5. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1946 * See output_list_hack(). |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1947 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1948 * NOTE: Not quite. There still are some problems when |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1949 * XMMS is exitting while a song is playing. So |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1950 * this HACK has been enabled again. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1951 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1952 * NOTE: Another thing: If output_keep_opened is enabled, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1953 * close_audio() is never called, so that the patch |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1954 * can not work. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1955 */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1956 #if 1 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1957 if ((xmms_is_quitting && *xmms_is_quitting) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1958 || (xmms_playlist_get_info_going && !*xmms_playlist_get_info_going)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1959 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1960 DEBUG(("[crossfade] close: stop (about to quit)\n")) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1961 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1962 /* wait for buffer thread to clean up and terminate */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1963 stopped = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1964 #if 1 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1965 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1966 if (THREAD_JOIN(buffer_thread)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1967 PERROR("[crossfade] close: phtread_join()"); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1968 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1969 #else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1970 while (output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1971 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1972 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1973 xfade_usleep(10000); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1974 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1975 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1976 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1977 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1978 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1979 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1980 DEBUG(("[crossfade] close: stop\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1981 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1982 fade_config = &config->fc[FADE_CONFIG_MANUAL]; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1983 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1984 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1985 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1986 /* gint x = *((gint *)0); */ /* force SEGFAULT for debugging */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1987 DEBUG(("[crossfade] close: songchange/eop\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1988 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1989 /* kill trailing gap (does not use buffer->gap_*) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1990 if (output_opened && xfade_cfg_gap_trail_enable(config)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1991 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1992 gint gap_len = MS2B(xfade_cfg_gap_trail_len(config)) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1993 gint gap_level = xfade_cfg_gap_trail_level(config); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1994 gint length = MIN(gap_len, buffer->used); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1995 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1996 /* DEBUG(("[crossfade] close: len=%d level=%d length=%d\n", gap_len, gap_level, length)); */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1997 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1998 buffer->gap_killed = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
1999 while (length > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2000 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2001 gint wr_xedni = (buffer->rd_index + buffer->used - 1) % buffer->size + 1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2002 gint blen = MIN(length, wr_xedni); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2003 gint16 *p = buffer->data + wr_xedni, left, right; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2004 gint index = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2005 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2006 while (index < blen) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2007 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2008 right = *--p; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2009 left = *--p; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2010 if (ABS(left) >= gap_level) break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2011 if (ABS(right) >= gap_level) break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2012 index += 4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2013 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2014 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2015 buffer->used -= index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2016 buffer->gap_killed += index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2017 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2018 if (index < blen) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2019 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2020 length -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2021 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2022 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2023 DEBUG(("[crossfade] close: trailing gap size: %d/%d ms\n", B2MS(buffer->gap_killed), B2MS(gap_len))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2024 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2025 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2026 /* skip to previous zero crossing */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2027 if (output_opened && config->gap_crossing) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2028 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2029 int crossing; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2030 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2031 buffer->gap_skipped = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2032 for (crossing = 0; crossing < 4; crossing++) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2033 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2034 while (buffer->used > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2035 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2036 gint wr_xedni = (buffer->rd_index + buffer->used - 1) % buffer->size + 1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2037 gint blen = MIN(buffer->used, wr_xedni); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2038 gint16 *p = buffer->data + wr_xedni, left; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2039 gint index = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2040 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2041 while (index < blen) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2042 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2043 left = (--p, *--p); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2044 if ((crossing & 1) ^ (left > 0)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2045 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2046 index += 4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2047 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2048 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2049 buffer->used -= index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2050 buffer->gap_skipped += index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2051 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2052 if (index < blen) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2053 break; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2054 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2055 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2056 DEBUG(("[crossfade] close: skipped %d bytes to previous zero crossing\n", buffer->gap_skipped)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2057 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2058 /* update gap_killed (for undoing gap_killer in case of EOP) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2059 buffer->gap_killed += buffer->gap_skipped; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2060 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2061 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2062 fade_config = &config->fc[FADE_CONFIG_XFADE]; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2063 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2064 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2065 /* XMMS has left the building */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2066 opened = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2067 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2068 /* update last_close */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2069 gettimeofday(&last_close, NULL); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2070 input_playing = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2071 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2072 /* unlock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2073 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2074 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2075 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2076 void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2077 xfade_flush(gint time) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2078 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2079 gint pos; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2080 gchar *file; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2081 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2082 DEBUG(("[crossfade] flush: time=%d\n", time)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2083 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2084 /* get filename */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2085 pos = xfplaylist_get_position(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2086 file = xfplaylist_get_filename(pos); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2087 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2088 if (!file) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2089 file = g_strdup(xfplaylist_get_songtitle(pos)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2090 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2091 #if defined(COMPILE_FOR_AUDACIOUS) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2092 /* HACK: special handling for audacious, which just calls flush(0) on a songchange */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2093 if (file && last_filename && strcmp(file, last_filename) != 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2094 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2095 DEBUG(("[crossfade] flush: filename changed, forcing close/reopen...\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2096 xfade_close_audio(); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2097 /* 0.3.14: xfade_close_audio sets fade_config to FADE_CONFIG_MANUAL, |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2098 * but this is an automatic songchange */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2099 fade_config = &config->fc[FADE_CONFIG_XFADE]; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2100 xfade_open_audio(in_format.fmt, in_format.rate, in_format.nch); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2101 DEBUG(("[crossfade] flush: filename changed, forcing close/reopen... done\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2102 return; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2103 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2104 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2105 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2106 /* lock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2107 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2108 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2109 /* update streampos with new stream position (input format size) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2110 streampos = ((gint64) time * in_format.bps / 1000) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2111 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2112 /* flush output device / apply seek crossfade */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2113 if (config->fc[FADE_CONFIG_SEEK].type == FADE_TYPE_FLUSH) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2114 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2115 /* flush output plugin */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2116 the_op->flush(time); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2117 output_flush_time = time; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2118 output_streampos = MS2B(time); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2119 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2120 /* flush buffer, disable leading gap killing */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2121 buffer_reset(buffer, config); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2122 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2123 else if (paused) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2124 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2125 fade_config_t fc; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2126 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2127 /* clear buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2128 buffer->used = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2129 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2130 /* apply only the fade_in part of FADE_CONFIG_PAUSE */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2131 memcpy(&fc, &config->fc[FADE_CONFIG_PAUSE], sizeof(fc)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2132 fc.out_len_ms = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2133 fc.ofs_custom_ms = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2134 xfade_apply_fade_config(&fc); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2135 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2136 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2137 xfade_apply_fade_config(&config->fc[FADE_CONFIG_SEEK]); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2138 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2139 /* restart realtime throttling (should find another name for that var) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2140 output_written = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2141 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2142 /* make sure that the gapkiller is disabled */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2143 buffer->gap = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2144 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2145 /* update output offset */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2146 output_offset = the_op->written_time() - time + B2MS(buffer->used) + B2MS(buffer->silence_len); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2147 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2148 /* unlock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2149 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2150 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2151 #ifdef DEBUG_HARDCORE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2152 DEBUG(("[crossfade] flush: time=%d: done.\n", time)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2153 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2154 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2155 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2156 void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2157 xfade_pause(short p) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2158 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2159 /* lock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2160 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2161 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2162 if (p) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2163 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2164 fade_config_t *fc = &config->fc[FADE_CONFIG_PAUSE]; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2165 if (fc->type == FADE_TYPE_PAUSE_ADV) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2166 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2167 int fade, length, n; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2168 int index = buffer->rd_index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2169 int out_len = MS2B(xfade_cfg_fadeout_len(fc)) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2170 int in_len = MS2B(xfade_cfg_fadein_len(fc)) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2171 int silence_len = MS2B(xfade_cfg_offset(fc)) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2172 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2173 /* limit fadeout/fadein len to available data in buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2174 if ((out_len + in_len) > buffer->used) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2175 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2176 out_len = (buffer->used / 2) & -4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2177 in_len = out_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2178 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2179 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2180 DEBUG(("[crossfade] pause: paused=1 out=%d in=%d silence=%d\n", |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2181 B2MS(out_len), B2MS(in_len), B2MS(silence_len))); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2182 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2183 /* fade out (modifies buffer directly) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2184 fade = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2185 length = out_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2186 while (length > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2187 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2188 gint16 *p = buffer->data + index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2189 gint blen = buffer->size - index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2190 if (blen > length) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2191 blen = length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2192 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2193 for (n = blen / 4; n > 0; n--) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2194 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2195 gfloat factor = 1.0f - ((gfloat) fade / out_len); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2196 *p = (gfloat)*p * factor; p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2197 *p = (gfloat)*p * factor; p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2198 fade += 4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2199 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2200 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2201 index = (index + blen) % buffer->size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2202 length -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2203 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2204 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2205 /* fade in (modifies buffer directly) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2206 fade = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2207 length = in_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2208 while (length > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2209 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2210 gint16 *p = buffer->data + index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2211 gint blen = buffer->size - index; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2212 if (blen > length) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2213 blen = length; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2214 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2215 for (n = blen / 4; n > 0; n--) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2216 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2217 gfloat factor = (gfloat) fade / in_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2218 *p = (gfloat)*p * factor; p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2219 *p = (gfloat)*p * factor; p++; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2220 fade += 4; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2221 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2222 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2223 index = (index + blen) % buffer->size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2224 length -= blen; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2225 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2226 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2227 /* start silence and pause countdowns */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2228 buffer->silence = out_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2229 buffer->silence_len = silence_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2230 buffer->pause = out_len + silence_len; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2231 paused = FALSE; /* (!) will be set to TRUE in buffer_thread_f */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2232 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2233 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2234 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2235 the_op->pause(1); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2236 paused = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2237 DEBUG(("[crossfade] pause: paused=1\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2238 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2239 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2240 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2241 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2242 the_op->pause(0); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2243 buffer->pause = -1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2244 paused = FALSE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2245 DEBUG(("[crossfade] pause: paused=0\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2246 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2247 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2248 /* unlock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2249 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2250 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2251 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2252 gint |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2253 xfade_buffer_free() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2254 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2255 gint size, free; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2256 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2257 #ifdef DEBUG_HARDCORE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2258 DEBUG(("[crossfade] buffer_free:\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2259 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2260 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2261 /* sanity check */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2262 if (!output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2263 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2264 DEBUG(("[crossfade] buffer_free: WARNING: output closed!\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2265 return buffer->sync_size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2266 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2267 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2268 /* lock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2269 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2270 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2271 size = buffer->size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2272 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2273 /* When running in realtime mode, we need to take special care here: |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2274 * While XMMS is writing data to the output plugin, it will not yield |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2275 * ANY processing time to the buffer thread. It will only stop when |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2276 * xfade_buffer_free() no longer reports free buffer space. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2277 if (realtime) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2278 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2279 gint64 wanted = output_written + buffer->preload_size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2280 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2281 /* Fix for XMMS misbehaviour (possibly a bug): If the free space as |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2282 * returned by xfade_buffer_free() is below a certain minimum block size |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2283 * (tests showed 2304 bytes), XMMS will not send more data until there |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2284 * is enough room for one of those blocks. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2285 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2286 * This breaks preloading in realtime mode. To make sure that the pre- |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2287 * load buffer gets filled we request additional sync_size bytes. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2288 wanted += buffer->sync_size; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2289 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2290 if (wanted <= size) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2291 size = wanted; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2292 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2293 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2294 free = size - buffer->used; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2295 if (free < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2296 free = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2297 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2298 /* unlock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2299 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2300 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2301 /* Convert to input format size. For input rates > output rate this will |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2302 * return less free space than actually is available, but we don't care. */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2303 free /= (out_format.rate / (in_format.rate + 1)) + 1; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2304 if (in_format.is_8bit) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2305 free /= 2; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2306 if (in_format.nch == 1) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2307 free /= 2; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2308 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2309 #ifdef DEBUG_HARDCORE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2310 DEBUG(("[crossfade] buffer_free: %d\n", free)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2311 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2312 return free; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2313 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2314 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2315 gint |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2316 xfade_buffer_playing() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2317 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2318 /* always return FALSE here (if not in pause) so XMMS immediatelly |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2319 * starts playback of the next song */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2320 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2321 /* |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2322 * NOTE: this causes trouble when playing HTTP audio streams. |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2323 * |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2324 * mpg123.lib will start prebuffering (and thus stalling output) when both |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2325 * 1) it's internal buffer is emptied (does happen all the time) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2326 * 2) the output plugin's buffer_playing() (this function) returns FALSE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2327 */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2328 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2329 if (paused) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2330 playing = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2331 else |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2332 playing = |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2333 (is_http && (buffer->used > 0) && the_op->buffer_playing()) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2334 || (buffer->reopen >= 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2335 || (buffer->silence > 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2336 || (buffer->silence_len > 0); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2337 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2338 #ifdef DEBUG_HARDCORE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2339 DEBUG(("[crossfade] buffer_playing: %d\n", playing)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2340 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2341 return playing; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2342 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2343 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2344 gint |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2345 xfade_written_time() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2346 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2347 if (!output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2348 return 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2349 return (gint) (streampos * 1000 / in_format.bps); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2350 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2351 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2352 gint |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2353 xfade_output_time() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2354 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2355 gint time; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2356 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2357 #ifdef DEBUG_HARDCORE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2358 DEBUG(("[crossfade] output_time:\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2359 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2360 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2361 /* sanity check (note: this one _does_ happen all the time) */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2362 if (!output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2363 return 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2364 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2365 /* lock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2366 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2367 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2368 time = the_op->output_time() - output_offset; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2369 if (time < 0) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2370 time = 0; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2371 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2372 /* unlock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2373 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2374 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2375 #ifdef DEBUG_HARDCORE |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2376 DEBUG(("[crossfade] output_time: time=%d\n", time)); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2377 #endif |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2378 return time; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2379 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2380 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2381 void |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2382 xfade_cleanup() |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2383 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2384 DEBUG(("[crossfade] cleanup:\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2385 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2386 /* lock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2387 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2388 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2389 /* check if buffer thread is still running */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2390 if (output_opened) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2391 { |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2392 DEBUG(("[crossfade] cleanup: closing output\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2393 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2394 stopped = TRUE; |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2395 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2396 /* wait for buffer thread to clean up and terminate */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2397 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2398 if (THREAD_JOIN(buffer_thread)) |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2399 PERROR("[crossfade] close: thread_join()"); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2400 MUTEX_LOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2401 } |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2402 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2403 /* unlock buffer */ |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2404 MUTEX_UNLOCK(&buffer_mutex); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2405 |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2406 DEBUG(("[crossfade] cleanup: done\n")); |
2e241e90494a
Import work in progress xmms-crossfade rewrite.
William Pitcock <nenolod@atheme.org>
parents:
diff
changeset
|
2407 } |