annotate src/sexypsf/plugin.c @ 2512:1f6b5f5768e2

Remove some completely useless null-pointer checks, g_free() checks the pointer anyway.
author Matti Hamalainen <ccr@tnsp.org>
date Wed, 02 Apr 2008 22:58:35 +0300
parents 4d6045c20cc5
children bd3a24b39058
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
1 /* sexyPSF - PSF1 player
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
2 * Copyright (C) 2002-2004 xodnizel
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
3 *
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
4 * This library is free software; you can redistribute it and/or
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
5 * modify it under the terms of the GNU Lesser General Public
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
6 * License as published by the Free Software Foundation; either
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
7 * version 2.1 of the License, or (at your option) any later version.
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
8 *
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
9 * This library is distributed in the hope that it will be useful,
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
10 * but WITHOUT ANY WARRANTY; without even the implied warranty of
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
11 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
12 * Lesser General Public License for more details.
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
13 *
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
14 * You should have received a copy of the GNU Lesser General Public
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
15 * License along with this library; if not, write to the Free Software
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
16 * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
17 */
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
18
1954
6acf1bda788b Removed some extraneous includes.
Matti Hamalainen <ccr@tnsp.org>
parents: 1952
diff changeset
19 #include <audacious/plugin.h>
1950
2ebeb7816c5e Change from "" to <>-style includes. With thanks to ccr for the correct sed voodoo.
chainsaw@localhost
parents: 1691
diff changeset
20 #include <audacious/output.h>
2ebeb7816c5e Change from "" to <>-style includes. With thanks to ccr for the correct sed voodoo.
chainsaw@localhost
parents: 1691
diff changeset
21 #include <audacious/util.h>
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
22 #include <stdio.h>
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
23 #include <stdlib.h>
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
24 #include <string.h>
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
25 #include <unistd.h>
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
26 #include "driver.h"
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
27
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
28 static volatile int seek = 0;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
29 static volatile gboolean playing = FALSE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
30 static volatile gboolean paused = FALSE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
31 static volatile gboolean stop = FALSE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
32 static volatile gboolean nextsong = FALSE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
33
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
34 extern InputPlugin sexypsf_ip;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
35 static gboolean audio_error = FALSE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
36
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
37 static PSFINFO *PSFInfo = NULL;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
38 static gchar *fnsave = NULL;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
39 static GThread *dethread = NULL;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
40 static InputPlayback *playback = NULL;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
41
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
42 static gchar *get_title_psf(gchar *fn);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
43
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
44 static int is_our_fd(gchar *filename, VFSFile *file) {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
45 gchar magic[4];
1978
fa9f85cebade s/vfs_/aud_vfs_/g
William Pitcock <nenolod@atheme.org>
parents: 1976
diff changeset
46 aud_vfs_fread(magic, 1, 4, file);
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
47
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
48 // only allow PSF1 for now
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
49 if (!memcmp(magic, "PSF\x01", 4))
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
50 return 1;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
51 return 0;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
52 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
53
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
54 void sexypsf_update(unsigned char *buffer, long count)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
55 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
56 const int mask = ~((((16 / 8) * 2)) - 1);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
57
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
58 while (count > 0)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
59 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
60 int t = playback->output->buffer_free() & mask;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
61 if (t > count)
1998
8f3188746b64 chase last changeset in aud
William Pitcock <nenolod@atheme.org>
parents: 1986
diff changeset
62 playback->pass_audio(playback,
1205
c39a61e6a276 Fine-tune fadeout
mf0102 <0102@gmx.at>
parents: 1204
diff changeset
63 FMT_S16_NE, 2, count, buffer, NULL);
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
64 else
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
65 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
66 if (t)
1998
8f3188746b64 chase last changeset in aud
William Pitcock <nenolod@atheme.org>
parents: 1986
diff changeset
67 playback->pass_audio(playback, FMT_S16_NE, 2, t, buffer, NULL);
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
68 g_usleep((count-t)*1000*5/441/2);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
69 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
70 count -= t;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
71 buffer += t;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
72 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
73 if (seek)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
74 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
75 if(sexypsf_seek(seek))
1204
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
76 {
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
77 playback->output->flush(seek);
1204
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
78 seek = 0;
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
79 }
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
80 else // negative time - must make a C time machine
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
81 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
82 sexypsf_stop();
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
83 return;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
84 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
85 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
86 if (stop)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
87 sexypsf_stop();
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
88 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
89
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
90 static gpointer sexypsf_playloop(gpointer arg)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
91 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
92 while (TRUE)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
93 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
94 sexypsf_execute();
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
95
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
96 /* we have reached the end of the song or a command was issued */
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
97
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
98 playback->output->buffer_free();
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
99 playback->output->buffer_free();
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
100
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
101 if (stop)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
102 break;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
103
1204
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
104 if (seek)
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
105 {
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
106 playback->output->flush(seek);
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
107 if(!(PSFInfo = sexypsf_load(fnsave)))
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
108 break;
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
109 sexypsf_seek(seek);
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
110 seek = 0;
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
111 continue;
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
112 }
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
113
1205
c39a61e6a276 Fine-tune fadeout
mf0102 <0102@gmx.at>
parents: 1204
diff changeset
114 // timeout at the end of a file
2128
feb0e916f8bc adapted SexyPSF timeout to the method nenolod introduced in UPSE
mf0102 <0102@gmx.at>
parents: 2055
diff changeset
115 while (playback->output->buffer_playing())
feb0e916f8bc adapted SexyPSF timeout to the method nenolod introduced in UPSE
mf0102 <0102@gmx.at>
parents: 2055
diff changeset
116 g_usleep(10000);
feb0e916f8bc adapted SexyPSF timeout to the method nenolod introduced in UPSE
mf0102 <0102@gmx.at>
parents: 2055
diff changeset
117
1204
e9f10dac2f63 Fixed bug (no fadeout was applied at the end of a file)
mf0102 <0102@gmx.at>
parents: 1203
diff changeset
118 break;
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
119 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
120
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
121 playback->output->close_audio();
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
122 if (!(stop)) nextsong = TRUE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
123 return NULL;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
124 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
125
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
126 static void sexypsf_xmms_play(InputPlayback *data)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
127 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
128 if (playing)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
129 return;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
130
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
131 playback = data;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
132 nextsong = FALSE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
133 paused = FALSE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
134
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
135 if (!playback->output->open_audio(FMT_S16_NE, 44100, 2))
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
136 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
137 audio_error = TRUE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
138 return;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
139 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
140
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
141 fnsave = malloc(strlen(data->filename)+1);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
142 strcpy(fnsave, data->filename);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
143 if(!(PSFInfo=sexypsf_load(data->filename)))
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
144 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
145 playback->output->close_audio();
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
146 nextsong = 1;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
147 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
148 else
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
149 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
150 stop = seek = 0;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
151
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
152 gchar *name = get_title_psf(data->filename);
1986
4b78df9dcf93 more set_params()
William Pitcock <nenolod@atheme.org>
parents: 1979
diff changeset
153 data->set_params(data, name, PSFInfo->length, 44100*2*2*8, 44100, 2);
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
154 g_free(name);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
155
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
156 playing = 1;
1353
b5705eea23d9 sexypsf: new threading model
William Pitcock <nenolod@atheme-project.org>
parents: 1205
diff changeset
157 dethread = 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: 1431
diff changeset
158 data->set_pb_ready(data);
1353
b5705eea23d9 sexypsf: new threading model
William Pitcock <nenolod@atheme-project.org>
parents: 1205
diff changeset
159 sexypsf_playloop(NULL);
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
160 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
161 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
162
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
163 static void sexypsf_xmms_stop(InputPlayback * playback)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
164 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
165 if (!playing) return;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
166
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
167 if (paused)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
168 playback->output->pause(0);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
169 paused = FALSE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
170
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
171 stop = TRUE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
172 g_thread_join(dethread);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
173 playing = FALSE;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
174
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
175 if (fnsave)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
176 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
177 free(fnsave);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
178 fnsave = NULL;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
179 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
180 sexypsf_freepsfinfo(PSFInfo);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
181 PSFInfo = NULL;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
182 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
183
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
184 static void sexypsf_xmms_pause(InputPlayback *playback, short p)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
185 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
186 if (!playing) return;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
187 playback->output->pause(p);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
188 paused = p;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
189 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
190
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
191 static void sexypsf_xmms_seek(InputPlayback * data, int time)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
192 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
193 if (!playing) return;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
194 seek = time * 1000;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
195 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
196
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
197 static int sexypsf_xmms_gettime(InputPlayback *playback)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
198 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
199 if (audio_error)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
200 return -2;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
201 if (nextsong)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
202 return -1;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
203 if (!playing)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
204 return 0;
1205
c39a61e6a276 Fine-tune fadeout
mf0102 <0102@gmx.at>
parents: 1204
diff changeset
205
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
206 return playback->output->output_time();
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
207 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
208
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
209 static void sexypsf_xmms_getsonginfo(char *fn, char **title, int *length)
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
210 {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
211 PSFINFO *tmp;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
212
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
213 if((tmp = sexypsf_getpsfinfo(fn))) {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
214 *length = tmp->length;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
215 *title = get_title_psf(fn);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
216 sexypsf_freepsfinfo(tmp);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
217 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
218 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
219
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
220 static Tuple *get_aud_tuple_psf(gchar *fn) {
1419
de310b4826de sexypsf: update to new tuple API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
221 Tuple *tuple = NULL;
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
222 PSFINFO *tmp = sexypsf_getpsfinfo(fn);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
223
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
224 if (tmp->length) {
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
225 tuple = aud_tuple_new_from_filename(fn);
2128
feb0e916f8bc adapted SexyPSF timeout to the method nenolod introduced in UPSE
mf0102 <0102@gmx.at>
parents: 2055
diff changeset
226 aud_tuple_associate_int(tuple, FIELD_LENGTH, NULL, tmp->length);
feb0e916f8bc adapted SexyPSF timeout to the method nenolod introduced in UPSE
mf0102 <0102@gmx.at>
parents: 2055
diff changeset
227 aud_tuple_associate_string(tuple, FIELD_ARTIST, NULL, tmp->artist);
feb0e916f8bc adapted SexyPSF timeout to the method nenolod introduced in UPSE
mf0102 <0102@gmx.at>
parents: 2055
diff changeset
228 aud_tuple_associate_string(tuple, FIELD_ALBUM, NULL, tmp->game);
feb0e916f8bc adapted SexyPSF timeout to the method nenolod introduced in UPSE
mf0102 <0102@gmx.at>
parents: 2055
diff changeset
229 aud_tuple_associate_string(tuple, -1, "game", tmp->game);
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
230 aud_tuple_associate_string(tuple, FIELD_TITLE, NULL, tmp->title);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
231 aud_tuple_associate_string(tuple, FIELD_GENRE, NULL, tmp->genre);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
232 aud_tuple_associate_string(tuple, FIELD_COPYRIGHT, NULL, tmp->copyright);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
233 aud_tuple_associate_string(tuple, FIELD_QUALITY, NULL, "sequenced");
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
234 aud_tuple_associate_string(tuple, FIELD_CODEC, NULL, "PlayStation Audio");
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
235 aud_tuple_associate_string(tuple, -1, "console", "PlayStation");
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
236 aud_tuple_associate_string(tuple, -1, "dumper", tmp->psfby);
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
237 aud_tuple_associate_string(tuple, FIELD_COMMENT, NULL, tmp->comment);
1419
de310b4826de sexypsf: update to new tuple API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
238
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
239 sexypsf_freepsfinfo(tmp);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
240 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
241
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
242 return tuple;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
243 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
244
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
245 static gchar *get_title_psf(gchar *fn) {
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
246 gchar *title = NULL;
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
247 Tuple *tuple = get_aud_tuple_psf(fn);
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
248
1419
de310b4826de sexypsf: update to new tuple API
William Pitcock <nenolod@atheme-project.org>
parents: 1395
diff changeset
249 if (tuple != NULL) {
2055
2f2ffbc2d04d gentitle changes
William Pitcock <nenolod@atheme.org>
parents: 1998
diff changeset
250 title = aud_tuple_formatter_make_title_string(tuple, aud_get_gentitle_format());
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
251 aud_tuple_free(tuple);
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
252 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
253 else
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
254 title = g_path_get_basename(fn);
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
255
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
256 return title;
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
257 }
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
258
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
259 gchar *sexypsf_fmts[] = { "psf", "minipsf", NULL };
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
260
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
261 InputPlugin sexypsf_ip =
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
262 {
1613
4eeeef9adab3 sexypsf: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1606
diff changeset
263 .description = "PSF Audio Plugin",
4eeeef9adab3 sexypsf: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1606
diff changeset
264 .play_file = sexypsf_xmms_play,
4eeeef9adab3 sexypsf: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1606
diff changeset
265 .stop = sexypsf_xmms_stop,
4eeeef9adab3 sexypsf: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1606
diff changeset
266 .pause = sexypsf_xmms_pause,
4eeeef9adab3 sexypsf: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1606
diff changeset
267 .seek = sexypsf_xmms_seek,
4eeeef9adab3 sexypsf: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1606
diff changeset
268 .get_time = sexypsf_xmms_gettime,
4eeeef9adab3 sexypsf: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1606
diff changeset
269 .get_song_info = sexypsf_xmms_getsonginfo,
1976
5fa26178eaef s/tuple_/aud_tuple_/g
William Pitcock <nenolod@atheme.org>
parents: 1954
diff changeset
270 .get_song_tuple = get_aud_tuple_psf,
1613
4eeeef9adab3 sexypsf: C99 initialisers
William Pitcock <nenolod@atheme.org>
parents: 1606
diff changeset
271 .is_our_file_from_vfs = is_our_fd,
1979
839804c3b3a4 aud_vfs_extensions -> vfs_extensions, some vtable fixes
William Pitcock <nenolod@atheme.org>
parents: 1978
diff changeset
272 .vfs_extensions = sexypsf_fmts,
1203
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
273 };
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
274
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
275 InputPlugin *sexypsf_iplist[] = { &sexypsf_ip, NULL };
6eef4486e481 Fixed hangs when outputting to FileWriter and improved readability in
michi@tux.homenetwork
parents:
diff changeset
276
1395
761e17b23e0c added Discovery plugin type
Cristi Magherusan <majeru@atheme-project.org>
parents: 1353
diff changeset
277 DECLARE_PLUGIN(sexypsf, NULL, NULL, sexypsf_iplist, NULL, NULL, NULL, NULL, NULL);