Mercurial > audlegacy-plugins
annotate src/wavpack/libwavpack.cxx @ 3174:8106e1b31115
alsa-ng: alsaplug_written_time(), alsaplug_output_time(): Lock pcm_state_mutex.
author | William Pitcock <nenolod@atheme.org> |
---|---|
date | Fri, 15 May 2009 16:12:30 -0500 |
parents | 85a35e03b0c9 |
children |
rev | line source |
---|---|
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
1 //#define AUD_DEBUG |
2233 | 2 |
1436
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
3 #include <string> |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
4 |
109 | 5 #include <assert.h> |
6 #include <string.h> | |
7 #include <stdio.h> | |
8 #include <stdlib.h> | |
9 #include <unistd.h> | |
291
93c0da3f7a86
[svn] - make wavpack/wavpack.h include forced extern "C".
nenolod
parents:
284
diff
changeset
|
10 extern "C" { |
284
72f0de06bb56
[svn] - wavpack/wputils.h is deprecated, wavpack/wavpack.h should be used instead.
nenolod
parents:
264
diff
changeset
|
11 #include <wavpack/wavpack.h> |
2971
3134a0987162
- changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
2941
diff
changeset
|
12 #include <audlegacy/plugin.h> |
3134a0987162
- changed include path from audacious to audlegacy.
Yoshiki Yazawa <yaz@honeyplanet.jp>
parents:
2941
diff
changeset
|
13 #include <audlegacy/output.h> |
109 | 14 } |
15 #include <glib.h> | |
16 #include <gtk/gtk.h> | |
17 #include <math.h> | |
18 #include "tags.h" | |
434
7385182ae4b8
[svn] - add missing config.h inclusion for wavpack, null and metronom plugin
giacomo
parents:
372
diff
changeset
|
19 #include "../../config.h" |
109 | 20 #ifndef M_LN10 |
21 #define M_LN10 2.3025850929940456840179914546843642 | |
22 #endif | |
23 | |
24 #define BUFFER_SIZE 256 // read buffer size, in samples | |
2429
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
25 #define SAMPLE_SIZE(a) (a == 8 ? sizeof(guint8) : (a == 16 ? sizeof(guint16) : sizeof(guint32))) |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
26 #define SAMPLE_FMT(a) (a == 8 ? FMT_S8 : (a == 16 ? FMT_S16_NE : (a == 24 ? FMT_S24_NE : FMT_S32_NE))) |
109 | 27 |
28 static void wv_load_config(); | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
29 static gint wv_is_our_fd(gchar *filename, VFSFile *file); |
1526
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
30 static Tuple *wv_probe_for_tuple(gchar *filename, VFSFile *file); |
566 | 31 static void wv_play(InputPlayback *); |
32 static void wv_stop(InputPlayback *); | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
33 static void wv_pause(InputPlayback *, gshort); |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
34 static void wv_seek(InputPlayback *, gint); |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
35 static gint wv_get_time(InputPlayback *); |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
36 static void wv_get_song_info(gchar *, gchar **, gint *); |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
37 static gchar *generate_title(const gchar *, WavpackContext *ctx); |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
38 static gint isSeek; |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
39 static gshort paused; |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
40 static gboolean killDecodeThread; |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
41 static gboolean AudioError; |
109 | 42 static GThread *thread_handle; |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
43 static Tuple *wv_get_song_tuple(gchar *); |
109 | 44 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
45 // in ui.cxx |
109 | 46 void wv_configure(); |
47 void wv_about_box(void); | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
48 void wv_file_info_box(gchar *); |
109 | 49 extern gboolean clipPreventionEnabled; |
50 extern gboolean dynBitrateEnabled; | |
51 extern gboolean replaygainEnabled; | |
52 extern gboolean albumReplaygainEnabled; | |
53 extern gboolean openedAudio; | |
54 | |
1044
b1128efde471
[svn] - get rid of all warnings gcc 4.2.0 emits with my build configuration.
yaz
parents:
566
diff
changeset
|
55 const gchar *wv_fmts[] = { "wv", NULL }; |
372
a157306caf03
[svn] - finalize the plugin-side of the extension-assist ABI
nenolod
parents:
368
diff
changeset
|
56 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
57 InputPlugin wvpack = { |
109 | 58 NULL, //handle |
59 NULL, //filename | |
1185 | 60 (gchar *)"WavPack Audio Plugin", |
109 | 61 wv_load_config, |
1620
87a52bc00926
wavpack: I need a rewrite.
William Pitcock <nenolod@atheme.org>
parents:
1526
diff
changeset
|
62 NULL, |
109 | 63 wv_about_box, |
64 wv_configure, | |
1620
87a52bc00926
wavpack: I need a rewrite.
William Pitcock <nenolod@atheme.org>
parents:
1526
diff
changeset
|
65 FALSE, |
332
626f9f4d79a8
[svn] Remove old-style is_our_file() where a new-style is_our_fd() exists
kiyoshi
parents:
291
diff
changeset
|
66 NULL, |
109 | 67 NULL, //no use |
68 wv_play, | |
69 wv_stop, | |
70 wv_pause, | |
71 wv_seek, | |
72 wv_get_time, | |
73 NULL, //get volume | |
74 NULL, //set volume | |
75 NULL, //cleanup | |
76 NULL, //obsolete | |
77 NULL, //add_vis | |
78 NULL, | |
79 wv_get_song_info, | |
263 | 80 wv_file_info_box, //info box |
114 | 81 wv_get_song_tuple, |
253
ab24cfe495e0
[svn] Port to NewVFS file probe & add explicit cast to silence warning, thanks to spb.
chainsaw
parents:
247
diff
changeset
|
82 wv_is_our_fd, |
1044
b1128efde471
[svn] - get rid of all warnings gcc 4.2.0 emits with my build configuration.
yaz
parents:
566
diff
changeset
|
83 (gchar **)wv_fmts, |
1526
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
84 NULL, // high precision seeking |
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
85 wv_probe_for_tuple // probe for a tuple |
109 | 86 }; |
87 | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
88 gint32 read_bytes (void *id, void *data, gint32 bcount) |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
89 { |
1978 | 90 return aud_vfs_fread (data, 1, bcount, (VFSFile *) id); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
91 } |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
92 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
93 guint32 get_pos (void *id) |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
94 { |
1978 | 95 return aud_vfs_ftell ((VFSFile *) id); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
96 } |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
97 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
98 gint set_pos_abs (void *id, guint32 pos) |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
99 { |
1978 | 100 return aud_vfs_fseek ((VFSFile *) id, pos, SEEK_SET); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
101 } |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
102 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
103 gint set_pos_rel (void *id, gint32 delta, gint mode) |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
104 { |
1978 | 105 return aud_vfs_fseek ((VFSFile *) id, delta, mode); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
106 } |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
107 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
108 gint push_back_byte (void *id, gint c) |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
109 { |
1978 | 110 return aud_vfs_ungetc (c, (VFSFile *) id); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
111 } |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
112 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
113 guint32 get_length (void *id) |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
114 { |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
115 VFSFile *file = (VFSFile *) id; |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
116 |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
117 if (file == NULL) |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
118 return 0; |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
119 |
3089
85a35e03b0c9
wavpack: Take advantage of aud_vfs_fsize() and aud_vfs_is_streaming() APIs.
William Pitcock <nenolod@atheme.org>
parents:
2971
diff
changeset
|
120 return aud_vfs_fsize (file); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
121 } |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
122 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
123 gint can_seek (void *id) |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
124 { |
3089
85a35e03b0c9
wavpack: Take advantage of aud_vfs_fsize() and aud_vfs_is_streaming() APIs.
William Pitcock <nenolod@atheme.org>
parents:
2971
diff
changeset
|
125 return (aud_vfs_is_streaming ((VFSFile *) id) == FALSE); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
126 } |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
127 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
128 gint32 write_bytes (void *id, void *data, gint32 bcount) |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
129 { |
1978 | 130 return aud_vfs_fwrite (data, 1, bcount, (VFSFile *) id); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
131 } |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
132 |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
133 WavpackStreamReader reader = { |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
134 read_bytes, get_pos, set_pos_abs, set_pos_rel, push_back_byte, get_length, can_seek, |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
135 write_bytes |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
136 }; |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
137 |
109 | 138 class WavpackDecoder |
139 { | |
140 public: | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
141 InputPlugin *wvpack; |
2429
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
142 gint32 *input; |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
143 void *output; |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
144 gint sample_rate; |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
145 gint num_channels; |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
146 guint num_samples; |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
147 guint length; |
2429
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
148 gint bits_per_sample; |
109 | 149 WavpackContext *ctx; |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
150 gchar error_buff[80]; //string space is allocated by the caller and must be at least 80 chars |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
151 VFSFile *wv_Input, *wvc_Input; |
109 | 152 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
153 WavpackDecoder(InputPlugin *wvpack) : wvpack(wvpack) |
109 | 154 { |
155 ctx = NULL; | |
156 input = NULL; | |
157 output = NULL; | |
1520
2ed7413c199a
wavpack fixes
William Pitcock <nenolod@atheme-project.org>
parents:
1501
diff
changeset
|
158 wv_Input = NULL; |
2ed7413c199a
wavpack fixes
William Pitcock <nenolod@atheme-project.org>
parents:
1501
diff
changeset
|
159 wvc_Input = NULL; |
109 | 160 } |
161 | |
162 ~WavpackDecoder() | |
163 { | |
164 if (input != NULL) { | |
165 free(input); | |
166 input = NULL; | |
167 } | |
168 if (output != NULL) { | |
169 free(output); | |
170 output = NULL; | |
171 } | |
172 if (ctx != NULL) { | |
1520
2ed7413c199a
wavpack fixes
William Pitcock <nenolod@atheme-project.org>
parents:
1501
diff
changeset
|
173 if (wv_Input) |
1978 | 174 aud_vfs_fclose(wv_Input); |
1520
2ed7413c199a
wavpack fixes
William Pitcock <nenolod@atheme-project.org>
parents:
1501
diff
changeset
|
175 |
2ed7413c199a
wavpack fixes
William Pitcock <nenolod@atheme-project.org>
parents:
1501
diff
changeset
|
176 if (wvc_Input) |
1978 | 177 aud_vfs_fclose(wvc_Input); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
178 g_free(ctx); |
109 | 179 ctx = NULL; |
180 } | |
181 } | |
182 | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
183 gboolean attach(const gchar *filename) |
109 | 184 { |
1978 | 185 wv_Input = aud_vfs_fopen(filename, "rb"); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
186 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
187 gchar *corrFilename = g_strconcat(filename, "c", NULL); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
188 |
1978 | 189 wvc_Input = aud_vfs_fopen(corrFilename, "rb"); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
190 |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
191 g_free(corrFilename); |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
192 |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
193 ctx = WavpackOpenFileInputEx(&reader, wv_Input, wvc_Input, error_buff, OPEN_TAGS | OPEN_WVC, 0); |
109 | 194 |
195 if (ctx == NULL) { | |
196 return false; | |
197 } | |
198 | |
237 | 199 return true; |
200 } | |
201 | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
202 gboolean attach(gchar *filename, VFSFile *wvi) |
1501
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
203 { |
1520
2ed7413c199a
wavpack fixes
William Pitcock <nenolod@atheme-project.org>
parents:
1501
diff
changeset
|
204 ctx = WavpackOpenFileInputEx(&reader, wvi, NULL, error_buff, OPEN_TAGS, 0); |
1501
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
205 |
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
206 if (ctx == NULL) |
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
207 return false; |
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
208 |
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
209 return true; |
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
210 } |
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
211 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
212 gboolean attach_to_play(InputPlayback *playback) |
237 | 213 { |
1989
1bd99632fc4d
wavpack: set_params()
William Pitcock <nenolod@atheme.org>
parents:
1978
diff
changeset
|
214 wv_Input = aud_vfs_fopen(playback->filename, "rb"); |
237 | 215 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
216 gchar *corrFilename = g_strconcat(playback->filename, "c", NULL); |
237 | 217 |
1978 | 218 wvc_Input = aud_vfs_fopen(corrFilename, "rb"); |
237 | 219 |
220 g_free(corrFilename); | |
221 | |
222 ctx = WavpackOpenFileInputEx(&reader, wv_Input, wvc_Input, error_buff, OPEN_TAGS | OPEN_WVC, 0); | |
223 | |
1501
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
224 if (ctx == NULL) |
237 | 225 return false; |
226 | |
109 | 227 sample_rate = WavpackGetSampleRate(ctx); |
228 num_channels = WavpackGetNumChannels(ctx); | |
2429
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
229 bits_per_sample = WavpackGetBitsPerSample(ctx); |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
230 num_samples = WavpackGetNumSamples(ctx); |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
231 length = num_samples / sample_rate; |
2429
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
232 input = (gint32 *) malloc(BUFFER_SIZE * num_channels * sizeof(guint32)); |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
233 output = malloc(BUFFER_SIZE * num_channels * SAMPLE_SIZE(bits_per_sample)); |
2001
aa8bd7b56cda
make wavpack compile again.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
1998
diff
changeset
|
234 playback->set_params(playback, generate_title(playback->filename, ctx), |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
235 length * 1000, |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
236 (gint) WavpackGetAverageBitrate(ctx, num_channels), |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
237 (gint) sample_rate, num_channels); |
109 | 238 return true; |
239 } | |
240 | |
2711
183bd24000c9
Use InputPlayback structure properly.
Matti Hamalainen <ccr@tnsp.org>
parents:
2709
diff
changeset
|
241 gboolean open_audio(InputPlayback *playback) |
109 | 242 { |
2711
183bd24000c9
Use InputPlayback structure properly.
Matti Hamalainen <ccr@tnsp.org>
parents:
2709
diff
changeset
|
243 return playback->output->open_audio(SAMPLE_FMT(bits_per_sample), sample_rate, num_channels); |
109 | 244 } |
245 | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
246 void process_buffer(InputPlayback *playback, guint32 num_samples) |
109 | 247 { |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
248 guint32 i; |
2429
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
249 gint32* rp = input; |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
250 gint8* wp = reinterpret_cast<gint8*>(output); |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
251 gint16* wp2 = reinterpret_cast<gint16*>(output); |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
252 gint32* wp4 = reinterpret_cast<gint32*>(output); |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
253 |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
254 if (bits_per_sample % 8 != 0) { |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
255 AUDDBG("Can not convert to %d bps: not a multiple of 8\n", bits_per_sample); |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
256 } |
1501
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
257 |
2429
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
258 if (bits_per_sample == 8) { |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
259 for (i=0; i<num_samples * num_channels; i++, wp++, rp++) { |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
260 *wp = *rp & 0xff; |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
261 } |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
262 } else if (bits_per_sample == 16) { |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
263 for (i=0; i<num_samples * num_channels; i++, wp2++, rp++) { |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
264 *wp2 = *rp & 0xffff; |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
265 } |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
266 } else if (bits_per_sample == 24 || bits_per_sample == 32) { /* 24bit value stored in lowest 3 bytes */ |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
267 for (i=0; i<num_samples * num_channels; i++, wp4++, rp++) { |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
268 *wp4 = *rp; |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
269 } |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
270 } |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
271 |
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
272 playback->pass_audio(playback, SAMPLE_FMT(bits_per_sample), |
111 | 273 num_channels, |
2429
b6f09d280f2c
Add support for 24-bit wavpack files. (Bugzilla #190)
Michał Lipski <tallica@o2.pl>
parents:
2233
diff
changeset
|
274 num_samples * num_channels * SAMPLE_SIZE(bits_per_sample), |
111 | 275 output, |
276 NULL); | |
109 | 277 } |
278 }; | |
279 | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
280 InputPlugin *wv_iplist[] = { &wvpack, NULL }; |
1080 | 281 |
1395
761e17b23e0c
added Discovery plugin type
Cristi Magherusan <majeru@atheme-project.org>
parents:
1354
diff
changeset
|
282 DECLARE_PLUGIN(wavpack, NULL, NULL, wv_iplist, NULL, NULL, NULL, NULL,NULL); |
109 | 283 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
284 static gint |
253
ab24cfe495e0
[svn] Port to NewVFS file probe & add explicit cast to silence warning, thanks to spb.
chainsaw
parents:
247
diff
changeset
|
285 wv_is_our_fd(gchar *filename, VFSFile *file) |
109 | 286 { |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
287 WavpackDecoder d(&wvpack); |
1501
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
288 |
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
289 if (d.attach(filename, file)) |
253
ab24cfe495e0
[svn] Port to NewVFS file probe & add explicit cast to silence warning, thanks to spb.
chainsaw
parents:
247
diff
changeset
|
290 return TRUE; |
1501
04f8c7624ea3
Support Wavpack ".exe" executables, by using the Wavpack decoder to validate.
William Pitcock <nenolod@atheme-project.org>
parents:
1465
diff
changeset
|
291 |
109 | 292 return FALSE; |
293 } | |
294 | |
295 void | |
296 load_tag(ape_tag *tag, WavpackContext *ctx) | |
297 { | |
298 memset(tag, 0, sizeof(ape_tag)); | |
299 WavpackGetTagItem(ctx, "Album", tag->album, sizeof(tag->album)); | |
300 WavpackGetTagItem(ctx, "Artist", tag->artist, sizeof(tag->artist)); | |
301 WavpackGetTagItem(ctx, "Comment", tag->comment, sizeof(tag->comment)); | |
302 WavpackGetTagItem(ctx, "Genre", tag->genre, sizeof(tag->genre)); | |
303 WavpackGetTagItem(ctx, "Title", tag->title, sizeof(tag->title)); | |
304 WavpackGetTagItem(ctx, "Track", tag->track, sizeof(tag->track)); | |
305 WavpackGetTagItem(ctx, "Year", tag->year, sizeof(tag->year)); | |
306 } | |
307 | |
308 static void * | |
309 end_thread() | |
310 { | |
311 return 0; | |
312 } | |
313 | |
314 static void * | |
1989
1bd99632fc4d
wavpack: set_params()
William Pitcock <nenolod@atheme.org>
parents:
1978
diff
changeset
|
315 DecodeThread(InputPlayback *playback) |
109 | 316 { |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
317 gint bps; |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
318 WavpackDecoder d(&wvpack); |
109 | 319 |
1989
1bd99632fc4d
wavpack: set_params()
William Pitcock <nenolod@atheme.org>
parents:
1978
diff
changeset
|
320 if (!d.attach_to_play(playback)) { |
109 | 321 killDecodeThread = true; |
322 return end_thread(); | |
323 } | |
324 bps = WavpackGetBytesPerSample(d.ctx) * d.num_channels; | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
325 |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
326 AUDDBG("reading WavPack file, %dHz, %d channels and %dbits\n", d.sample_rate, d.num_channels, d.bits_per_sample); |
109 | 327 |
2711
183bd24000c9
Use InputPlayback structure properly.
Matti Hamalainen <ccr@tnsp.org>
parents:
2709
diff
changeset
|
328 if (!d.open_audio(playback)) { |
2233 | 329 AUDDBG("error opening audio channel\n"); |
109 | 330 killDecodeThread = true; |
331 AudioError = true; | |
332 openedAudio = false; | |
333 } | |
334 else { | |
2233 | 335 AUDDBG("opened audio channel\n"); |
109 | 336 openedAudio = true; |
337 } | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
338 guint32 status; |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
339 guint samples_left; |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
340 |
109 | 341 while (!killDecodeThread) { |
342 if (isSeek != -1) { | |
2233 | 343 AUDDBG("seeking to position %d\n", isSeek); |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
344 WavpackSeekSample(d.ctx, (gint)(isSeek * d.sample_rate)); |
109 | 345 isSeek = -1; |
346 } | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
347 |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
348 samples_left = d.num_samples-WavpackGetSampleIndex(d.ctx); |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
349 //AUDDBG("samples left: %d\n", samples_left); |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
350 if (paused == 0) { |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
351 status = WavpackUnpackSamples(d.ctx, d.input, BUFFER_SIZE); |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
352 if (status == (guint32) -1) { |
109 | 353 printf("wavpack: Error decoding file.\n"); |
354 break; | |
355 } | |
2711
183bd24000c9
Use InputPlayback structure properly.
Matti Hamalainen <ccr@tnsp.org>
parents:
2709
diff
changeset
|
356 else if (samples_left == 0 && playback->output->buffer_playing() == 0) { |
109 | 357 killDecodeThread = true; |
358 break; | |
359 } | |
360 else { | |
1998
8f3188746b64
chase last changeset in aud
William Pitcock <nenolod@atheme.org>
parents:
1989
diff
changeset
|
361 d.process_buffer(playback, status); |
109 | 362 } |
363 } | |
364 else { | |
1676
aee4ebea943a
xmms_usleep() was removed, use g_usleep()
Matti Hamalainen <ccr@tnsp.org>
parents:
1620
diff
changeset
|
365 g_usleep(10000); |
109 | 366 } |
367 } | |
368 return end_thread(); | |
369 } | |
370 | |
371 static void | |
566 | 372 wv_play(InputPlayback *data) |
109 | 373 { |
374 paused = 0; | |
375 isSeek = -1; | |
376 killDecodeThread = false; | |
377 AudioError = false; | |
1354
b670d1f3c2e4
wavpack: new threading model
William Pitcock <nenolod@atheme-project.org>
parents:
1185
diff
changeset
|
378 thread_handle = g_thread_self(); |
1447
195b5657303e
updated input plugins to use set_pb_ready to signal to the core that they're ready for playback
Giacomo Lozito <james@develia.org>
parents:
1445
diff
changeset
|
379 data->set_pb_ready(data); |
1989
1bd99632fc4d
wavpack: set_params()
William Pitcock <nenolod@atheme.org>
parents:
1978
diff
changeset
|
380 DecodeThread(data); |
109 | 381 return; |
382 } | |
383 | |
1436
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
384 static std::string |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
385 WavpackPluginGetQualityString(WavpackContext *ctx) |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
386 { |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
387 int mode = WavpackGetMode(ctx); |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
388 |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
389 if (mode & MODE_LOSSLESS) |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
390 return "lossless"; |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
391 |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
392 if (mode & MODE_HYBRID) |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
393 return "lossy (hybrid)"; |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
394 |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
395 return "lossy"; |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
396 } |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
397 |
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
398 static Tuple * |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
399 aud_tuple_from_WavpackContext(const gchar *fn, WavpackContext *ctx) |
114 | 400 { |
401 ape_tag tag; | |
1436
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
402 Tuple *ti; |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
403 gint sample_rate = WavpackGetSampleRate(ctx); |
114 | 404 |
1976
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
405 ti = aud_tuple_new_from_filename(fn); |
114 | 406 |
407 load_tag(&tag, ctx); | |
408 | |
1976
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
409 aud_tuple_associate_string(ti, FIELD_TITLE, NULL, tag.title); |
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
410 aud_tuple_associate_string(ti, FIELD_ARTIST, NULL, tag.artist); |
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
411 aud_tuple_associate_string(ti, FIELD_ALBUM, NULL, tag.album); |
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
412 aud_tuple_associate_string(ti, FIELD_GENRE, NULL, tag.genre); |
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
413 aud_tuple_associate_string(ti, FIELD_COMMENT, NULL, tag.comment); |
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
414 aud_tuple_associate_string(ti, FIELD_DATE, NULL, tag.year); |
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
415 aud_tuple_associate_string(ti, FIELD_QUALITY, NULL, WavpackPluginGetQualityString(ctx).c_str()); |
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
416 aud_tuple_associate_string(ti, FIELD_CODEC, NULL, "WavPack"); |
1436
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
417 |
1976
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
418 aud_tuple_associate_int(ti, FIELD_TRACK_NUMBER, NULL, atoi(tag.track)); |
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
419 aud_tuple_associate_int(ti, FIELD_YEAR, NULL, atoi(tag.year)); |
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
420 aud_tuple_associate_int(ti, FIELD_LENGTH, NULL, (int)(WavpackGetNumSamples(ctx) / sample_rate) * 1000); |
114 | 421 |
422 return ti; | |
423 } | |
424 | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
425 static gchar * |
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
426 generate_title(const gchar *fn, WavpackContext *ctx) |
109 | 427 { |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
428 static gchar *displaytitle = NULL; |
1436
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
429 Tuple *ti; |
109 | 430 |
1976
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
431 ti = aud_tuple_from_WavpackContext(fn, ctx); |
109 | 432 |
2059
70b1f1fc4804
use aud_cfg in some places
William Pitcock <nenolod@atheme.org>
parents:
2001
diff
changeset
|
433 displaytitle = aud_tuple_formatter_make_title_string(ti, aud_get_gentitle_format()); |
115
2e77e3fdd3c1
[svn] - make sure the tuple data is copied, not referenced (oops)
nenolod
parents:
114
diff
changeset
|
434 if (!displaytitle || *displaytitle == '\0') |
2e77e3fdd3c1
[svn] - make sure the tuple data is copied, not referenced (oops)
nenolod
parents:
114
diff
changeset
|
435 displaytitle = g_strdup(fn); |
114 | 436 |
1976
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
437 aud_tuple_free((void *) ti); |
109 | 438 |
439 return displaytitle; | |
440 } | |
441 | |
1436
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
442 static Tuple * |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
443 wv_get_song_tuple(gchar *filename) |
114 | 444 { |
1436
0ff7d08693f6
wavpack: update to new tuple API, use std::string more.
William Pitcock <nenolod@atheme-project.org>
parents:
1395
diff
changeset
|
445 Tuple *ti; |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
446 WavpackDecoder d(&wvpack); |
114 | 447 |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
448 if (!d.attach(filename)) { |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
449 printf("wavpack: Error opening file: \"%s\"\n", filename); |
114 | 450 return NULL; |
451 } | |
452 | |
1976
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
453 ti = aud_tuple_from_WavpackContext(filename, d.ctx); |
114 | 454 |
455 return ti; | |
456 } | |
457 | |
1526
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
458 static Tuple * |
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
459 wv_probe_for_tuple(gchar *filename, VFSFile *file) |
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
460 { |
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
461 Tuple *ti; |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
462 WavpackDecoder d(&wvpack); |
1526
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
463 |
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
464 if (!d.attach(filename, file)) |
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
465 return NULL; |
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
466 |
1976
5fa26178eaef
s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents:
1699
diff
changeset
|
467 ti = aud_tuple_from_WavpackContext(filename, d.ctx); |
1526
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
468 |
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
469 return ti; |
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
470 } |
56b0d46a02f6
wavpack: Implement InputPlugin::probe_for_tuple.
William Pitcock <nenolod@atheme-project.org>
parents:
1521
diff
changeset
|
471 |
109 | 472 static void |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
473 wv_get_song_info(gchar *filename, gchar **title, gint *length) |
109 | 474 { |
475 assert(filename != NULL); | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
476 WavpackDecoder d(&wvpack); |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
477 |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
478 if (!d.attach(filename)) { |
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
479 printf("wavpack: Error opening file: \"%s\"\n", filename); |
109 | 480 return; |
481 } | |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
482 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
483 gint sample_rate = WavpackGetSampleRate(d.ctx); |
2233 | 484 #ifdef AUD_DEBUG |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
485 gint num_channels = WavpackGetNumChannels(d.ctx); |
2233 | 486 #endif |
487 AUDDBG("reading %s at %d rate with %d channels\n", filename, sample_rate, num_channels); | |
109 | 488 |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
489 *length = (gint)(WavpackGetNumSamples(d.ctx) / sample_rate) * 1000, |
233
7b7660c9f31c
[svn] - rewrite to take advantage of already existant object-oriented framework
nenolod
parents:
130
diff
changeset
|
490 *title = generate_title(filename, d.ctx); |
2233 | 491 AUDDBG("title for %s = %s\n", filename, *title); |
109 | 492 } |
493 | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
494 static gint |
566 | 495 wv_get_time(InputPlayback *data) |
109 | 496 { |
566 | 497 if (data->output == NULL) |
109 | 498 return -1; |
499 if (AudioError) | |
500 return -2; | |
566 | 501 if (killDecodeThread && !data->output->buffer_playing()) |
109 | 502 return -1; |
566 | 503 return data->output->output_time(); |
109 | 504 } |
505 | |
506 static void | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
507 wv_seek(InputPlayback *data, gint sec) |
109 | 508 { |
566 | 509 isSeek = sec; |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
510 data->output->flush((gint) (1000 * isSeek)); |
109 | 511 } |
512 | |
513 static void | |
2430
99864aafd655
fix cutoff in wavpack plugin. (Bugzilla #194)
Michal Lipski <tallica@o2.pl>
parents:
2429
diff
changeset
|
514 wv_pause(InputPlayback *data, gshort pause) |
566 | 515 { |
516 data->output->pause(paused = pause); | |
517 } | |
518 | |
519 static void | |
520 wv_stop(InputPlayback *data) | |
109 | 521 { |
522 killDecodeThread = true; | |
523 if (thread_handle != 0) { | |
524 g_thread_join(thread_handle); | |
525 if (openedAudio) { | |
2711
183bd24000c9
Use InputPlayback structure properly.
Matti Hamalainen <ccr@tnsp.org>
parents:
2709
diff
changeset
|
526 data->output->buffer_free(); |
183bd24000c9
Use InputPlayback structure properly.
Matti Hamalainen <ccr@tnsp.org>
parents:
2709
diff
changeset
|
527 data->output->close_audio(); |
109 | 528 } |
529 openedAudio = false; | |
530 if (AudioError) | |
531 printf("Could not open Audio\n"); | |
532 } | |
533 | |
534 } | |
535 | |
536 static void | |
537 wv_load_config() | |
538 { | |
2523
769e17da93dd
Replaced s/ConfigDb/mcs_handle_t/g, as per changes in the core.
Matti Hamalainen <ccr@tnsp.org>
parents:
2499
diff
changeset
|
539 mcs_handle_t *cfg; |
109 | 540 |
2124 | 541 cfg = aud_cfg_db_open(); |
109 | 542 |
2124 | 543 aud_cfg_db_get_bool(cfg, "wavpack", "clip_prevention", |
109 | 544 &clipPreventionEnabled); |
2124 | 545 aud_cfg_db_get_bool(cfg, "wavpack", "album_replaygain", |
109 | 546 &albumReplaygainEnabled); |
2124 | 547 aud_cfg_db_get_bool(cfg, "wavpack", "dyn_bitrate", &dynBitrateEnabled); |
548 aud_cfg_db_get_bool(cfg, "wavpack", "replaygain", &replaygainEnabled); | |
549 aud_cfg_db_close(cfg); | |
109 | 550 |
551 openedAudio = false; | |
552 } |