Mercurial > audlegacy
annotate src/audacious/playlist.c @ 3688:8ab4cd5c6462
multifile plugins :(
author | William Pitcock <nenolod@atheme.org> |
---|---|
date | Tue, 02 Oct 2007 21:47:17 -0500 |
parents | d5309028af21 |
children | da090f448c88 |
rev | line source |
---|---|
2313 | 1 /* Audacious |
2 * Copyright (C) 2005-2007 Audacious team. | |
3 * | |
4 * BMP (C) GPL 2003 $top_src_dir/AUTHORS | |
5 * | |
6 * based on: | |
7 * | |
8 * XMMS - Cross-platform multimedia player | |
9 * Copyright (C) 1998-2003 Peter Alm, Mikael Alm, Olle Hallnas, | |
10 * Thomas Nilsson and 4Front Technologies | |
11 * Copyright (C) 1999-2003 Haavard Kvaalen | |
12 * | |
13 * This program is free software; you can redistribute it and/or modify | |
14 * it under the terms of the GNU General Public License as published by | |
3121
3b6d316f8b09
GPL3 relicensing.
William Pitcock <nenolod@atheme-project.org>
parents:
3097
diff
changeset
|
15 * the Free Software Foundation; under version 3 of the License. |
2313 | 16 * |
17 * This program is distributed in the hope that it will be useful, | |
18 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
19 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
20 * GNU General Public License for more details. | |
21 * | |
22 * You should have received a copy of the GNU General Public License | |
3121
3b6d316f8b09
GPL3 relicensing.
William Pitcock <nenolod@atheme-project.org>
parents:
3097
diff
changeset
|
23 * along with this program. If not, see <http://www.gnu.org/licenses>. |
3123
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
24 * |
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
25 * The Audacious team does not consider modular code linking to |
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3121
diff
changeset
|
26 * Audacious or using our public API to be a derived work. |
2313 | 27 */ |
28 | |
29 #ifdef HAVE_CONFIG_H | |
30 # include "config.h" | |
31 #endif | |
32 | |
33 #include "playlist.h" | |
34 | |
2633
c079e507869a
[svn] - use a managed heap for playlist entry node allocation.
nenolod
parents:
2614
diff
changeset
|
35 #include <mowgli.h> |
2313 | 36 #include <glib.h> |
37 #include <glib/gprintf.h> | |
38 #include <stdlib.h> | |
39 #include <string.h> | |
40 #include <time.h> | |
41 | |
42 #include <unistd.h> | |
43 #include <sys/types.h> | |
44 #include <sys/stat.h> | |
45 #include <sys/errno.h> | |
46 | |
47 #if defined(USE_REGEX_ONIGURUMA) | |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
48 # include <onigposix.h> |
2313 | 49 #elif defined(USE_REGEX_PCRE) |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
50 # include <pcreposix.h> |
2313 | 51 #else |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
52 # include <regex.h> |
2313 | 53 #endif |
54 | |
55 #include "input.h" | |
56 #include "main.h" | |
57 #include "ui_main.h" | |
2416
0fd7f4f969ad
[svn] integrated urldecode.* from libaudacious into audacious directory, made separate ui_fileopener.*
mf0102
parents:
2408
diff
changeset
|
58 #include "util.h" |
2717 | 59 #include "configdb.h" |
2313 | 60 #include "vfs.h" |
61 #include "ui_equalizer.h" | |
62 #include "playback.h" | |
63 #include "playlist.h" | |
64 #include "playlist_container.h" | |
2499
15a1f5ee4d1c
[svn] - playlist_manager -> ui_playlist_manager, since it's a UI component.
nenolod
parents:
2493
diff
changeset
|
65 #include "ui_playlist_manager.h" |
2313 | 66 #include "ui_playlist.h" |
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2328
diff
changeset
|
67 #include "strings.h" |
2313 | 68 #include "ui_fileinfo.h" |
69 | |
70 #include "debug.h" | |
71 | |
2407
1dc1d36d0347
[svn] - add hooks: playback begin, playback end, playlist reached end
nenolod
parents:
2380
diff
changeset
|
72 #include "hook.h" |
1dc1d36d0347
[svn] - add hooks: playback begin, playback end, playlist reached end
nenolod
parents:
2380
diff
changeset
|
73 |
3159
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
74 #include "playlist_evmessages.h" |
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
75 #include "playlist_evlisteners.h" |
3217 | 76 #include "ui_skinned_playlist.h" |
3159
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
77 |
2313 | 78 typedef gint (*PlaylistCompareFunc) (PlaylistEntry * a, PlaylistEntry * b); |
79 typedef void (*PlaylistSaveFunc) (FILE * file); | |
80 | |
81 /* If we manually change the song, p_p_b_j will show us where to go back to */ | |
82 PlaylistEntry *playlist_position_before_jump = NULL; | |
83 | |
84 static GList *playlists = NULL; | |
85 static GList *playlists_iter; | |
86 | |
87 /* If this is set to TRUE, we do not probe upon playlist add. | |
88 * | |
89 * Under Audacious 0.1.x, this was not a big deal because we used | |
90 * file extension introspection instead of looking for file format magic | |
91 * strings. | |
92 * | |
93 * Because we use file magic strings, we have to fstat a file being added | |
94 * to a playlist up to 1 * <number of input plugins installed> times. | |
95 * | |
96 * This can get really slow now that we're looking for files to add to a | |
97 * playlist. (Up to 5 minutes for 5000 songs, etcetera.) | |
98 * | |
99 * So, we obviously don't want to probe while opening a large playlist | |
100 * up. Hince the boolean below. | |
101 * | |
102 * January 7, 2006, William Pitcock <nenolod@nenolod.net> | |
103 */ | |
104 | |
105 | |
2328 | 106 //static gchar *playlist_current_name = NULL; |
2313 | 107 |
108 static gboolean playlist_get_info_scan_active = FALSE; | |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
109 GStaticRWLock playlist_get_info_rwlock = G_STATIC_RW_LOCK_INIT; |
2313 | 110 static gboolean playlist_get_info_going = FALSE; |
111 static GThread *playlist_get_info_thread; | |
112 | |
113 static gint path_compare(const gchar * a, const gchar * b); | |
114 static gint playlist_compare_path(PlaylistEntry * a, PlaylistEntry * b); | |
115 static gint playlist_compare_filename(PlaylistEntry * a, PlaylistEntry * b); | |
116 static gint playlist_compare_title(PlaylistEntry * a, PlaylistEntry * b); | |
117 static gint playlist_compare_artist(PlaylistEntry * a, PlaylistEntry * b); | |
118 static time_t playlist_get_mtime(const gchar *filename); | |
119 static gint playlist_compare_date(PlaylistEntry * a, PlaylistEntry * b); | |
120 static gint playlist_compare_track(PlaylistEntry * a, PlaylistEntry * b); | |
121 static gint playlist_compare_playlist(PlaylistEntry * a, PlaylistEntry * b); | |
122 | |
123 static gint playlist_dupscmp_path(PlaylistEntry * a, PlaylistEntry * b); | |
124 static gint playlist_dupscmp_filename(PlaylistEntry * a, PlaylistEntry * b); | |
125 static gint playlist_dupscmp_title(PlaylistEntry * a, PlaylistEntry * b); | |
126 | |
127 static PlaylistCompareFunc playlist_compare_func_table[] = { | |
128 playlist_compare_path, | |
129 playlist_compare_filename, | |
130 playlist_compare_title, | |
131 playlist_compare_artist, | |
132 playlist_compare_date, | |
133 playlist_compare_track, | |
134 playlist_compare_playlist | |
135 }; | |
136 | |
137 static guint playlist_load_ins(Playlist * playlist, const gchar * filename, gint pos); | |
138 | |
139 static void playlist_generate_shuffle_list(Playlist *); | |
140 static void playlist_generate_shuffle_list_nolock(Playlist *); | |
141 | |
142 static void playlist_recalc_total_time_nolock(Playlist *); | |
143 static void playlist_recalc_total_time(Playlist *); | |
144 static gboolean playlist_entry_get_info(PlaylistEntry * entry); | |
145 | |
2633
c079e507869a
[svn] - use a managed heap for playlist entry node allocation.
nenolod
parents:
2614
diff
changeset
|
146 static mowgli_heap_t *playlist_entry_heap = NULL; |
c079e507869a
[svn] - use a managed heap for playlist entry node allocation.
nenolod
parents:
2614
diff
changeset
|
147 |
2313 | 148 /* *********************** playlist entry code ********************** */ |
149 | |
150 PlaylistEntry * | |
151 playlist_entry_new(const gchar * filename, | |
152 const gchar * title, | |
153 const gint length, | |
154 InputPlugin * dec) | |
155 { | |
156 PlaylistEntry *entry; | |
157 | |
2633
c079e507869a
[svn] - use a managed heap for playlist entry node allocation.
nenolod
parents:
2614
diff
changeset
|
158 entry = mowgli_heap_alloc(playlist_entry_heap); |
2313 | 159 entry->filename = g_strdup(filename); |
160 entry->title = str_to_utf8(title); | |
161 entry->length = length; | |
162 entry->selected = FALSE; | |
163 entry->decoder = dec; | |
164 | |
165 /* only do this if we have a decoder, otherwise it just takes too long */ | |
166 if (entry->decoder) | |
167 playlist_entry_get_info(entry); | |
168 | |
169 return entry; | |
170 } | |
171 | |
172 void | |
173 playlist_entry_free(PlaylistEntry * entry) | |
174 { | |
175 if (!entry) | |
176 return; | |
177 | |
178 if (entry->tuple != NULL) { | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
179 mowgli_object_unref(entry->tuple); |
2313 | 180 entry->tuple = NULL; |
181 } | |
182 | |
3510
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3507
diff
changeset
|
183 g_free(entry->filename); |
b2a82a73a788
Few bits of pre-integration shit.
Matti Hamalainen <ccr@tnsp.org>
parents:
3507
diff
changeset
|
184 g_free(entry->title); |
2633
c079e507869a
[svn] - use a managed heap for playlist entry node allocation.
nenolod
parents:
2614
diff
changeset
|
185 mowgli_heap_free(playlist_entry_heap, entry); |
2313 | 186 } |
187 | |
188 static gboolean | |
189 playlist_entry_get_info(PlaylistEntry * entry) | |
190 { | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
191 Tuple *tuple = NULL; |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
192 ProbeResult *pr = NULL; |
2313 | 193 time_t modtime; |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
194 const gchar *formatter; |
2313 | 195 |
196 g_return_val_if_fail(entry != NULL, FALSE); | |
197 | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
198 if (entry->tuple == NULL || tuple_get_int(entry->tuple, FIELD_MTIME, NULL) > 0 || |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
199 tuple_get_int(entry->tuple, FIELD_MTIME, NULL) == -1) |
2636 | 200 modtime = playlist_get_mtime(entry->filename); |
2313 | 201 else |
2636 | 202 modtime = 0; /* URI -nenolod */ |
2313 | 203 |
2668
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
204 if (str_has_prefix_nocase(entry->filename, "http:") && |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
205 g_thread_self() != playlist_get_info_thread) |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
206 return FALSE; |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
207 |
3635 | 208 if (entry->decoder == NULL) { |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
209 pr = input_check_file(entry->filename, FALSE); |
3128
343504d43afc
Fix warnings.
William Pitcock <nenolod@atheme-project.org>
parents:
3127
diff
changeset
|
210 if (pr) |
3635 | 211 entry->decoder = pr->ip; |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
212 } |
2313 | 213 |
214 /* renew tuple if file mtime is newer than tuple mtime. */ | |
3635 | 215 if (entry->tuple){ |
216 if (tuple_get_int(entry->tuple, FIELD_MTIME, NULL) == modtime) | |
2313 | 217 return TRUE; |
218 else { | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
219 mowgli_object_unref(entry->tuple); |
2313 | 220 entry->tuple = NULL; |
221 } | |
222 } | |
223 | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
224 if (pr != NULL && pr->tuple != NULL) |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
225 tuple = pr->tuple; |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
226 else if (entry->decoder != NULL && entry->decoder->get_song_tuple != NULL) |
2313 | 227 tuple = entry->decoder->get_song_tuple(entry->filename); |
228 | |
229 if (tuple == NULL) | |
230 return FALSE; | |
231 | |
232 /* attach mtime */ | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
233 tuple_associate_int(tuple, FIELD_MTIME, NULL, modtime); |
2313 | 234 |
235 /* entry is still around */ | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
236 formatter = tuple_get_string(tuple, FIELD_FORMATTER, NULL); |
3349
01a241d35146
add tuple_formatter_make_title_string(). it is a wrapper function to tuple_formatter_process_construct() to make title string. it falls back to the file name if the formatted string is blank or unavailable.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3348
diff
changeset
|
237 entry->title = tuple_formatter_make_title_string(tuple, formatter ? |
3334
ea806daf3ef0
rename xmms_get_gentitle_format() to get_gentitle_format().
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3327
diff
changeset
|
238 formatter : get_gentitle_format()); |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
239 entry->length = tuple_get_int(tuple, FIELD_LENGTH, NULL); |
2313 | 240 entry->tuple = tuple; |
241 | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
242 g_free(pr); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
243 |
2313 | 244 return TRUE; |
245 } | |
246 | |
247 /* *********************** playlist selector code ************************* */ | |
248 | |
249 void | |
250 playlist_init(void) | |
251 { | |
252 Playlist *initial_pl; | |
253 | |
2633
c079e507869a
[svn] - use a managed heap for playlist entry node allocation.
nenolod
parents:
2614
diff
changeset
|
254 /* create a heap with 1024 playlist entry nodes preallocated. --nenolod */ |
c079e507869a
[svn] - use a managed heap for playlist entry node allocation.
nenolod
parents:
2614
diff
changeset
|
255 playlist_entry_heap = mowgli_heap_create(sizeof(PlaylistEntry), 1024, |
c079e507869a
[svn] - use a managed heap for playlist entry node allocation.
nenolod
parents:
2614
diff
changeset
|
256 BH_NOW); |
c079e507869a
[svn] - use a managed heap for playlist entry node allocation.
nenolod
parents:
2614
diff
changeset
|
257 |
2313 | 258 /* FIXME: is this really necessary? REQUIRE_STATIC_LOCK(playlists); */ |
259 | |
260 initial_pl = playlist_new(); | |
261 | |
262 playlist_add_playlist(initial_pl); | |
3159
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
263 |
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
264 playlist_evlistener_init(); |
2313 | 265 } |
266 | |
267 void | |
268 playlist_add_playlist(Playlist *playlist) | |
269 { | |
270 playlists = g_list_append(playlists, playlist); | |
271 | |
272 if (playlists_iter == NULL) | |
273 playlists_iter = playlists; | |
274 | |
275 playlist_manager_update(); | |
276 } | |
277 | |
278 void | |
279 playlist_remove_playlist(Playlist *playlist) | |
280 { | |
3473
3b26640f9fd6
Don't stop playback when deleting a non-active playlist
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3401
diff
changeset
|
281 gboolean active; |
3b26640f9fd6
Don't stop playback when deleting a non-active playlist
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3401
diff
changeset
|
282 active = (playlist && playlist == playlist_get_active()); |
2820 | 283 /* users suppose playback will be stopped on removing playlist */ |
3473
3b26640f9fd6
Don't stop playback when deleting a non-active playlist
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3401
diff
changeset
|
284 if (active && playback_get_playing()) { |
2820 | 285 ip_data.stop = TRUE; |
286 playback_stop(); | |
287 ip_data.stop = FALSE; | |
288 mainwin_clear_song_info(); | |
289 } | |
290 | |
2313 | 291 /* trying to free the last playlist simply clears and resets it */ |
292 if (g_list_length(playlists) < 2) { | |
293 playlist_clear(playlist); | |
294 playlist_set_current_name(playlist, NULL); | |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
295 playlist_filename_set(playlist, NULL); |
2313 | 296 return; |
297 } | |
298 | |
3473
3b26640f9fd6
Don't stop playback when deleting a non-active playlist
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3401
diff
changeset
|
299 if (active) playlist_select_next(); |
2313 | 300 |
301 /* upon removal, a playlist should be cleared and freed */ | |
302 playlists = g_list_remove(playlists, playlist); | |
303 playlist_clear(playlist); | |
304 playlist_free(playlist); | |
305 | |
306 if (playlists_iter == NULL) | |
307 playlists_iter = playlists; | |
308 | |
309 playlist_manager_update(); | |
310 } | |
311 | |
312 GList * | |
313 playlist_get_playlists(void) | |
314 { | |
315 return playlists; | |
316 } | |
317 | |
318 void | |
319 playlist_select_next(void) | |
320 { | |
321 if (playlists_iter == NULL) | |
322 playlists_iter = playlists; | |
323 | |
324 playlists_iter = g_list_next(playlists_iter); | |
325 | |
326 if (playlists_iter == NULL) | |
327 playlists_iter = playlists; | |
328 | |
329 playlistwin_update_list(playlist_get_active()); | |
3621
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
330 playlist_manager_update(); |
2313 | 331 } |
332 | |
333 void | |
334 playlist_select_prev(void) | |
335 { | |
336 if (playlists_iter == NULL) | |
337 playlists_iter = playlists; | |
338 | |
339 playlists_iter = g_list_previous(playlists_iter); | |
340 | |
341 if (playlists_iter == NULL) | |
342 playlists_iter = playlists; | |
343 | |
344 playlistwin_update_list(playlist_get_active()); | |
3621
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
345 playlist_manager_update(); |
2313 | 346 } |
347 | |
348 void | |
349 playlist_select_playlist(Playlist *playlist) | |
350 { | |
351 playlists_iter = g_list_find(playlists, playlist); | |
352 | |
353 if (playlists_iter == NULL) | |
354 playlists_iter = playlists; | |
355 | |
356 playlistwin_update_list(playlist); | |
3621
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
357 playlist_manager_update(); |
2313 | 358 } |
359 | |
360 /* *********************** playlist code ********************** */ | |
361 | |
362 const gchar * | |
363 playlist_get_current_name(Playlist *playlist) | |
364 { | |
365 return playlist->title; | |
366 } | |
367 | |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
368 /* This function now sets the playlist title, not the playlist filename. |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
369 * See playlist_filename_set */ |
2313 | 370 gboolean |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
371 playlist_set_current_name(Playlist *playlist, const gchar * title) |
2313 | 372 { |
3635 | 373 gchar *oldtitle = playlist->title; |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
374 |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
375 if (!title) { |
2313 | 376 playlist->title = NULL; |
3635 | 377 g_free(oldtitle); |
3621
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
378 playlist_manager_update(); |
2313 | 379 return FALSE; |
380 } | |
381 | |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
382 playlist->title = str_to_utf8(title); |
3635 | 383 g_free(oldtitle); |
3621
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
384 playlist_manager_update(); |
2313 | 385 return TRUE; |
386 } | |
387 | |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
388 /* Setting the filename allows the original playlist to be modified later */ |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
389 gboolean |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
390 playlist_filename_set(Playlist *playlist, const gchar * filename) |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
391 { |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
392 gchar *old; |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
393 old = playlist->filename; |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
394 |
3635 | 395 if (!filename) { |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
396 playlist->filename = NULL; |
3635 | 397 g_free(old); |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
398 return FALSE; |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
399 } |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
400 |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
401 playlist->filename = filename_to_utf8(filename); |
3635 | 402 g_free(old); |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
403 return TRUE; |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
404 } |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
405 |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
406 gchar * |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
407 playlist_filename_get(Playlist *playlist) |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
408 { |
3635 | 409 if (!playlist->filename) return NULL; |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
410 return g_filename_from_utf8(playlist->filename, -1, NULL, NULL, NULL); |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
411 } |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
412 |
2313 | 413 static GList * |
414 find_playlist_position_list(Playlist *playlist) | |
415 { | |
416 REQUIRE_LOCK(playlist->mutex); | |
417 | |
418 if (!playlist->position) { | |
419 if (cfg.shuffle) | |
420 return playlist->shuffle; | |
421 else | |
422 return playlist->entries; | |
423 } | |
424 | |
425 if (cfg.shuffle) | |
426 return g_list_find(playlist->shuffle, playlist->position); | |
427 else | |
428 return g_list_find(playlist->entries, playlist->position); | |
429 } | |
430 | |
431 static void | |
432 play_queued(Playlist *playlist) | |
433 { | |
434 GList *tmp = playlist->queue; | |
435 | |
3635 | 436 REQUIRE_LOCK(playlist->mutex); |
2313 | 437 |
438 playlist->position = playlist->queue->data; | |
439 playlist->queue = g_list_remove_link(playlist->queue, playlist->queue); | |
440 g_list_free_1(tmp); | |
441 } | |
442 | |
443 void | |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
444 playlist_clear_only(Playlist *playlist) |
2313 | 445 { |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
446 PLAYLIST_LOCK(playlist); |
2313 | 447 |
448 g_list_foreach(playlist->entries, (GFunc) playlist_entry_free, NULL); | |
449 g_list_free(playlist->entries); | |
450 playlist->position = NULL; | |
451 playlist->entries = NULL; | |
2549
ef59b072a5d2
[svn] - update playlist->tail when an entry has been removed.
yaz
parents:
2548
diff
changeset
|
452 playlist->tail = NULL; |
2637
420ce282920d
[svn] - clear playlist attribute when playlist_clear() is called.
yaz
parents:
2636
diff
changeset
|
453 playlist->attribute = PLAYLIST_PLAIN; |
2313 | 454 |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
455 PLAYLIST_UNLOCK(playlist); |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
456 } |
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
457 |
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
458 void |
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
459 playlist_clear(Playlist *playlist) |
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
460 { |
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
461 if (!playlist) |
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
462 return; |
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
463 |
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
464 playlist_clear_only(playlist); |
2313 | 465 playlist_generate_shuffle_list(playlist); |
466 playlistwin_update_list(playlist); | |
467 playlist_recalc_total_time(playlist); | |
468 playlist_manager_update(); | |
469 } | |
470 | |
471 static void | |
472 playlist_delete_node(Playlist * playlist, GList * node, gboolean * set_info_text, | |
473 gboolean * restart_playing) | |
474 { | |
475 PlaylistEntry *entry; | |
476 GList *playing_song = NULL; | |
477 | |
478 REQUIRE_LOCK(playlist->mutex); | |
479 | |
480 /* We call g_list_find manually here because we don't want an item | |
481 * in the shuffle_list */ | |
482 | |
483 if (playlist->position) | |
484 playing_song = g_list_find(playlist->entries, playlist->position); | |
485 | |
486 entry = PLAYLIST_ENTRY(node->data); | |
487 | |
488 if (playing_song == node) { | |
489 *set_info_text = TRUE; | |
490 | |
491 if (playback_get_playing()) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
492 PLAYLIST_UNLOCK(playlist); |
2313 | 493 ip_data.stop = TRUE; |
494 playback_stop(); | |
495 ip_data.stop = FALSE; | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
496 PLAYLIST_LOCK(playlist); |
2313 | 497 *restart_playing = TRUE; |
498 } | |
499 | |
500 playing_song = find_playlist_position_list(playlist); | |
501 | |
502 if (g_list_next(playing_song)) | |
503 playlist->position = g_list_next(playing_song)->data; | |
504 else if (g_list_previous(playing_song)) | |
505 playlist->position = g_list_previous(playing_song)->data; | |
506 else | |
507 playlist->position = NULL; | |
508 | |
509 /* Make sure the entry did not disappear under us */ | |
510 if (g_list_index(playlist->entries, entry) == -1) | |
511 return; | |
512 | |
513 } | |
514 else if (g_list_position(playlist->entries, playing_song) > | |
515 g_list_position(playlist->entries, node)) { | |
516 *set_info_text = TRUE; | |
517 } | |
518 | |
519 playlist->shuffle = g_list_remove(playlist->shuffle, entry); | |
520 playlist->queue = g_list_remove(playlist->queue, entry); | |
521 playlist->entries = g_list_remove_link(playlist->entries, node); | |
2549
ef59b072a5d2
[svn] - update playlist->tail when an entry has been removed.
yaz
parents:
2548
diff
changeset
|
522 playlist->tail = g_list_last(playlist->entries); |
2313 | 523 playlist_entry_free(entry); |
524 g_list_free_1(node); | |
525 | |
526 playlist_recalc_total_time_nolock(playlist); | |
527 } | |
528 | |
529 void | |
530 playlist_delete_index(Playlist *playlist, guint pos) | |
531 { | |
532 gboolean restart_playing = FALSE, set_info_text = FALSE; | |
533 GList *node; | |
534 | |
535 if (!playlist) | |
536 return; | |
537 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
538 PLAYLIST_LOCK(playlist); |
2313 | 539 |
540 node = g_list_nth(playlist->entries, pos); | |
541 | |
542 if (!node) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
543 PLAYLIST_UNLOCK(playlist); |
2313 | 544 return; |
545 } | |
546 | |
547 playlist_delete_node(playlist, node, &set_info_text, &restart_playing); | |
548 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
549 PLAYLIST_UNLOCK(playlist); |
2313 | 550 |
551 playlist_recalc_total_time(playlist); | |
552 | |
553 playlistwin_update_list(playlist); | |
554 if (restart_playing) { | |
3348
2a081105513c
-Set the track "title" in metadata instead of "name"
Ben Tucker <ben.tucker@gmail.com>
parents:
3346
diff
changeset
|
555 if (playlist->position) |
2313 | 556 playback_initiate(); |
3635 | 557 else |
2313 | 558 mainwin_clear_song_info(); |
559 } | |
560 | |
561 playlist_manager_update(); | |
562 } | |
563 | |
564 void | |
565 playlist_delete_filenames(Playlist * playlist, GList * filenames) | |
566 { | |
567 GList *node, *fnode; | |
568 gboolean set_info_text = FALSE, restart_playing = FALSE; | |
569 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
570 PLAYLIST_LOCK(playlist); |
2313 | 571 |
572 for (fnode = filenames; fnode; fnode = g_list_next(fnode)) { | |
573 node = playlist->entries; | |
574 | |
575 while (node) { | |
576 GList *next = g_list_next(node); | |
577 PlaylistEntry *entry = node->data; | |
578 | |
579 if (!strcmp(entry->filename, fnode->data)) | |
580 playlist_delete_node(playlist, node, &set_info_text, &restart_playing); | |
581 | |
582 node = next; | |
583 } | |
584 } | |
585 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
586 PLAYLIST_UNLOCK(playlist); |
2792
790bb0954b93
[svn] - move playlist_recalc_total_time() out of the giant playlist lock in playlist_delete_filenames(). reported by dotzen, closes #908.
nenolod
parents:
2776
diff
changeset
|
587 |
2313 | 588 playlist_recalc_total_time(playlist); |
589 playlistwin_update_list(playlist); | |
590 | |
591 if (restart_playing) { | |
3348
2a081105513c
-Set the track "title" in metadata instead of "name"
Ben Tucker <ben.tucker@gmail.com>
parents:
3346
diff
changeset
|
592 if (playlist->position) |
2313 | 593 playback_initiate(); |
3635 | 594 else |
2313 | 595 mainwin_clear_song_info(); |
596 } | |
597 | |
598 playlist_manager_update(); | |
599 } | |
600 | |
601 void | |
602 playlist_delete(Playlist * playlist, gboolean crop) | |
603 { | |
604 gboolean restart_playing = FALSE, set_info_text = FALSE; | |
605 GList *node, *next_node; | |
606 PlaylistEntry *entry; | |
607 | |
608 g_return_if_fail(playlist != NULL); | |
609 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
610 PLAYLIST_LOCK(playlist); |
2313 | 611 |
612 node = playlist->entries; | |
613 | |
614 while (node) { | |
615 entry = PLAYLIST_ENTRY(node->data); | |
616 | |
617 next_node = g_list_next(node); | |
618 | |
619 if ((entry->selected && !crop) || (!entry->selected && crop)) { | |
620 playlist_delete_node(playlist, node, &set_info_text, &restart_playing); | |
621 } | |
622 | |
623 node = next_node; | |
624 } | |
625 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
626 PLAYLIST_UNLOCK(playlist); |
2313 | 627 |
628 playlist_recalc_total_time(playlist); | |
629 | |
630 if (restart_playing) { | |
3348
2a081105513c
-Set the track "title" in metadata instead of "name"
Ben Tucker <ben.tucker@gmail.com>
parents:
3346
diff
changeset
|
631 if (playlist->position) |
2313 | 632 playback_initiate(); |
3635 | 633 else |
2313 | 634 mainwin_clear_song_info(); |
635 } | |
636 | |
637 playlistwin_update_list(playlist); | |
638 playlist_manager_update(); | |
639 } | |
640 | |
641 static void | |
642 __playlist_ins_with_info(Playlist * playlist, | |
2545
610d85b8a22b
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.
yaz
parents:
2504
diff
changeset
|
643 const gchar * filename, |
2313 | 644 gint pos, |
645 const gchar * title, | |
646 gint len, | |
2545
610d85b8a22b
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.
yaz
parents:
2504
diff
changeset
|
647 InputPlugin * dec) |
2313 | 648 { |
649 g_return_if_fail(filename != NULL); | |
650 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
651 PLAYLIST_LOCK(playlist); |
2313 | 652 playlist->entries = g_list_insert(playlist->entries, |
653 playlist_entry_new(filename, title, len, dec), | |
654 pos); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
655 PLAYLIST_UNLOCK(playlist); |
2313 | 656 |
657 g_mutex_lock(mutex_scan); | |
658 playlist_get_info_scan_active = TRUE; | |
659 g_mutex_unlock(mutex_scan); | |
660 g_cond_signal(cond_scan); | |
661 } | |
662 | |
663 static void | |
664 __playlist_ins_with_info_tuple(Playlist * playlist, | |
665 const gchar * filename, | |
666 gint pos, | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
667 Tuple *tuple, |
2313 | 668 InputPlugin * dec) |
669 { | |
670 PlaylistEntry *entry; | |
3633
8c4633438785
Implement selective adding of subtunes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3621
diff
changeset
|
671 Tuple *main_tuple = NULL; |
3635 | 672 gint nsubtunes = 0, i = 0; |
3636
65b750891387
Possibly fix a lockup problem.
Matti Hamalainen <ccr@tnsp.org>
parents:
3635
diff
changeset
|
673 gboolean add_flag = TRUE; |
2313 | 674 |
675 g_return_if_fail(playlist != NULL); | |
676 g_return_if_fail(filename != NULL); | |
677 | |
3635 | 678 if (tuple != NULL) { |
679 nsubtunes = tuple->nsubtunes; | |
680 if (nsubtunes > 0) { | |
3633
8c4633438785
Implement selective adding of subtunes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3621
diff
changeset
|
681 main_tuple = tuple; |
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
682 i = 1; |
2548
68d1e9761cc5
[svn] - highly experimental code to speed up loading huge playlist. let me know if it breaks something.
yaz
parents:
2545
diff
changeset
|
683 } |
68d1e9761cc5
[svn] - highly experimental code to speed up loading huge playlist. let me know if it breaks something.
yaz
parents:
2545
diff
changeset
|
684 } |
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
685 |
3636
65b750891387
Possibly fix a lockup problem.
Matti Hamalainen <ccr@tnsp.org>
parents:
3635
diff
changeset
|
686 for (; add_flag && i <= nsubtunes; i++) { |
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
687 gchar *filename_entry; |
3635 | 688 |
689 if (nsubtunes > 0) { | |
3640
d5309028af21
Simplify adding of all sub-tunes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3638
diff
changeset
|
690 filename_entry = g_strdup_printf("%s?%d", filename, |
d5309028af21
Simplify adding of all sub-tunes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3638
diff
changeset
|
691 main_tuple->subtunes ? main_tuple->subtunes[i] : i); |
d5309028af21
Simplify adding of all sub-tunes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3638
diff
changeset
|
692 |
3635 | 693 /* We're dealing with subtune, let's ask again tuple information |
694 * to plugin, by passing the ?subtune suffix; this way we get | |
695 * specific subtune information in the tuple, if available. | |
696 */ | |
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
697 tuple = dec->get_song_tuple(filename_entry); |
3635 | 698 } else |
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
699 filename_entry = g_strdup(filename); |
3583 | 700 |
701 | |
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
702 entry = playlist_entry_new(filename_entry, |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
703 tuple ? tuple_get_string(tuple, FIELD_TITLE, NULL) : NULL, |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
704 tuple ? tuple_get_int(tuple, FIELD_LENGTH, NULL) : -1, dec); |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
705 g_free(filename_entry); |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
706 |
3636
65b750891387
Possibly fix a lockup problem.
Matti Hamalainen <ccr@tnsp.org>
parents:
3635
diff
changeset
|
707 if (!playlist->tail) |
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
708 playlist->tail = g_list_last(playlist->entries); |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
709 |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
710 PLAYLIST_LOCK(playlist); |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
711 |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
712 if ((pos == -1) && (i < 2)) { // the common case |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
713 GList *element; |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
714 element = g_list_alloc(); |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
715 element->data = entry; |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
716 element->prev = playlist->tail; // NULL is allowed here. |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
717 element->next = NULL; |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
718 |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
719 if(!playlist->entries) { // this is the first element |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
720 playlist->entries = element; |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
721 playlist->tail = element; |
3635 | 722 } else { // the rests |
3636
65b750891387
Possibly fix a lockup problem.
Matti Hamalainen <ccr@tnsp.org>
parents:
3635
diff
changeset
|
723 if (playlist->tail != NULL) { |
65b750891387
Possibly fix a lockup problem.
Matti Hamalainen <ccr@tnsp.org>
parents:
3635
diff
changeset
|
724 playlist->tail->next = element; |
65b750891387
Possibly fix a lockup problem.
Matti Hamalainen <ccr@tnsp.org>
parents:
3635
diff
changeset
|
725 playlist->tail = element; |
65b750891387
Possibly fix a lockup problem.
Matti Hamalainen <ccr@tnsp.org>
parents:
3635
diff
changeset
|
726 } else |
65b750891387
Possibly fix a lockup problem.
Matti Hamalainen <ccr@tnsp.org>
parents:
3635
diff
changeset
|
727 add_flag = FALSE; |
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
728 } |
3635 | 729 } else { |
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
730 playlist->entries = g_list_insert(playlist->entries, entry, pos); |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
731 } |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
732 |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
733 PLAYLIST_UNLOCK(playlist); |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
734 |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
735 if (tuple != NULL) { |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
736 const gchar *formatter = tuple_get_string(tuple, FIELD_FORMATTER, NULL); |
3635 | 737 entry->title = tuple_formatter_make_title_string(tuple, |
738 formatter ? formatter : get_gentitle_format()); | |
3550
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
739 entry->length = tuple_get_int(tuple, FIELD_LENGTH, NULL); |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
740 entry->tuple = tuple; |
6b0be1d088e6
- subtune handling is now done in playlist core, using tuple fields subsong-id and subsong-num (requires subtune-able plugins to be updated)
Giacomo Lozito <james@develia.org>
parents:
3512
diff
changeset
|
741 } |
2313 | 742 } |
3633
8c4633438785
Implement selective adding of subtunes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3621
diff
changeset
|
743 |
8c4633438785
Implement selective adding of subtunes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3621
diff
changeset
|
744 if (main_tuple) |
8c4633438785
Implement selective adding of subtunes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3621
diff
changeset
|
745 tuple_free(main_tuple); |
2313 | 746 |
3635 | 747 if (tuple != NULL && tuple_get_int(tuple, FIELD_MTIME, NULL) == -1) { |
748 // kick the scanner thread only if mtime = -1 (uninitialized) | |
2545
610d85b8a22b
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.
yaz
parents:
2504
diff
changeset
|
749 g_mutex_lock(mutex_scan); |
610d85b8a22b
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.
yaz
parents:
2504
diff
changeset
|
750 playlist_get_info_scan_active = TRUE; |
610d85b8a22b
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.
yaz
parents:
2504
diff
changeset
|
751 g_mutex_unlock(mutex_scan); |
610d85b8a22b
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.
yaz
parents:
2504
diff
changeset
|
752 g_cond_signal(cond_scan); |
610d85b8a22b
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.
yaz
parents:
2504
diff
changeset
|
753 } |
2313 | 754 } |
755 | |
756 gboolean | |
757 playlist_ins(Playlist * playlist, const gchar * filename, gint pos) | |
758 { | |
759 gchar buf[64], *p; | |
760 gint r; | |
761 VFSFile *file; | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
762 ProbeResult *pr = NULL; |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
763 InputPlugin *dec = NULL; |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
764 Tuple *tuple = NULL; |
2313 | 765 |
766 g_return_val_if_fail(playlist != NULL, FALSE); | |
767 g_return_val_if_fail(filename != NULL, FALSE); | |
768 | |
769 if (is_playlist_name(filename)) { | |
770 playlist->loading_playlist = TRUE; | |
771 playlist_load_ins(playlist, filename, pos); | |
772 playlist->loading_playlist = FALSE; | |
773 return TRUE; | |
774 } | |
775 | |
776 if (playlist->loading_playlist == TRUE || cfg.playlist_detect == TRUE) | |
777 dec = NULL; | |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
778 else if (!str_has_prefix_nocase(filename, "http://") && |
3635 | 779 !str_has_prefix_nocase(filename, "https://")) { |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
780 pr = input_check_file(filename, TRUE); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
781 |
3635 | 782 if (pr) { |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
783 dec = pr->ip; |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
784 tuple = pr->tuple; |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
785 } |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
786 g_free(pr); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
787 } |
2313 | 788 |
3635 | 789 if (cfg.playlist_detect == TRUE || playlist->loading_playlist == TRUE || |
790 (playlist->loading_playlist == FALSE && dec != NULL) || | |
791 (playlist->loading_playlist == FALSE && !is_playlist_name(filename) && | |
792 str_has_prefix_nocase(filename, "http"))) { | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
793 __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, dec); |
2545
610d85b8a22b
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.
yaz
parents:
2504
diff
changeset
|
794 playlist_generate_shuffle_list(playlist); |
610d85b8a22b
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.
yaz
parents:
2504
diff
changeset
|
795 playlistwin_update_list(playlist); |
3621
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
796 playlist_manager_update(); |
2313 | 797 return TRUE; |
798 } | |
799 | |
800 /* Some files (typically produced by some cgi-scripts) don't have | |
801 * the correct extension. Try to recognize these files by looking | |
802 * at their content. We only check for http entries since it does | |
803 * not make sense to have file entries in a playlist fetched from | |
804 * the net. */ | |
805 | |
806 /* Some strange people put fifo's with the .mp3 extension, so we | |
807 * need to make sure it's a real file (otherwise fread() may block | |
808 * and stall the entire program) */ | |
809 | |
810 /* FIXME: bah, FIFOs actually pass this regular file test */ | |
811 if (!vfs_file_test(filename, G_FILE_TEST_IS_REGULAR)) | |
812 return FALSE; | |
813 | |
3635 | 814 if ((file = vfs_fopen(filename, "rb")) == NULL) |
2313 | 815 return FALSE; |
816 | |
817 r = vfs_fread(buf, 1, sizeof(buf), file); | |
818 vfs_fclose(file); | |
819 | |
820 for (p = buf; r-- > 0 && (*p == '\r' || *p == '\n'); p++); | |
821 | |
822 if (r > 5 && str_has_prefix_nocase(p, "http:")) { | |
823 playlist_load_ins(playlist, filename, pos); | |
824 return TRUE; | |
825 } | |
826 | |
2493
b7f48f00a342
[svn] - patch from Mark Glines to ad https:// URI support to playlists.
nenolod
parents:
2489
diff
changeset
|
827 if (r > 6 && str_has_prefix_nocase(p, "https:")) { |
b7f48f00a342
[svn] - patch from Mark Glines to ad https:// URI support to playlists.
nenolod
parents:
2489
diff
changeset
|
828 playlist_load_ins(playlist, filename, pos); |
b7f48f00a342
[svn] - patch from Mark Glines to ad https:// URI support to playlists.
nenolod
parents:
2489
diff
changeset
|
829 return TRUE; |
b7f48f00a342
[svn] - patch from Mark Glines to ad https:// URI support to playlists.
nenolod
parents:
2489
diff
changeset
|
830 } |
b7f48f00a342
[svn] - patch from Mark Glines to ad https:// URI support to playlists.
nenolod
parents:
2489
diff
changeset
|
831 |
2313 | 832 return FALSE; |
833 } | |
834 | |
835 /* FIXME: The next few functions are specific to Unix | |
836 * filesystems. Either abstract it away, or don't even bother checking | |
837 * at such low level */ | |
838 | |
839 typedef struct { | |
840 dev_t dev; | |
841 ino_t ino; | |
842 } DeviceInode; | |
843 | |
844 static DeviceInode * | |
845 devino_new(dev_t device, | |
846 ino_t inode) | |
847 { | |
848 DeviceInode *devino = g_new0(DeviceInode, 1); | |
849 | |
3635 | 850 if (devino) { |
2313 | 851 devino->dev = device; |
852 devino->ino = inode; | |
853 } | |
854 | |
855 return devino; | |
856 } | |
857 | |
858 static guint | |
859 devino_hash(gconstpointer key) | |
860 { | |
861 const DeviceInode *d = key; | |
862 return d->ino; | |
863 } | |
864 | |
865 static gint | |
866 devino_compare(gconstpointer a, | |
867 gconstpointer b) | |
868 { | |
869 const DeviceInode *da = a, *db = b; | |
870 return (da->dev == db->dev && da->ino == db->ino); | |
871 } | |
872 | |
873 static gboolean | |
874 devino_destroy(gpointer key, | |
875 gpointer value, | |
876 gpointer data) | |
877 { | |
878 g_free(key); | |
879 return TRUE; | |
880 } | |
881 | |
882 static gboolean | |
883 file_is_hidden(const gchar * filename) | |
884 { | |
885 g_return_val_if_fail(filename != NULL, FALSE); | |
2570 | 886 return (g_basename(filename)[0] == '.'); |
2313 | 887 } |
888 | |
889 static GList * | |
890 playlist_dir_find_files(const gchar * path, | |
891 gboolean background, | |
892 GHashTable * htab) | |
893 { | |
894 GDir *dir; | |
895 GList *list = NULL, *ilist; | |
896 const gchar *dir_entry; | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
897 ProbeResult *pr = NULL; |
2313 | 898 |
899 struct stat statbuf; | |
900 DeviceInode *devino; | |
901 | |
3079
72766f2e8713
recursive directory scan for add file dialog works again
Giacomo Lozito <james@develia.org>
parents:
2994
diff
changeset
|
902 if (!path) |
72766f2e8713
recursive directory scan for add file dialog works again
Giacomo Lozito <james@develia.org>
parents:
2994
diff
changeset
|
903 return NULL; |
72766f2e8713
recursive directory scan for add file dialog works again
Giacomo Lozito <james@develia.org>
parents:
2994
diff
changeset
|
904 |
2993
83727fbfec54
Use vfs_file_test() where appropriate.
William Pitcock <nenolod@atheme-project.org>
parents:
2978
diff
changeset
|
905 if (!vfs_file_test(path, G_FILE_TEST_IS_DIR)) |
2313 | 906 return NULL; |
907 | |
908 stat(path, &statbuf); | |
909 devino = devino_new(statbuf.st_dev, statbuf.st_ino); | |
910 | |
911 if (g_hash_table_lookup(htab, devino)) { | |
912 g_free(devino); | |
913 return NULL; | |
914 } | |
915 | |
916 g_hash_table_insert(htab, devino, GINT_TO_POINTER(1)); | |
917 | |
2994
750c530b1bf5
playlist_dir_find_files(): Return list of URIs.
William Pitcock <nenolod@atheme-project.org>
parents:
2993
diff
changeset
|
918 /* XXX: what the hell is this for? --nenolod */ |
2313 | 919 if ((ilist = input_scan_dir(path))) { |
920 GList *node; | |
921 for (node = ilist; node; node = g_list_next(node)) { | |
922 gchar *name = g_build_filename(path, node->data, NULL); | |
923 list = g_list_prepend(list, name); | |
924 g_free(node->data); | |
925 } | |
926 g_list_free(ilist); | |
927 return list; | |
928 } | |
929 | |
3079
72766f2e8713
recursive directory scan for add file dialog works again
Giacomo Lozito <james@develia.org>
parents:
2994
diff
changeset
|
930 /* g_dir_open does not handle URI, so path should come here not-urified. --giacomo */ |
2313 | 931 if (!(dir = g_dir_open(path, 0, NULL))) |
932 return NULL; | |
933 | |
934 while ((dir_entry = g_dir_read_name(dir))) { | |
2994
750c530b1bf5
playlist_dir_find_files(): Return list of URIs.
William Pitcock <nenolod@atheme-project.org>
parents:
2993
diff
changeset
|
935 gchar *filename, *tmp; |
2313 | 936 |
937 if (file_is_hidden(dir_entry)) | |
938 continue; | |
939 | |
2994
750c530b1bf5
playlist_dir_find_files(): Return list of URIs.
William Pitcock <nenolod@atheme-project.org>
parents:
2993
diff
changeset
|
940 tmp = g_build_filename(path, dir_entry, NULL); |
750c530b1bf5
playlist_dir_find_files(): Return list of URIs.
William Pitcock <nenolod@atheme-project.org>
parents:
2993
diff
changeset
|
941 filename = g_filename_to_uri(tmp, NULL, NULL); |
750c530b1bf5
playlist_dir_find_files(): Return list of URIs.
William Pitcock <nenolod@atheme-project.org>
parents:
2993
diff
changeset
|
942 g_free(tmp); |
2313 | 943 |
2993
83727fbfec54
Use vfs_file_test() where appropriate.
William Pitcock <nenolod@atheme-project.org>
parents:
2978
diff
changeset
|
944 if (vfs_file_test(filename, G_FILE_TEST_IS_DIR)) { |
2313 | 945 GList *sub; |
3079
72766f2e8713
recursive directory scan for add file dialog works again
Giacomo Lozito <james@develia.org>
parents:
2994
diff
changeset
|
946 gchar *dirfilename = g_filename_from_uri(filename, NULL, NULL); |
72766f2e8713
recursive directory scan for add file dialog works again
Giacomo Lozito <james@develia.org>
parents:
2994
diff
changeset
|
947 sub = playlist_dir_find_files(dirfilename, background, htab); |
72766f2e8713
recursive directory scan for add file dialog works again
Giacomo Lozito <james@develia.org>
parents:
2994
diff
changeset
|
948 g_free(dirfilename); |
2313 | 949 g_free(filename); |
950 list = g_list_concat(list, sub); | |
951 } | |
952 else if (cfg.playlist_detect == TRUE) | |
953 list = g_list_prepend(list, filename); | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
954 else if ((pr = input_check_file(filename, TRUE)) != NULL) |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
955 { |
2313 | 956 list = g_list_prepend(list, filename); |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
957 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
958 g_free(pr); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
959 pr = NULL; |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
960 } |
2313 | 961 else |
962 g_free(filename); | |
963 | |
964 while (background && gtk_events_pending()) | |
965 gtk_main_iteration(); | |
966 } | |
967 g_dir_close(dir); | |
968 | |
969 return list; | |
970 } | |
971 | |
972 gboolean | |
973 playlist_add(Playlist * playlist, const gchar * filename) | |
974 { | |
975 return playlist_ins(playlist, filename, -1); | |
976 } | |
977 | |
978 guint | |
979 playlist_add_dir(Playlist * playlist, const gchar * directory) | |
980 { | |
981 return playlist_ins_dir(playlist, directory, -1, TRUE); | |
982 } | |
983 | |
984 guint | |
985 playlist_add_url(Playlist * playlist, const gchar * url) | |
986 { | |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
987 guint entries; |
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
988 entries = playlist_ins_url(playlist, url, -1); |
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
989 // printf("playlist_add_url: entries = %d\n", entries); |
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
990 return entries; |
2313 | 991 } |
992 | |
993 guint | |
994 playlist_ins_dir(Playlist * playlist, const gchar * path, | |
995 gint pos, | |
996 gboolean background) | |
997 { | |
998 guint entries = 0; | |
999 GList *list, *node; | |
1000 GHashTable *htab; | |
2978
f4971c7d6384
Remove inlined urldecoding functions and use g_filename_from_uri() instead where appropriate.
William Pitcock <nenolod@atheme-project.org>
parents:
2976
diff
changeset
|
1001 gchar *path2 = g_filename_from_uri(path, NULL, NULL); |
2313 | 1002 |
2580
48288757d7c7
[svn] - fix a regression introduced by the DnD fix.
nenolod
parents:
2579
diff
changeset
|
1003 if (path2 == NULL) |
48288757d7c7
[svn] - fix a regression introduced by the DnD fix.
nenolod
parents:
2579
diff
changeset
|
1004 path2 = g_strdup(path); |
48288757d7c7
[svn] - fix a regression introduced by the DnD fix.
nenolod
parents:
2579
diff
changeset
|
1005 |
2313 | 1006 htab = g_hash_table_new(devino_hash, devino_compare); |
1007 | |
2579 | 1008 list = playlist_dir_find_files(path2, background, htab); |
2313 | 1009 list = g_list_sort(list, (GCompareFunc) path_compare); |
1010 | |
1011 g_hash_table_foreach_remove(htab, devino_destroy, NULL); | |
1012 | |
1013 for (node = list; node; node = g_list_next(node)) { | |
3129
f416657ee9b7
Call playlist_ins() instead of __playlist_ins().
William Pitcock <nenolod@atheme-project.org>
parents:
3128
diff
changeset
|
1014 playlist_ins(playlist, node->data, pos); |
2313 | 1015 g_free(node->data); |
1016 entries++; | |
1017 if (pos >= 0) | |
1018 pos++; | |
1019 } | |
1020 | |
1021 g_list_free(list); | |
2579 | 1022 g_free(path2); |
2313 | 1023 |
1024 playlist_recalc_total_time(playlist); | |
1025 playlist_generate_shuffle_list(playlist); | |
1026 playlistwin_update_list(playlist); | |
1027 playlist_manager_update(); | |
1028 return entries; | |
1029 } | |
1030 | |
1031 guint | |
1032 playlist_ins_url(Playlist * playlist, const gchar * string, | |
1033 gint pos) | |
1034 { | |
1035 gchar *tmp; | |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1036 gint entries = 0; |
2313 | 1037 gchar *decoded = NULL; |
1038 | |
1039 g_return_val_if_fail(playlist != NULL, 0); | |
1040 g_return_val_if_fail(string != NULL, 0); | |
1041 | |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1042 // playlistwin_update_list(playlist); // is this necessary? --yaz |
2313 | 1043 |
1044 while (*string) { | |
1045 GList *node; | |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1046 guint i = 0; |
2313 | 1047 tmp = strchr(string, '\n'); |
1048 if (tmp) { | |
1049 if (*(tmp - 1) == '\r') | |
1050 *(tmp - 1) = '\0'; | |
1051 *tmp = '\0'; | |
1052 } | |
1053 | |
1054 decoded = g_strdup(string); | |
1055 | |
2575 | 1056 if (vfs_file_test(decoded, G_FILE_TEST_IS_DIR)) { |
2313 | 1057 i = playlist_ins_dir(playlist, decoded, pos, FALSE); |
1058 } | |
1059 else { | |
1060 if (is_playlist_name(decoded)) { | |
1061 i = playlist_load_ins(playlist, decoded, pos); | |
1062 } | |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1063 else if (playlist_ins(playlist, decoded, pos)) { |
2313 | 1064 i = 1; |
1065 } | |
1066 } | |
1067 | |
1068 g_free(decoded); | |
1069 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1070 PLAYLIST_LOCK(playlist); |
2313 | 1071 node = g_list_nth(playlist->entries, pos); |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1072 PLAYLIST_UNLOCK(playlist); |
2313 | 1073 |
1074 entries += i; | |
1075 | |
1076 if (pos >= 0) | |
1077 pos += i; | |
1078 if (!tmp) | |
1079 break; | |
1080 | |
1081 string = tmp + 1; | |
1082 } | |
1083 | |
1084 playlist_recalc_total_time(playlist); | |
1085 playlist_generate_shuffle_list(playlist); | |
1086 playlistwin_update_list(playlist); | |
1087 | |
1088 playlist_manager_update(); | |
1089 | |
1090 return entries; | |
1091 } | |
1092 | |
1093 void | |
1094 playlist_set_info_old_abi(const gchar * title, gint length, gint rate, | |
1095 gint freq, gint nch) | |
1096 { | |
1097 Playlist *playlist = playlist_get_active(); | |
3159
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
1098 PlaylistEventInfoChange *msg; |
3165
8775dfc57ead
Remove mainwin_set_info_text() craq. Still some work to do.
William Pitcock <nenolod@atheme-project.org>
parents:
3159
diff
changeset
|
1099 gchar *text; |
2313 | 1100 |
3197
5dd8bc77a590
now "hide seekbar on streaming" uses message passing.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3165
diff
changeset
|
1101 if(length == -1) { |
5dd8bc77a590
now "hide seekbar on streaming" uses message passing.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3165
diff
changeset
|
1102 event_queue("hide seekbar", (gpointer)0xdeadbeef); // event_queue hates NULL --yaz |
5dd8bc77a590
now "hide seekbar on streaming" uses message passing.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3165
diff
changeset
|
1103 } |
5dd8bc77a590
now "hide seekbar on streaming" uses message passing.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3165
diff
changeset
|
1104 |
2313 | 1105 g_return_if_fail(playlist != NULL); |
1106 | |
1107 if (playlist->position) { | |
1108 g_free(playlist->position->title); | |
1109 playlist->position->title = g_strdup(title); | |
1110 playlist->position->length = length; | |
2488
c5075a79f1aa
[svn] make input->set_info overwrite tuple->track_name. it allows input
yaz
parents:
2480
diff
changeset
|
1111 |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1112 // overwrite tuple::title, mainly for streaming. it may incur side effects. --yaz |
3635 | 1113 if (playlist->position->tuple && tuple_get_int(playlist->position->tuple, FIELD_LENGTH, NULL) == -1){ |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
1114 tuple_disassociate(playlist->position->tuple, FIELD_TITLE, NULL); |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
1115 tuple_associate_string(playlist->position->tuple, FIELD_TITLE, NULL, title); |
2488
c5075a79f1aa
[svn] make input->set_info overwrite tuple->track_name. it allows input
yaz
parents:
2480
diff
changeset
|
1116 } |
2313 | 1117 } |
1118 | |
1119 playlist_recalc_total_time(playlist); | |
1120 | |
3159
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
1121 /* broadcast a PlaylistEventInfoChange message. */ |
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
1122 msg = g_new0(PlaylistEventInfoChange, 1); |
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
1123 msg->bitrate = rate; |
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
1124 msg->samplerate = freq; |
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
1125 msg->channels = nch; |
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
1126 |
a2d552ea48f0
Use message passing to make sure the UI is updated in the main thread.
William Pitcock <nenolod@atheme-project.org>
parents:
3132
diff
changeset
|
1127 event_queue("playlist info change", msg); |
2460 | 1128 |
3165
8775dfc57ead
Remove mainwin_set_info_text() craq. Still some work to do.
William Pitcock <nenolod@atheme-project.org>
parents:
3159
diff
changeset
|
1129 text = playlist_get_info_text(playlist); |
8775dfc57ead
Remove mainwin_set_info_text() craq. Still some work to do.
William Pitcock <nenolod@atheme-project.org>
parents:
3159
diff
changeset
|
1130 event_queue("title change", text); |
8775dfc57ead
Remove mainwin_set_info_text() craq. Still some work to do.
William Pitcock <nenolod@atheme-project.org>
parents:
3159
diff
changeset
|
1131 |
2460 | 1132 if ( playlist->position ) |
1133 hook_call( "playlist set info" , playlist->position ); | |
2313 | 1134 } |
1135 | |
1136 void | |
1137 playlist_set_info(Playlist * playlist, const gchar * title, gint length, gint rate, | |
1138 gint freq, gint nch) | |
1139 { | |
1140 g_return_if_fail(playlist != NULL); | |
1141 | |
1142 if (playlist->position) { | |
1143 g_free(playlist->position->title); | |
1144 playlist->position->title = g_strdup(title); | |
1145 playlist->position->length = length; | |
1146 } | |
1147 | |
1148 playlist_recalc_total_time(playlist); | |
1149 | |
1150 mainwin_set_song_info(rate, freq, nch); | |
2460 | 1151 |
3635 | 1152 if (playlist->position) |
2460 | 1153 hook_call( "playlist set info" , playlist->position ); |
2313 | 1154 } |
1155 | |
1156 void | |
1157 playlist_check_pos_current(Playlist *playlist) | |
1158 { | |
1159 gint pos, row, bottom; | |
1160 | |
1161 if (!playlist) | |
1162 return; | |
1163 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1164 PLAYLIST_LOCK(playlist); |
2313 | 1165 if (!playlist->position || !playlistwin_list) { |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1166 PLAYLIST_UNLOCK(playlist); |
2313 | 1167 return; |
1168 } | |
1169 | |
1170 pos = g_list_index(playlist->entries, playlist->position); | |
1171 | |
1172 if (playlistwin_item_visible(pos)) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1173 PLAYLIST_UNLOCK(playlist); |
2313 | 1174 return; |
1175 } | |
1176 | |
2671
e9b379528fbc
[svn] - playlist_get_length_nolock() -> playlist_get_length(), no need for
nenolod
parents:
2670
diff
changeset
|
1177 bottom = MAX(0, playlist_get_length(playlist) - |
3217 | 1178 UI_SKINNED_PLAYLIST(playlistwin_list)->num_visible); |
1179 row = CLAMP(pos - UI_SKINNED_PLAYLIST(playlistwin_list)->num_visible / 2, 0, bottom); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1180 PLAYLIST_UNLOCK(playlist); |
2313 | 1181 playlistwin_set_toprow(row); |
1182 g_cond_signal(cond_scan); | |
1183 } | |
1184 | |
1185 void | |
1186 playlist_next(Playlist *playlist) | |
1187 { | |
1188 GList *plist_pos_list; | |
1189 gboolean restart_playing = FALSE; | |
3635 | 1190 |
2480
bb2f191895ce
[svn] - fixed crash when skipping to next song with an empty playlist
marvin
parents:
2460
diff
changeset
|
1191 if (!playlist_get_length(playlist)) |
2313 | 1192 return; |
1193 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1194 PLAYLIST_LOCK(playlist); |
2313 | 1195 |
3635 | 1196 if ((playlist_position_before_jump != NULL) && playlist->queue == NULL) { |
2313 | 1197 playlist->position = playlist_position_before_jump; |
1198 playlist_position_before_jump = NULL; | |
1199 } | |
1200 | |
1201 plist_pos_list = find_playlist_position_list(playlist); | |
1202 | |
1203 if (!cfg.repeat && !g_list_next(plist_pos_list) && playlist->queue == NULL) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1204 PLAYLIST_UNLOCK(playlist); |
2313 | 1205 return; |
1206 } | |
1207 | |
1208 if (playback_get_playing()) { | |
1209 /* We need to stop before changing playlist_position */ | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1210 PLAYLIST_UNLOCK(playlist); |
2313 | 1211 ip_data.stop = TRUE; |
1212 playback_stop(); | |
1213 ip_data.stop = FALSE; | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1214 PLAYLIST_LOCK(playlist); |
2313 | 1215 restart_playing = TRUE; |
1216 } | |
1217 | |
1218 plist_pos_list = find_playlist_position_list(playlist); | |
1219 if (playlist->queue != NULL) | |
1220 play_queued(playlist); | |
1221 else if (g_list_next(plist_pos_list)) | |
1222 playlist->position = g_list_next(plist_pos_list)->data; | |
1223 else if (cfg.repeat) { | |
1224 playlist->position = NULL; | |
1225 playlist_generate_shuffle_list_nolock(playlist); | |
1226 if (cfg.shuffle) | |
1227 playlist->position = playlist->shuffle->data; | |
1228 else | |
1229 playlist->position = playlist->entries->data; | |
1230 } | |
3635 | 1231 |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1232 PLAYLIST_UNLOCK(playlist); |
3635 | 1233 |
2313 | 1234 playlist_check_pos_current(playlist); |
1235 | |
3348
2a081105513c
-Set the track "title" in metadata instead of "name"
Ben Tucker <ben.tucker@gmail.com>
parents:
3346
diff
changeset
|
1236 if (restart_playing) |
2313 | 1237 playback_initiate(); |
3246
2127f7108033
- fixed some cases where the playlist wasn't redrawn
mf0102 <0102@gmx.at>
parents:
3217
diff
changeset
|
1238 |
2127f7108033
- fixed some cases where the playlist wasn't redrawn
mf0102 <0102@gmx.at>
parents:
3217
diff
changeset
|
1239 playlistwin_update_list(playlist); |
3621
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
1240 playlist_manager_update(); |
2313 | 1241 } |
1242 | |
1243 void | |
1244 playlist_prev(Playlist *playlist) | |
1245 { | |
1246 GList *plist_pos_list; | |
1247 gboolean restart_playing = FALSE; | |
1248 | |
2480
bb2f191895ce
[svn] - fixed crash when skipping to next song with an empty playlist
marvin
parents:
2460
diff
changeset
|
1249 if (!playlist_get_length(playlist)) |
2313 | 1250 return; |
1251 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1252 PLAYLIST_LOCK(playlist); |
2313 | 1253 |
3635 | 1254 if ((playlist_position_before_jump != NULL) && playlist->queue == NULL) { |
2313 | 1255 playlist->position = playlist_position_before_jump; |
1256 playlist_position_before_jump = NULL; | |
1257 } | |
1258 | |
1259 plist_pos_list = find_playlist_position_list(playlist); | |
1260 | |
1261 if (!cfg.repeat && !g_list_previous(plist_pos_list)) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1262 PLAYLIST_UNLOCK(playlist); |
2313 | 1263 return; |
1264 } | |
1265 | |
1266 if (playback_get_playing()) { | |
1267 /* We need to stop before changing playlist_position */ | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1268 PLAYLIST_UNLOCK(playlist); |
2313 | 1269 ip_data.stop = TRUE; |
1270 playback_stop(); | |
1271 ip_data.stop = FALSE; | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1272 PLAYLIST_LOCK(playlist); |
2313 | 1273 restart_playing = TRUE; |
1274 } | |
1275 | |
1276 plist_pos_list = find_playlist_position_list(playlist); | |
1277 if (g_list_previous(plist_pos_list)) { | |
1278 playlist->position = g_list_previous(plist_pos_list)->data; | |
1279 } | |
1280 else if (cfg.repeat) { | |
1281 GList *node; | |
1282 playlist->position = NULL; | |
1283 playlist_generate_shuffle_list_nolock(playlist); | |
1284 if (cfg.shuffle) | |
1285 node = g_list_last(playlist->shuffle); | |
1286 else | |
1287 node = g_list_last(playlist->entries); | |
1288 if (node) | |
1289 playlist->position = node->data; | |
1290 } | |
1291 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1292 PLAYLIST_UNLOCK(playlist); |
2313 | 1293 |
1294 playlist_check_pos_current(playlist); | |
1295 | |
3348
2a081105513c
-Set the track "title" in metadata instead of "name"
Ben Tucker <ben.tucker@gmail.com>
parents:
3346
diff
changeset
|
1296 if (restart_playing) |
2313 | 1297 playback_initiate(); |
3348
2a081105513c
-Set the track "title" in metadata instead of "name"
Ben Tucker <ben.tucker@gmail.com>
parents:
3346
diff
changeset
|
1298 else |
2313 | 1299 playlistwin_update_list(playlist); |
3621
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
1300 |
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
1301 playlist_manager_update(); |
2313 | 1302 } |
1303 | |
1304 void | |
1305 playlist_queue(Playlist *playlist) | |
1306 { | |
1307 GList *list = playlist_get_selected(playlist); | |
1308 GList *it = list; | |
1309 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1310 PLAYLIST_LOCK(playlist); |
2313 | 1311 |
3635 | 1312 if ((cfg.shuffle) && (playlist_position_before_jump == NULL)) { |
2313 | 1313 /* Shuffling and this is our first manual jump. */ |
1314 playlist_position_before_jump = playlist->position; | |
1315 } | |
1316 | |
1317 while (it) { | |
1318 GList *next = g_list_next(it); | |
1319 GList *tmp; | |
1320 | |
1321 /* XXX: WTF? --nenolod */ | |
1322 it->data = g_list_nth_data(playlist->entries, GPOINTER_TO_INT(it->data)); | |
1323 if ((tmp = g_list_find(playlist->queue, it->data))) { | |
1324 playlist->queue = g_list_remove_link(playlist->queue, tmp); | |
1325 g_list_free_1(tmp); | |
1326 list = g_list_remove_link(list, it); | |
1327 g_list_free_1(it); | |
1328 } | |
1329 | |
1330 it = next; | |
1331 } | |
1332 | |
1333 playlist->queue = g_list_concat(playlist->queue, list); | |
1334 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1335 PLAYLIST_UNLOCK(playlist); |
2313 | 1336 |
1337 playlist_recalc_total_time(playlist); | |
1338 playlistwin_update_list(playlist); | |
1339 } | |
1340 | |
1341 void | |
1342 playlist_queue_position(Playlist *playlist, guint pos) | |
1343 { | |
1344 GList *tmp; | |
1345 PlaylistEntry *entry; | |
1346 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1347 PLAYLIST_LOCK(playlist); |
2313 | 1348 |
1349 if ((cfg.shuffle) && (playlist_position_before_jump == NULL)) | |
1350 { | |
1351 /* Shuffling and this is our first manual jump. */ | |
1352 playlist_position_before_jump = playlist->position; | |
1353 } | |
1354 | |
1355 entry = g_list_nth_data(playlist->entries, pos); | |
1356 if ((tmp = g_list_find(playlist->queue, entry))) { | |
1357 playlist->queue = g_list_remove_link(playlist->queue, tmp); | |
1358 g_list_free_1(tmp); | |
1359 } | |
1360 else | |
1361 playlist->queue = g_list_append(playlist->queue, entry); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1362 PLAYLIST_UNLOCK(playlist); |
2313 | 1363 |
1364 playlist_recalc_total_time(playlist); | |
1365 playlistwin_update_list(playlist); | |
1366 } | |
1367 | |
1368 gboolean | |
1369 playlist_is_position_queued(Playlist *playlist, guint pos) | |
1370 { | |
1371 PlaylistEntry *entry; | |
1372 GList *tmp; | |
1373 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1374 PLAYLIST_LOCK(playlist); |
2313 | 1375 entry = g_list_nth_data(playlist->entries, pos); |
1376 tmp = g_list_find(playlist->queue, entry); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1377 PLAYLIST_UNLOCK(playlist); |
2313 | 1378 |
1379 return tmp != NULL; | |
1380 } | |
1381 | |
1382 gint | |
1383 playlist_get_queue_position_number(Playlist *playlist, guint pos) | |
1384 { | |
1385 PlaylistEntry *entry; | |
1386 gint tmp; | |
1387 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1388 PLAYLIST_LOCK(playlist); |
2313 | 1389 entry = g_list_nth_data(playlist->entries, pos); |
1390 tmp = g_list_index(playlist->queue, entry); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1391 PLAYLIST_UNLOCK(playlist); |
2313 | 1392 |
1393 return tmp; | |
1394 } | |
1395 | |
1396 gint | |
1397 playlist_get_queue_qposition_number(Playlist *playlist, guint pos) | |
1398 { | |
1399 PlaylistEntry *entry; | |
1400 gint tmp; | |
1401 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1402 PLAYLIST_LOCK(playlist); |
2313 | 1403 entry = g_list_nth_data(playlist->queue, pos); |
1404 tmp = g_list_index(playlist->entries, entry); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1405 PLAYLIST_UNLOCK(playlist); |
2313 | 1406 |
1407 return tmp; | |
1408 } | |
1409 | |
1410 void | |
1411 playlist_clear_queue(Playlist *playlist) | |
1412 { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1413 PLAYLIST_LOCK(playlist); |
2313 | 1414 g_list_free(playlist->queue); |
1415 playlist->queue = NULL; | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1416 PLAYLIST_UNLOCK(playlist); |
2313 | 1417 |
1418 playlist_recalc_total_time(playlist); | |
1419 playlistwin_update_list(playlist); | |
1420 } | |
1421 | |
1422 void | |
1423 playlist_queue_remove(Playlist *playlist, guint pos) | |
1424 { | |
1425 void *entry; | |
1426 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1427 PLAYLIST_LOCK(playlist); |
2313 | 1428 entry = g_list_nth_data(playlist->entries, pos); |
1429 playlist->queue = g_list_remove(playlist->queue, entry); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1430 PLAYLIST_UNLOCK(playlist); |
2313 | 1431 |
1432 playlistwin_update_list(playlist); | |
1433 } | |
1434 | |
1435 gint | |
1436 playlist_get_queue_position(Playlist *playlist, PlaylistEntry * entry) | |
1437 { | |
1438 return g_list_index(playlist->queue, entry); | |
1439 } | |
1440 | |
1441 void | |
1442 playlist_set_position(Playlist *playlist, guint pos) | |
1443 { | |
1444 GList *node; | |
1445 gboolean restart_playing = FALSE; | |
1446 | |
1447 if (!playlist) | |
1448 return; | |
1449 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1450 PLAYLIST_LOCK(playlist); |
2313 | 1451 |
1452 node = g_list_nth(playlist->entries, pos); | |
1453 if (!node) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1454 PLAYLIST_UNLOCK(playlist); |
2313 | 1455 return; |
1456 } | |
1457 | |
1458 if (playback_get_playing()) { | |
1459 /* We need to stop before changing playlist_position */ | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1460 PLAYLIST_UNLOCK(playlist); |
2313 | 1461 ip_data.stop = TRUE; |
1462 playback_stop(); | |
1463 ip_data.stop = FALSE; | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1464 PLAYLIST_LOCK(playlist); |
2313 | 1465 restart_playing = TRUE; |
1466 } | |
1467 | |
1468 if ((cfg.shuffle) && (playlist_position_before_jump == NULL)) | |
1469 { | |
1470 /* Shuffling and this is our first manual jump. */ | |
1471 playlist_position_before_jump = playlist->position; | |
1472 } | |
3246
2127f7108033
- fixed some cases where the playlist wasn't redrawn
mf0102 <0102@gmx.at>
parents:
3217
diff
changeset
|
1473 |
2313 | 1474 playlist->position = node->data; |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1475 PLAYLIST_UNLOCK(playlist); |
2313 | 1476 playlist_check_pos_current(playlist); |
1477 | |
3348
2a081105513c
-Set the track "title" in metadata instead of "name"
Ben Tucker <ben.tucker@gmail.com>
parents:
3346
diff
changeset
|
1478 if (restart_playing) |
2313 | 1479 playback_initiate(); |
3348
2a081105513c
-Set the track "title" in metadata instead of "name"
Ben Tucker <ben.tucker@gmail.com>
parents:
3346
diff
changeset
|
1480 else |
2313 | 1481 playlistwin_update_list(playlist); |
1482 } | |
1483 | |
1484 void | |
1485 playlist_eof_reached(Playlist *playlist) | |
1486 { | |
1487 GList *plist_pos_list; | |
1488 | |
1489 if ((cfg.no_playlist_advance && !cfg.repeat) || cfg.stopaftersong) | |
1490 ip_data.stop = TRUE; | |
1491 playback_stop(); | |
1492 if ((cfg.no_playlist_advance && !cfg.repeat) || cfg.stopaftersong) | |
1493 ip_data.stop = FALSE; | |
1494 | |
2408
b380e84148bb
[svn] - rename some hooks so that they are more logical
nenolod
parents:
2407
diff
changeset
|
1495 hook_call("playback end", playlist->position); |
2407
1dc1d36d0347
[svn] - add hooks: playback begin, playback end, playlist reached end
nenolod
parents:
2380
diff
changeset
|
1496 |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1497 PLAYLIST_LOCK(playlist); |
2313 | 1498 |
1499 if ((playlist_position_before_jump != NULL) && playlist->queue == NULL) | |
1500 { | |
1501 playlist->position = playlist_position_before_jump; | |
1502 playlist_position_before_jump = NULL; | |
1503 } | |
3246
2127f7108033
- fixed some cases where the playlist wasn't redrawn
mf0102 <0102@gmx.at>
parents:
3217
diff
changeset
|
1504 |
2313 | 1505 plist_pos_list = find_playlist_position_list(playlist); |
1506 | |
1507 if (cfg.no_playlist_advance) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1508 PLAYLIST_UNLOCK(playlist); |
2313 | 1509 mainwin_clear_song_info(); |
1510 if (cfg.repeat) | |
1511 playback_initiate(); | |
1512 return; | |
1513 } | |
1514 | |
1515 if (cfg.stopaftersong) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1516 PLAYLIST_UNLOCK(playlist); |
2313 | 1517 mainwin_clear_song_info(); |
1518 mainwin_set_stopaftersong(FALSE); | |
1519 return; | |
1520 } | |
1521 | |
1522 if (playlist->queue != NULL) { | |
1523 play_queued(playlist); | |
1524 } | |
1525 else if (!g_list_next(plist_pos_list)) { | |
1526 if (cfg.shuffle) { | |
1527 playlist->position = NULL; | |
1528 playlist_generate_shuffle_list_nolock(playlist); | |
1529 } | |
2380 | 1530 else if (playlist->entries != NULL) |
2313 | 1531 playlist->position = playlist->entries->data; |
1532 | |
1533 if (!cfg.repeat) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1534 PLAYLIST_UNLOCK(playlist); |
2408
b380e84148bb
[svn] - rename some hooks so that they are more logical
nenolod
parents:
2407
diff
changeset
|
1535 hook_call("playlist end reached", playlist->position); |
2313 | 1536 mainwin_clear_song_info(); |
1537 return; | |
1538 } | |
1539 } | |
1540 else | |
1541 playlist->position = g_list_next(plist_pos_list)->data; | |
1542 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1543 PLAYLIST_UNLOCK(playlist); |
2313 | 1544 |
1545 playlist_check_pos_current(playlist); | |
1546 playback_initiate(); | |
1547 playlistwin_update_list(playlist); | |
1548 } | |
1549 | |
1550 gint | |
1551 playlist_queue_get_length(Playlist *playlist) | |
1552 { | |
1553 gint length; | |
1554 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1555 PLAYLIST_LOCK(playlist); |
2313 | 1556 length = g_list_length(playlist->queue); |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1557 PLAYLIST_UNLOCK(playlist); |
2313 | 1558 |
1559 return length; | |
1560 } | |
1561 | |
1562 gint | |
2671
e9b379528fbc
[svn] - playlist_get_length_nolock() -> playlist_get_length(), no need for
nenolod
parents:
2670
diff
changeset
|
1563 playlist_get_length(Playlist *playlist) |
2313 | 1564 { |
1565 return g_list_length(playlist->entries); | |
1566 } | |
1567 | |
1568 gchar * | |
1569 playlist_get_info_text(Playlist *playlist) | |
1570 { | |
1571 gchar *text, *title, *numbers, *length; | |
1572 | |
1573 g_return_val_if_fail(playlist != NULL, NULL); | |
1574 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1575 PLAYLIST_LOCK(playlist); |
2313 | 1576 if (!playlist->position) { |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1577 PLAYLIST_UNLOCK(playlist); |
2313 | 1578 return NULL; |
1579 } | |
1580 | |
1581 /* FIXME: there should not be a need to do additional conversion, | |
1582 * if playlist is properly maintained */ | |
1583 if (playlist->position->title) { | |
1584 title = str_to_utf8(playlist->position->title); | |
1585 } | |
1586 else { | |
3635 | 1587 gchar *realfn = g_filename_from_uri(playlist->position->filename, NULL, NULL); |
1588 gchar *basename = g_path_get_basename(realfn ? realfn : playlist->position->filename); | |
2313 | 1589 title = filename_to_utf8(basename); |
3635 | 1590 g_free(realfn); |
1591 g_free(basename); | |
2313 | 1592 } |
1593 | |
1594 /* | |
1595 * If the user don't want numbers in the playlist, don't | |
1596 * display them in other parts of XMMS | |
1597 */ | |
1598 | |
1599 if (cfg.show_numbers_in_pl) | |
1600 numbers = g_strdup_printf("%d. ", playlist_get_position_nolock(playlist) + 1); | |
1601 else | |
1602 numbers = g_strdup(""); | |
1603 | |
1604 if (playlist->position->length != -1) | |
1605 length = g_strdup_printf(" (%d:%-2.2d)", | |
1606 playlist->position->length / 60000, | |
1607 (playlist->position->length / 1000) % 60); | |
1608 else | |
1609 length = g_strdup(""); | |
1610 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1611 PLAYLIST_UNLOCK(playlist); |
2313 | 1612 |
1613 text = convert_title_text(g_strconcat(numbers, title, length, NULL)); | |
1614 | |
1615 g_free(numbers); | |
1616 g_free(title); | |
1617 g_free(length); | |
1618 | |
1619 return text; | |
1620 } | |
1621 | |
1622 gint | |
1623 playlist_get_current_length(Playlist * playlist) | |
1624 { | |
1625 gint len = 0; | |
1626 | |
1627 if (!playlist) | |
1628 return 0; | |
1629 | |
1630 if (playlist->position) | |
1631 len = playlist->position->length; | |
1632 | |
1633 return len; | |
1634 } | |
1635 | |
1636 gboolean | |
1637 playlist_save(Playlist * playlist, const gchar * filename) | |
1638 { | |
1639 PlaylistContainer *plc = NULL; | |
3476
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1640 GList *old_iter; |
2313 | 1641 gchar *ext; |
1642 | |
1643 g_return_val_if_fail(playlist != NULL, FALSE); | |
1644 g_return_val_if_fail(filename != NULL, FALSE); | |
1645 | |
1646 ext = strrchr(filename, '.') + 1; | |
1647 | |
1648 if ((plc = playlist_container_find(ext)) == NULL) | |
1649 return FALSE; | |
1650 | |
1651 if (plc->plc_write == NULL) | |
1652 return FALSE; | |
1653 | |
3476
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1654 /* Save the right playlist to disk */ |
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1655 if (playlist != playlist_get_active()) { |
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1656 old_iter = playlists_iter; |
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1657 playlists_iter = g_list_find(playlists, playlist); |
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1658 if(!playlists_iter) playlists_iter = old_iter; |
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1659 plc->plc_write(filename, 0); |
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1660 playlists_iter = old_iter; |
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1661 } else { |
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1662 plc->plc_write(filename, 0); |
9152829f3c19
Allow non-active playlist to be saved to file
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3474
diff
changeset
|
1663 } |
2313 | 1664 |
1665 return TRUE; | |
1666 } | |
1667 | |
1668 gboolean | |
1669 playlist_load(Playlist * playlist, const gchar * filename) | |
1670 { | |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1671 guint ret = 0; |
2313 | 1672 g_return_val_if_fail(playlist != NULL, FALSE); |
1673 | |
1674 playlist->loading_playlist = TRUE; | |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
1675 if(!playlist_get_length(playlist)) { |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
1676 /* Loading new playlist */ |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
1677 playlist_filename_set(playlist, filename); |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
1678 } |
2313 | 1679 ret = playlist_load_ins(playlist, filename, -1); |
1680 playlist->loading_playlist = FALSE; | |
1681 | |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1682 return ret ? TRUE : FALSE; |
2313 | 1683 } |
1684 | |
1685 void | |
1686 playlist_load_ins_file(Playlist *playlist, | |
1687 const gchar * filename_p, | |
1688 const gchar * playlist_name, gint pos, | |
1689 const gchar * title, gint len) | |
1690 { | |
1691 gchar *filename; | |
1692 gchar *tmp, *path; | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1693 ProbeResult *pr = NULL; |
2313 | 1694 |
1695 g_return_if_fail(filename_p != NULL); | |
1696 g_return_if_fail(playlist != NULL); | |
1697 g_return_if_fail(playlist_name != NULL); | |
1698 | |
1699 filename = g_strchug(g_strdup(filename_p)); | |
1700 | |
3635 | 1701 if (cfg.convert_slash) |
3087
030b956c73b2
Fix a bug in backslash to slash conversion. Closes #1006.
William Pitcock <nenolod@atheme-project.org>
parents:
3081
diff
changeset
|
1702 while ((tmp = strchr(filename, '\\')) != NULL) |
030b956c73b2
Fix a bug in backslash to slash conversion. Closes #1006.
William Pitcock <nenolod@atheme-project.org>
parents:
3081
diff
changeset
|
1703 *tmp = '/'; |
2313 | 1704 |
1705 if (filename[0] != '/' && !strstr(filename, "://")) { | |
1706 path = g_strdup(playlist_name); | |
1707 if ((tmp = strrchr(path, '/'))) | |
1708 *tmp = '\0'; | |
1709 else { | |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1710 if ((playlist->loading_playlist == TRUE || |
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1711 cfg.playlist_detect == TRUE)) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1712 pr = NULL; |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1713 else if (!str_has_prefix_nocase(filename, "http://") && |
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1714 !str_has_prefix_nocase(filename, "https://")) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1715 pr = input_check_file(filename, FALSE); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1716 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1717 __playlist_ins_with_info(playlist, filename, pos, title, len, pr ? pr->ip : NULL); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1718 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1719 g_free(pr); |
2313 | 1720 return; |
1721 } | |
1722 tmp = g_build_filename(path, filename, NULL); | |
1723 | |
2668
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
1724 if (playlist->loading_playlist == TRUE && cfg.playlist_detect == TRUE) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1725 pr = NULL; |
2668
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
1726 else if (!str_has_prefix_nocase(tmp, "http://") && |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
1727 !str_has_prefix_nocase(tmp, "https://")) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1728 pr = input_check_file(tmp, FALSE); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1729 |
3128
343504d43afc
Fix warnings.
William Pitcock <nenolod@atheme-project.org>
parents:
3127
diff
changeset
|
1730 __playlist_ins_with_info(playlist, tmp, pos, title, len, pr ? pr->ip : NULL); |
2313 | 1731 g_free(tmp); |
1732 g_free(path); | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1733 g_free(pr); |
2313 | 1734 } |
1735 else | |
1736 { | |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1737 if ((playlist->loading_playlist == TRUE || |
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1738 cfg.playlist_detect == TRUE)) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1739 pr = NULL; |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1740 else if (!str_has_prefix_nocase(filename, "http://") && |
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1741 !str_has_prefix_nocase(filename, "https://")) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1742 pr = input_check_file(filename, FALSE); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1743 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1744 __playlist_ins_with_info(playlist, filename, pos, title, len, pr ? pr->ip : NULL); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1745 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1746 g_free(pr); |
2313 | 1747 } |
1748 | |
1749 g_free(filename); | |
1750 } | |
1751 | |
1752 void | |
1753 playlist_load_ins_file_tuple(Playlist * playlist, | |
1754 const gchar * filename_p, | |
1755 const gchar * playlist_name, | |
1756 gint pos, | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1757 Tuple *tuple) |
2313 | 1758 { |
1759 gchar *filename; | |
1760 gchar *tmp, *path; | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1761 ProbeResult *pr = NULL; /* for decoder cache */ |
2313 | 1762 |
1763 g_return_if_fail(filename_p != NULL); | |
1764 g_return_if_fail(playlist_name != NULL); | |
1765 g_return_if_fail(playlist != NULL); | |
1766 | |
1767 filename = g_strchug(g_strdup(filename_p)); | |
1768 | |
3635 | 1769 if (cfg.convert_slash) |
3087
030b956c73b2
Fix a bug in backslash to slash conversion. Closes #1006.
William Pitcock <nenolod@atheme-project.org>
parents:
3081
diff
changeset
|
1770 while ((tmp = strchr(filename, '\\')) != NULL) |
030b956c73b2
Fix a bug in backslash to slash conversion. Closes #1006.
William Pitcock <nenolod@atheme-project.org>
parents:
3081
diff
changeset
|
1771 *tmp = '/'; |
2313 | 1772 |
1773 if (filename[0] != '/' && !strstr(filename, "://")) { | |
1774 path = g_strdup(playlist_name); | |
1775 if ((tmp = strrchr(path, '/'))) | |
1776 *tmp = '\0'; | |
1777 else { | |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1778 if ((playlist->loading_playlist == TRUE || |
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1779 cfg.playlist_detect == TRUE)) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1780 pr = NULL; |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1781 else if (!str_has_prefix_nocase(filename, "http://") && |
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1782 !str_has_prefix_nocase(filename, "https://")) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1783 pr = input_check_file(filename, FALSE); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1784 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1785 __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, pr ? pr->ip : NULL); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1786 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1787 g_free(pr); |
2313 | 1788 return; |
1789 } | |
1790 tmp = g_build_filename(path, filename, NULL); | |
1791 | |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1792 if ((playlist->loading_playlist == TRUE || |
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1793 cfg.playlist_detect == TRUE)) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1794 pr = NULL; |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1795 else if (!str_has_prefix_nocase(filename, "http://") && |
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1796 !str_has_prefix_nocase(filename, "https://")) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1797 pr = input_check_file(filename, FALSE); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1798 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1799 __playlist_ins_with_info_tuple(playlist, tmp, pos, tuple, pr ? pr->ip : NULL); |
2313 | 1800 g_free(tmp); |
1801 g_free(path); | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1802 g_free(pr); |
2313 | 1803 } |
1804 else | |
1805 { | |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1806 if ((playlist->loading_playlist == TRUE || |
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1807 cfg.playlist_detect == TRUE)) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1808 pr = NULL; |
2667
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1809 else if (!str_has_prefix_nocase(filename, "http://") && |
8c56926de2ad
[svn] - probe remote sources (hardcoded to http://, https://) in the background.
nenolod
parents:
2637
diff
changeset
|
1810 !str_has_prefix_nocase(filename, "https://")) |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1811 pr = input_check_file(filename, FALSE); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1812 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1813 __playlist_ins_with_info_tuple(playlist, filename, pos, tuple, pr ? pr->ip : NULL); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
1814 g_free(pr); |
2313 | 1815 } |
1816 | |
1817 g_free(filename); | |
1818 } | |
1819 | |
1820 static guint | |
1821 playlist_load_ins(Playlist * playlist, const gchar * filename, gint pos) | |
1822 { | |
1823 PlaylistContainer *plc; | |
3383
e2e875f3d02b
Make playlist_load_ins handle the case when playlist is not the currently active one
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3382
diff
changeset
|
1824 GList *old_iter; |
2313 | 1825 gchar *ext; |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1826 gint old_len, new_len; |
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1827 |
2313 | 1828 g_return_val_if_fail(playlist != NULL, 0); |
1829 g_return_val_if_fail(filename != NULL, 0); | |
1830 | |
1831 ext = strrchr(filename, '.') + 1; | |
1832 plc = playlist_container_find(ext); | |
1833 | |
1834 g_return_val_if_fail(plc != NULL, 0); | |
1835 g_return_val_if_fail(plc->plc_read != NULL, 0); | |
1836 | |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1837 old_len = playlist_get_length(playlist); |
3383
e2e875f3d02b
Make playlist_load_ins handle the case when playlist is not the currently active one
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3382
diff
changeset
|
1838 /* make sure it adds files to the right playlist */ |
e2e875f3d02b
Make playlist_load_ins handle the case when playlist is not the currently active one
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3382
diff
changeset
|
1839 if (playlist != playlist_get_active()) { |
e2e875f3d02b
Make playlist_load_ins handle the case when playlist is not the currently active one
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3382
diff
changeset
|
1840 old_iter = playlists_iter; |
e2e875f3d02b
Make playlist_load_ins handle the case when playlist is not the currently active one
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3382
diff
changeset
|
1841 playlists_iter = g_list_find(playlists, playlist); |
3478
481a4a88d3ec
Use old iterator when new one isn't found
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3477
diff
changeset
|
1842 if (!playlists_iter) playlists_iter = old_iter; |
3383
e2e875f3d02b
Make playlist_load_ins handle the case when playlist is not the currently active one
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3382
diff
changeset
|
1843 plc->plc_read(filename, pos); |
e2e875f3d02b
Make playlist_load_ins handle the case when playlist is not the currently active one
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3382
diff
changeset
|
1844 playlists_iter = old_iter; |
e2e875f3d02b
Make playlist_load_ins handle the case when playlist is not the currently active one
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3382
diff
changeset
|
1845 } else { |
e2e875f3d02b
Make playlist_load_ins handle the case when playlist is not the currently active one
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3382
diff
changeset
|
1846 plc->plc_read(filename, pos); |
e2e875f3d02b
Make playlist_load_ins handle the case when playlist is not the currently active one
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3382
diff
changeset
|
1847 } |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1848 new_len = playlist_get_length(playlist); |
2313 | 1849 |
1850 playlist_generate_shuffle_list(playlist); | |
1851 playlistwin_update_list(playlist); | |
3621
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
1852 playlist_manager_update(); |
2313 | 1853 |
3337
99f34db2c3fc
- fix a bug that playlist_ins_url() always returns 1 even if no url has been added. now playlist_ins_url() returns number of new entries which actually added to the playlist.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3334
diff
changeset
|
1854 return new_len - old_len; |
2313 | 1855 } |
1856 | |
1857 GList * | |
1858 get_playlist_nth(Playlist *playlist, guint nth) | |
1859 { | |
1860 g_warning("deprecated function get_playlist_nth() was called"); | |
1861 REQUIRE_LOCK(playlist->mutex); | |
1862 return g_list_nth(playlist->entries, nth); | |
1863 } | |
1864 | |
1865 gint | |
1866 playlist_get_position_nolock(Playlist *playlist) | |
1867 { | |
1868 if (playlist && playlist->position) | |
1869 return g_list_index(playlist->entries, playlist->position); | |
1870 return 0; | |
1871 } | |
1872 | |
1873 gint | |
1874 playlist_get_position(Playlist *playlist) | |
1875 { | |
1876 gint pos; | |
1877 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1878 PLAYLIST_LOCK(playlist); |
2313 | 1879 pos = playlist_get_position_nolock(playlist); |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1880 PLAYLIST_UNLOCK(playlist); |
2313 | 1881 |
1882 return pos; | |
1883 } | |
1884 | |
1885 gchar * | |
1886 playlist_get_filename(Playlist *playlist, guint pos) | |
1887 { | |
1888 gchar *filename; | |
1889 PlaylistEntry *entry; | |
1890 GList *node; | |
1891 | |
1892 if (!playlist) | |
1893 return NULL; | |
1894 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1895 PLAYLIST_LOCK(playlist); |
2313 | 1896 node = g_list_nth(playlist->entries, pos); |
1897 if (!node) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1898 PLAYLIST_UNLOCK(playlist); |
2313 | 1899 return NULL; |
1900 } | |
1901 entry = node->data; | |
1902 | |
1903 filename = g_strdup(entry->filename); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1904 PLAYLIST_UNLOCK(playlist); |
2313 | 1905 |
1906 return filename; | |
1907 } | |
1908 | |
1909 gchar * | |
1910 playlist_get_songtitle(Playlist *playlist, guint pos) | |
1911 { | |
1912 gchar *title = NULL; | |
1913 PlaylistEntry *entry; | |
1914 GList *node; | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1915 time_t mtime; |
2313 | 1916 |
1917 if (!playlist) | |
1918 return NULL; | |
1919 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1920 PLAYLIST_LOCK(playlist); |
2313 | 1921 |
1922 if (!(node = g_list_nth(playlist->entries, pos))) { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1923 PLAYLIST_UNLOCK(playlist); |
2313 | 1924 return NULL; |
1925 } | |
1926 | |
1927 entry = node->data; | |
1928 | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1929 if (entry->tuple) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
1930 mtime = tuple_get_int(entry->tuple, FIELD_MTIME, NULL); |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1931 else |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1932 mtime = 0; |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1933 |
2313 | 1934 /* FIXME: simplify this logic */ |
1935 if ((entry->title == NULL && entry->length == -1) || | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1936 (entry->tuple && mtime != 0 && (mtime == -1 || mtime != playlist_get_mtime(entry->filename)))) |
2313 | 1937 { |
1938 if (playlist_entry_get_info(entry)) | |
1939 title = entry->title; | |
1940 } | |
1941 else { | |
1942 title = entry->title; | |
1943 } | |
1944 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
1945 PLAYLIST_UNLOCK(playlist); |
2313 | 1946 |
1947 if (!title) { | |
3081
ba2143c1c6f5
unescape url encoded filename where real filename is needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3079
diff
changeset
|
1948 gchar *realfn = NULL; |
ba2143c1c6f5
unescape url encoded filename where real filename is needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3079
diff
changeset
|
1949 realfn = g_filename_from_uri(entry->filename, NULL, NULL); |
ba2143c1c6f5
unescape url encoded filename where real filename is needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3079
diff
changeset
|
1950 title = g_path_get_basename(realfn ? realfn : entry->filename); |
ba2143c1c6f5
unescape url encoded filename where real filename is needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3079
diff
changeset
|
1951 g_free(realfn); realfn = NULL; |
2313 | 1952 return str_replace(title, filename_to_utf8(title)); |
1953 } | |
1954 | |
1955 return str_to_utf8(title); | |
1956 } | |
1957 | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1958 Tuple * |
2313 | 1959 playlist_get_tuple(Playlist *playlist, guint pos) |
1960 { | |
1961 PlaylistEntry *entry; | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1962 Tuple *tuple = NULL; |
2313 | 1963 GList *node; |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1964 time_t mtime; |
2313 | 1965 |
1966 if (!playlist) | |
1967 return NULL; | |
1968 | |
1969 if (!(node = g_list_nth(playlist->entries, pos))) { | |
1970 return NULL; | |
1971 } | |
1972 | |
1973 entry = (PlaylistEntry *) node->data; | |
1974 | |
1975 tuple = entry->tuple; | |
1976 | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1977 if (tuple) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
1978 mtime = tuple_get_int(tuple, FIELD_MTIME, NULL); |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1979 else |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1980 mtime = 0; |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1981 |
2313 | 1982 // if no tuple or tuple with old mtime, get new one. |
1983 if (tuple == NULL || | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1984 (entry->tuple && mtime != 0 && (mtime == -1 || mtime != playlist_get_mtime(entry->filename)))) |
2313 | 1985 { |
1986 playlist_entry_get_info(entry); | |
1987 tuple = entry->tuple; | |
1988 } | |
1989 | |
1990 return tuple; | |
1991 } | |
1992 | |
1993 gint | |
1994 playlist_get_songtime(Playlist *playlist, guint pos) | |
1995 { | |
1996 gint song_time = -1; | |
1997 PlaylistEntry *entry; | |
1998 GList *node; | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
1999 time_t mtime; |
2313 | 2000 |
2001 if (!playlist) | |
2002 return -1; | |
2003 | |
3635 | 2004 if (!(node = g_list_nth(playlist->entries, pos))) |
2313 | 2005 return -1; |
2006 | |
2007 entry = node->data; | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2008 |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2009 if (entry->tuple) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2010 mtime = tuple_get_int(entry->tuple, FIELD_MTIME, NULL); |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2011 else |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2012 mtime = 0; |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2013 |
2313 | 2014 if (entry->tuple == NULL || |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2015 (mtime != 0 && (mtime == -1 || mtime != playlist_get_mtime(entry->filename)))) { |
2313 | 2016 |
2017 if (playlist_entry_get_info(entry)) | |
2018 song_time = entry->length; | |
3635 | 2019 } else |
2313 | 2020 song_time = entry->length; |
2021 | |
2022 return song_time; | |
2023 } | |
2024 | |
2025 static gint | |
2026 playlist_compare_track(PlaylistEntry * a, | |
2027 PlaylistEntry * b) | |
2028 { | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2029 gint tracknumber_a; |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2030 gint tracknumber_b; |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2031 |
2313 | 2032 g_return_val_if_fail(a != NULL, 0); |
2033 g_return_val_if_fail(b != NULL, 0); | |
2034 | |
2614
deb09bfd716b
[svn] - now sort by track number and sort by title work even if on display metadata loading is specified.
yaz
parents:
2580
diff
changeset
|
2035 if(!a->tuple) |
deb09bfd716b
[svn] - now sort by track number and sort by title work even if on display metadata loading is specified.
yaz
parents:
2580
diff
changeset
|
2036 playlist_entry_get_info(a); |
deb09bfd716b
[svn] - now sort by track number and sort by title work even if on display metadata loading is specified.
yaz
parents:
2580
diff
changeset
|
2037 if(!b->tuple) |
deb09bfd716b
[svn] - now sort by track number and sort by title work even if on display metadata loading is specified.
yaz
parents:
2580
diff
changeset
|
2038 playlist_entry_get_info(b); |
deb09bfd716b
[svn] - now sort by track number and sort by title work even if on display metadata loading is specified.
yaz
parents:
2580
diff
changeset
|
2039 |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2040 if (a->tuple == NULL) |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2041 return 0; |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2042 if (b->tuple == NULL) |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2043 return 0; |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2044 |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2045 tracknumber_a = tuple_get_int(a->tuple, FIELD_TRACK_NUMBER, NULL); |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2046 tracknumber_b = tuple_get_int(b->tuple, FIELD_TRACK_NUMBER, NULL); |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2047 |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2048 return (tracknumber_a && tracknumber_b ? |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2049 tracknumber_a - tracknumber_b : 0); |
2313 | 2050 } |
2051 | |
3638
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2052 static void |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2053 playlist_get_entry_title(PlaylistEntry * e, const gchar ** title) |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2054 { |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2055 if (e->title) |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2056 *title = e->title; |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2057 else { |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2058 if (strrchr(e->filename, '/')) |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2059 *title = strrchr(e->filename, '/') + 1; |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2060 else |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2061 *title = e->filename; |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2062 } |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2063 } |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2064 |
2313 | 2065 static gint |
2066 playlist_compare_playlist(PlaylistEntry * a, | |
2067 PlaylistEntry * b) | |
2068 { | |
2069 const gchar *a_title = NULL, *b_title = NULL; | |
2070 | |
2071 g_return_val_if_fail(a != NULL, 0); | |
2072 g_return_val_if_fail(b != NULL, 0); | |
3638
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2073 |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2074 playlist_get_entry_title(a, &a_title); |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2075 playlist_get_entry_title(b, &b_title); |
2313 | 2076 |
2077 return strcasecmp(a_title, b_title); | |
2078 } | |
2079 | |
2080 static gint | |
2081 playlist_compare_title(PlaylistEntry * a, | |
2082 PlaylistEntry * b) | |
2083 { | |
2084 const gchar *a_title = NULL, *b_title = NULL; | |
2085 | |
2086 g_return_val_if_fail(a != NULL, 0); | |
2087 g_return_val_if_fail(b != NULL, 0); | |
2088 | |
3638
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2089 if (a->tuple == NULL) |
2614
deb09bfd716b
[svn] - now sort by track number and sort by title work even if on display metadata loading is specified.
yaz
parents:
2580
diff
changeset
|
2090 playlist_entry_get_info(a); |
3638
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2091 if (b->tuple == NULL) |
2614
deb09bfd716b
[svn] - now sort by track number and sort by title work even if on display metadata loading is specified.
yaz
parents:
2580
diff
changeset
|
2092 playlist_entry_get_info(b); |
deb09bfd716b
[svn] - now sort by track number and sort by title work even if on display metadata loading is specified.
yaz
parents:
2580
diff
changeset
|
2093 |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2094 if (a->tuple != NULL) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2095 a_title = tuple_get_string(a->tuple, FIELD_TITLE, NULL); |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2096 if (b->tuple != NULL) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2097 b_title = tuple_get_string(b->tuple, FIELD_TITLE, NULL); |
2313 | 2098 |
2099 if (a_title != NULL && b_title != NULL) | |
2100 return strcasecmp(a_title, b_title); | |
2101 | |
3638
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2102 playlist_get_entry_title(a, &a_title); |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2103 playlist_get_entry_title(b, &b_title); |
2313 | 2104 |
2105 return strcasecmp(a_title, b_title); | |
2106 } | |
2107 | |
2108 static gint | |
2109 playlist_compare_artist(PlaylistEntry * a, | |
2110 PlaylistEntry * b) | |
2111 { | |
2112 const gchar *a_artist = NULL, *b_artist = NULL; | |
2113 | |
2114 g_return_val_if_fail(a != NULL, 0); | |
2115 g_return_val_if_fail(b != NULL, 0); | |
2116 | |
2117 if (a->tuple != NULL) | |
2118 playlist_entry_get_info(a); | |
2119 | |
2120 if (b->tuple != NULL) | |
2121 playlist_entry_get_info(b); | |
2122 | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2123 if (a->tuple != NULL) { |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2124 a_artist = tuple_get_string(a->tuple, FIELD_ARTIST, NULL); |
2683
d2ffabee3ced
[svn] Modified playlist_compare_artist so that a leading "the" in an artist's
magma
parents:
2671
diff
changeset
|
2125 if (str_has_prefix_nocase(a_artist, "the ")) |
d2ffabee3ced
[svn] Modified playlist_compare_artist so that a leading "the" in an artist's
magma
parents:
2671
diff
changeset
|
2126 a_artist += 4; |
d2ffabee3ced
[svn] Modified playlist_compare_artist so that a leading "the" in an artist's
magma
parents:
2671
diff
changeset
|
2127 } |
d2ffabee3ced
[svn] Modified playlist_compare_artist so that a leading "the" in an artist's
magma
parents:
2671
diff
changeset
|
2128 |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2129 if (b->tuple != NULL) { |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2130 b_artist = tuple_get_string(b->tuple, FIELD_ARTIST, NULL); |
2683
d2ffabee3ced
[svn] Modified playlist_compare_artist so that a leading "the" in an artist's
magma
parents:
2671
diff
changeset
|
2131 if (str_has_prefix_nocase(b_artist, "the ")) |
d2ffabee3ced
[svn] Modified playlist_compare_artist so that a leading "the" in an artist's
magma
parents:
2671
diff
changeset
|
2132 b_artist += 4; |
d2ffabee3ced
[svn] Modified playlist_compare_artist so that a leading "the" in an artist's
magma
parents:
2671
diff
changeset
|
2133 } |
2313 | 2134 |
2135 if (a_artist != NULL && b_artist != NULL) | |
2136 return strcasecmp(a_artist, b_artist); | |
2137 | |
2138 return 0; | |
2139 } | |
2140 | |
2141 static gint | |
2142 playlist_compare_filename(PlaylistEntry * a, | |
2143 PlaylistEntry * b) | |
2144 { | |
2145 gchar *a_filename, *b_filename; | |
2146 | |
2147 g_return_val_if_fail(a != NULL, 0); | |
2148 g_return_val_if_fail(b != NULL, 0); | |
2149 | |
2150 if (strrchr(a->filename, '/')) | |
2151 a_filename = strrchr(a->filename, '/') + 1; | |
2152 else | |
2153 a_filename = a->filename; | |
2154 | |
2155 if (strrchr(b->filename, '/')) | |
2156 b_filename = strrchr(b->filename, '/') + 1; | |
2157 else | |
2158 b_filename = b->filename; | |
2159 | |
2160 | |
2161 return strcasecmp(a_filename, b_filename); | |
2162 } | |
2163 | |
2164 static gint | |
2165 path_compare(const gchar * a, const gchar * b) | |
2166 { | |
2167 gchar *posa, *posb; | |
2168 gint len, ret; | |
2169 | |
2170 posa = strrchr(a, '/'); | |
2171 posb = strrchr(b, '/'); | |
2172 | |
2173 /* | |
2174 * Sort directories before files | |
2175 */ | |
2176 if (posa && posb && (posa - a != posb - b)) { | |
2177 if (posa - a > posb - b) { | |
2178 len = posb - b; | |
2179 ret = -1; | |
2180 } | |
2181 else { | |
2182 len = posa - a; | |
2183 ret = 1; | |
2184 } | |
2185 if (!strncasecmp(a, b, len)) | |
2186 return ret; | |
2187 } | |
2188 return strcasecmp(a, b); | |
2189 } | |
2190 | |
2191 static gint | |
2192 playlist_compare_path(PlaylistEntry * a, | |
2193 PlaylistEntry * b) | |
2194 { | |
2195 return path_compare(a->filename, b->filename); | |
2196 } | |
2197 | |
2198 | |
2199 static time_t | |
2200 playlist_get_mtime(const gchar *filename) | |
2201 { | |
2202 struct stat buf; | |
2203 gint rv; | |
3081
ba2143c1c6f5
unescape url encoded filename where real filename is needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3079
diff
changeset
|
2204 gchar *realfn = NULL; |
ba2143c1c6f5
unescape url encoded filename where real filename is needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3079
diff
changeset
|
2205 |
ba2143c1c6f5
unescape url encoded filename where real filename is needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3079
diff
changeset
|
2206 /* stat() does not accept file:// --yaz */ |
ba2143c1c6f5
unescape url encoded filename where real filename is needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3079
diff
changeset
|
2207 realfn = g_filename_from_uri(filename, NULL, NULL); |
ba2143c1c6f5
unescape url encoded filename where real filename is needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3079
diff
changeset
|
2208 rv = stat(realfn ? realfn : filename, &buf); |
ba2143c1c6f5
unescape url encoded filename where real filename is needed.
Yoshiki Yazawa <yaz@cc.rim.or.jp>
parents:
3079
diff
changeset
|
2209 g_free(realfn); realfn = NULL; |
2313 | 2210 |
2211 if (rv == 0) { | |
2212 return buf.st_mtime; | |
2213 } else { | |
2214 return 0; //error | |
2215 } | |
2216 } | |
2217 | |
2218 | |
2219 static gint | |
2220 playlist_compare_date(PlaylistEntry * a, | |
2221 PlaylistEntry * b) | |
2222 { | |
2223 struct stat buf; | |
2224 time_t modtime; | |
2225 | |
2226 gint rv; | |
2227 | |
2228 | |
2229 rv = stat(a->filename, &buf); | |
2230 | |
2231 if (rv == 0) { | |
2232 modtime = buf.st_mtime; | |
2233 rv = stat(b->filename, &buf); | |
2234 | |
2235 if (stat(b->filename, &buf) == 0) { | |
2236 if (buf.st_mtime == modtime) | |
2237 return 0; | |
2238 else | |
2239 return (buf.st_mtime - modtime) > 0 ? -1 : 1; | |
2240 } | |
2241 else | |
2242 return -1; | |
2243 } | |
2244 else if (!lstat(b->filename, &buf)) | |
2245 return 1; | |
2246 else | |
2247 return playlist_compare_filename(a, b); | |
2248 } | |
2249 | |
2250 | |
2251 void | |
2252 playlist_sort(Playlist *playlist, PlaylistSortType type) | |
2253 { | |
2254 playlist_remove_dead_files(playlist); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2255 PLAYLIST_LOCK(playlist); |
2313 | 2256 playlist->entries = |
2257 g_list_sort(playlist->entries, | |
2258 (GCompareFunc) playlist_compare_func_table[type]); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2259 PLAYLIST_UNLOCK(playlist); |
2313 | 2260 } |
2261 | |
2262 static GList * | |
2263 playlist_sort_selected_generic(GList * list, GCompareFunc cmpfunc) | |
2264 { | |
2265 GList *list1, *list2; | |
2266 GList *tmp_list = NULL; | |
2267 GList *index_list = NULL; | |
2268 | |
2269 /* | |
2270 * We take all the selected entries out of the playlist, | |
2271 * sorts them, and then put them back in again. | |
2272 */ | |
2273 | |
2274 list1 = g_list_last(list); | |
2275 | |
2276 while (list1) { | |
2277 list2 = g_list_previous(list1); | |
2278 if (PLAYLIST_ENTRY(list1->data)->selected) { | |
2279 gpointer idx; | |
2280 idx = GINT_TO_POINTER(g_list_position(list, list1)); | |
2281 index_list = g_list_prepend(index_list, idx); | |
2282 list = g_list_remove_link(list, list1); | |
2283 tmp_list = g_list_concat(list1, tmp_list); | |
2284 } | |
2285 list1 = list2; | |
2286 } | |
2287 | |
2288 tmp_list = g_list_sort(tmp_list, cmpfunc); | |
2289 list1 = tmp_list; | |
2290 list2 = index_list; | |
2291 | |
2292 while (list2) { | |
2293 if (!list1) { | |
2294 g_critical(G_STRLOC ": Error during list sorting. " | |
2295 "Possibly dropped some playlist-entries."); | |
2296 break; | |
2297 } | |
2298 | |
2299 list = g_list_insert(list, list1->data, GPOINTER_TO_INT(list2->data)); | |
2300 | |
2301 list2 = g_list_next(list2); | |
2302 list1 = g_list_next(list1); | |
2303 } | |
2304 | |
2305 g_list_free(index_list); | |
2306 g_list_free(tmp_list); | |
2307 | |
2308 return list; | |
2309 } | |
2310 | |
2311 void | |
2312 playlist_sort_selected(Playlist *playlist, PlaylistSortType type) | |
2313 { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2314 PLAYLIST_LOCK(playlist); |
2313 | 2315 playlist->entries = playlist_sort_selected_generic(playlist->entries, (GCompareFunc) |
2316 playlist_compare_func_table | |
2317 [type]); | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2318 PLAYLIST_UNLOCK(playlist); |
2313 | 2319 } |
2320 | |
2321 void | |
2322 playlist_reverse(Playlist *playlist) | |
2323 { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2324 PLAYLIST_LOCK(playlist); |
2313 | 2325 playlist->entries = g_list_reverse(playlist->entries); |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2326 PLAYLIST_UNLOCK(playlist); |
2313 | 2327 } |
2328 | |
2329 static GList * | |
2330 playlist_shuffle_list(Playlist *playlist, GList * list) | |
2331 { | |
2332 /* | |
2333 * Note that this doesn't make a copy of the original list. | |
2334 * The pointer to the original list is not valid after this | |
2335 * fuction is run. | |
2336 */ | |
2337 gint len = g_list_length(list); | |
2338 gint i, j; | |
2339 GList *node, **ptrs; | |
2340 | |
2341 if (!playlist) | |
2342 return NULL; | |
2343 | |
2344 REQUIRE_LOCK(playlist->mutex); | |
2345 | |
2346 if (!len) | |
2347 return NULL; | |
2348 | |
2349 ptrs = g_new(GList *, len); | |
2350 | |
2351 for (node = list, i = 0; i < len; node = g_list_next(node), i++) | |
2352 ptrs[i] = node; | |
2353 | |
2354 j = g_random_int_range(0, len); | |
2355 list = ptrs[j]; | |
2356 ptrs[j]->next = NULL; | |
2357 ptrs[j] = ptrs[0]; | |
2358 | |
2359 for (i = 1; i < len; i++) { | |
2360 j = g_random_int_range(0, len - i); | |
2361 list->prev = ptrs[i + j]; | |
2362 ptrs[i + j]->next = list; | |
2363 list = ptrs[i + j]; | |
2364 ptrs[i + j] = ptrs[i]; | |
2365 } | |
2366 list->prev = NULL; | |
2367 | |
2368 g_free(ptrs); | |
2369 | |
2370 return list; | |
2371 } | |
2372 | |
2373 void | |
2374 playlist_random(Playlist *playlist) | |
2375 { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2376 PLAYLIST_LOCK(playlist); |
2313 | 2377 playlist->entries = playlist_shuffle_list(playlist, playlist->entries); |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2378 PLAYLIST_UNLOCK(playlist); |
2313 | 2379 } |
2380 | |
2381 GList * | |
2382 playlist_get_selected(Playlist *playlist) | |
2383 { | |
2384 GList *node, *list = NULL; | |
2385 gint i = 0; | |
2386 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2387 PLAYLIST_LOCK(playlist); |
2313 | 2388 for (node = playlist->entries; node; node = g_list_next(node), i++) { |
2389 PlaylistEntry *entry = node->data; | |
2390 if (entry->selected) | |
2391 list = g_list_prepend(list, GINT_TO_POINTER(i)); | |
2392 } | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2393 PLAYLIST_UNLOCK(playlist); |
2313 | 2394 return g_list_reverse(list); |
2395 } | |
2396 | |
2397 void | |
2398 playlist_clear_selected(Playlist *playlist) | |
2399 { | |
2400 GList *node = NULL; | |
2401 gint i = 0; | |
2402 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2403 PLAYLIST_LOCK(playlist); |
2313 | 2404 for (node = playlist->entries; node; node = g_list_next(node), i++) { |
2405 PLAYLIST_ENTRY(node->data)->selected = FALSE; | |
2406 } | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2407 PLAYLIST_UNLOCK(playlist); |
2313 | 2408 playlist_recalc_total_time(playlist); |
2409 playlist_manager_update(); | |
2410 } | |
2411 | |
2412 gint | |
2413 playlist_get_num_selected(Playlist *playlist) | |
2414 { | |
2415 GList *node; | |
2416 gint num = 0; | |
2417 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2418 PLAYLIST_LOCK(playlist); |
2313 | 2419 for (node = playlist->entries; node; node = g_list_next(node)) { |
2420 PlaylistEntry *entry = node->data; | |
2421 if (entry->selected) | |
2422 num++; | |
2423 } | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2424 PLAYLIST_UNLOCK(playlist); |
2313 | 2425 return num; |
2426 } | |
2427 | |
2428 | |
2429 static void | |
2430 playlist_generate_shuffle_list(Playlist *playlist) | |
2431 { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2432 PLAYLIST_LOCK(playlist); |
2313 | 2433 playlist_generate_shuffle_list_nolock(playlist); |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2434 PLAYLIST_UNLOCK(playlist); |
2313 | 2435 } |
2436 | |
2437 static void | |
2438 playlist_generate_shuffle_list_nolock(Playlist *playlist) | |
2439 { | |
2440 GList *node; | |
2441 gint numsongs; | |
2442 | |
2443 if (!cfg.shuffle || !playlist) | |
2444 return; | |
2445 | |
2446 REQUIRE_LOCK(playlist->mutex); | |
2447 | |
2448 if (playlist->shuffle) { | |
2449 g_list_free(playlist->shuffle); | |
2450 playlist->shuffle = NULL; | |
2451 } | |
2452 | |
2453 playlist->shuffle = playlist_shuffle_list(playlist, g_list_copy(playlist->entries)); | |
2454 numsongs = g_list_length(playlist->shuffle); | |
2455 | |
2456 if (playlist->position) { | |
2457 gint i = g_list_index(playlist->shuffle, playlist->position); | |
2458 node = g_list_nth(playlist->shuffle, i); | |
2459 playlist->shuffle = g_list_remove_link(playlist->shuffle, node); | |
2460 playlist->shuffle = g_list_prepend(playlist->shuffle, node->data); | |
2461 } | |
2462 } | |
2463 | |
2464 void | |
2465 playlist_fileinfo(Playlist *playlist, guint pos) | |
2466 { | |
2467 gchar *path = NULL; | |
2468 GList *node; | |
2469 PlaylistEntry *entry = NULL; | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2470 Tuple *tuple = NULL; |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
2471 ProbeResult *pr = NULL; |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2472 time_t mtime; |
2313 | 2473 |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2474 PLAYLIST_LOCK(playlist); |
2313 | 2475 |
2476 if ((node = g_list_nth(playlist->entries, pos))) | |
2477 { | |
2478 entry = node->data; | |
2479 tuple = entry->tuple; | |
2480 path = g_strdup(entry->filename); | |
2481 } | |
2482 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2483 PLAYLIST_UNLOCK(playlist); |
2313 | 2484 |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2485 if (entry->tuple) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2486 mtime = tuple_get_int(entry->tuple, FIELD_MTIME, NULL); |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2487 else |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2488 mtime = 0; |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2489 |
2313 | 2490 /* No tuple? Try to set this entry up properly. --nenolod */ |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2491 if (entry->tuple == NULL || mtime == -1 || |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2492 mtime == 0 || mtime != playlist_get_mtime(entry->filename)) |
2313 | 2493 { |
2494 playlist_entry_get_info(entry); | |
2495 tuple = entry->tuple; | |
2496 } | |
2497 | |
2498 if (tuple != NULL) | |
2499 { | |
2500 if (entry->decoder == NULL) | |
3127
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
2501 { |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
2502 pr = input_check_file(entry->filename, FALSE); /* try to find a decoder */ |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
2503 entry->decoder = pr ? pr->ip : NULL; |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
2504 |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
2505 g_free(pr); |
c92070f10148
Use ProbeResult (try 1)
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
2506 } |
2313 | 2507 |
2508 if (entry->decoder != NULL && entry->decoder->file_info_box == NULL) | |
2509 fileinfo_show_for_tuple(tuple); | |
2510 else if (entry->decoder != NULL && entry->decoder->file_info_box != NULL) | |
2511 entry->decoder->file_info_box(path); | |
2512 else | |
2513 fileinfo_show_for_path(path); | |
2514 g_free(path); | |
2515 } | |
2516 else if (path != NULL) | |
2517 { | |
2518 if (entry != NULL && entry->decoder != NULL && entry->decoder->file_info_box != NULL) | |
2519 entry->decoder->file_info_box(path); | |
2520 else | |
2521 fileinfo_show_for_path(path); | |
2522 g_free(path); | |
2523 } | |
2524 } | |
2525 | |
2526 void | |
2527 playlist_fileinfo_current(Playlist *playlist) | |
2528 { | |
2529 gchar *path = NULL; | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2530 Tuple *tuple = NULL; |
2313 | 2531 |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2532 PLAYLIST_LOCK(playlist); |
2313 | 2533 |
2534 if (playlist->entries && playlist->position) | |
2535 { | |
2536 path = g_strdup(playlist->position->filename); | |
2537 if (( playlist->position->tuple == NULL ) || ( playlist->position->decoder == NULL )) | |
2538 playlist_entry_get_info(playlist->position); | |
2539 tuple = playlist->position->tuple; | |
2540 } | |
2541 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2542 PLAYLIST_UNLOCK(playlist); |
2313 | 2543 |
2544 if (tuple != NULL) | |
2545 { | |
2546 if (playlist->position->decoder != NULL && playlist->position->decoder->file_info_box == NULL) | |
2547 fileinfo_show_for_tuple(tuple); | |
2548 else if (playlist->position->decoder != NULL && playlist->position->decoder->file_info_box != NULL) | |
2549 playlist->position->decoder->file_info_box(path); | |
2550 else | |
2551 fileinfo_show_for_path(path); | |
2552 g_free(path); | |
2553 } | |
2554 else if (path != NULL) | |
2555 { | |
2556 if (playlist->position != NULL && playlist->position->decoder != NULL && playlist->position->decoder->file_info_box != NULL) | |
2557 playlist->position->decoder->file_info_box(path); | |
2558 else | |
2559 fileinfo_show_for_path(path); | |
2560 g_free(path); | |
2561 } | |
2562 } | |
2563 | |
2564 | |
2565 static gboolean | |
2566 playlist_get_info_is_going(void) | |
2567 { | |
2568 gboolean result; | |
2569 | |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2570 g_static_rw_lock_reader_lock(&playlist_get_info_rwlock); |
2313 | 2571 result = playlist_get_info_going; |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2572 g_static_rw_lock_reader_unlock(&playlist_get_info_rwlock); |
2313 | 2573 |
2574 return result; | |
2575 } | |
2576 | |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2577 |
3360
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2578 static gboolean |
3467
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2579 playlist_get_info_scanning(void) |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2580 { |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2581 gboolean result; |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2582 |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2583 g_mutex_lock(mutex_scan); |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2584 result = playlist_get_info_scan_active; |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2585 g_mutex_unlock(mutex_scan); |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2586 |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2587 return result; |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2588 } |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2589 |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2590 |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2591 static gboolean |
3360
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2592 playlist_request_win_update(gpointer unused) |
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2593 { |
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2594 Playlist *playlist = playlist_get_active(); |
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2595 playlistwin_update_list(playlist); |
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2596 return FALSE; /* to be called only once */ |
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2597 } |
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2598 |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2599 |
2313 | 2600 static gpointer |
2601 playlist_get_info_func(gpointer arg) | |
2602 { | |
2603 GList *node; | |
2604 gboolean update_playlistwin = FALSE; | |
2605 | |
2606 while (playlist_get_info_is_going()) { | |
2607 PlaylistEntry *entry; | |
2608 Playlist *playlist = playlist_get_active(); | |
2609 | |
2610 // on_load | |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2611 if (cfg.use_pl_metadata && cfg.get_info_on_load && |
3467
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2612 playlist_get_info_scanning()) { |
2313 | 2613 |
2614 for (node = playlist->entries; node; node = g_list_next(node)) { | |
2615 entry = node->data; | |
2616 | |
2636 | 2617 if(playlist->attribute & PLAYLIST_STATIC || |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2618 (entry->tuple && tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 && |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2619 tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1)) { |
2313 | 2620 update_playlistwin = TRUE; |
2621 continue; | |
2622 } | |
2623 | |
2624 if (!playlist_entry_get_info(entry)) { | |
2625 if (g_list_index(playlist->entries, entry) == -1) | |
2626 /* Entry disappeared while we looked it up. | |
2627 Restart. */ | |
2628 node = playlist->entries; | |
2629 } | |
2630 else if ((entry->tuple != NULL || entry->title != NULL) && entry->length != -1) { | |
2631 update_playlistwin = TRUE; | |
2632 break; | |
2633 } | |
2634 } | |
2635 | |
2636 if (!node) { | |
2637 g_mutex_lock(mutex_scan); | |
2638 playlist_get_info_scan_active = FALSE; | |
2639 g_mutex_unlock(mutex_scan); | |
2640 } | |
2641 } // on_load | |
2642 | |
2643 // on_demand | |
2644 else if (!cfg.get_info_on_load && | |
2645 cfg.get_info_on_demand && | |
2646 cfg.playlist_visible && | |
2647 !cfg.playlist_shaded && | |
2648 cfg.use_pl_metadata) { | |
2649 | |
2650 g_mutex_lock(mutex_scan); | |
2651 playlist_get_info_scan_active = FALSE; | |
2652 g_mutex_unlock(mutex_scan); | |
2653 | |
2668
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2654 for (node = g_list_nth(playlist->entries, playlistwin_get_toprow()); |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2655 node && playlistwin_item_visible(g_list_position(playlist->entries, node)); |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2656 node = g_list_next(node)) { |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2657 |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2658 entry = node->data; |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2659 |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2660 if(playlist->attribute & PLAYLIST_STATIC || |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2661 (entry->tuple && tuple_get_int(entry->tuple, FIELD_LENGTH, NULL) > -1 && |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2662 tuple_get_int(entry->tuple, FIELD_MTIME, NULL) != -1)) { |
2668
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2663 update_playlistwin = TRUE; |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2664 continue; |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2665 } |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2666 |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2667 if (!playlist_entry_get_info(entry)) { |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2668 if (g_list_index(playlist->entries, entry) == -1) |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2669 /* Entry disapeared while we |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2670 looked it up. Restart. */ |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2671 node = g_list_nth(playlist->entries, |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2672 playlistwin_get_toprow()); |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2673 } |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2674 else if ((entry->tuple != NULL || entry->title != NULL) && entry->length != -1) { |
d5da5d37ec8b
[svn] - unlock many playlist operations that do not really need locking
nenolod
parents:
2667
diff
changeset
|
2675 update_playlistwin = TRUE; |
2545
610d85b8a22b
[svn] - on loading a playlist with tuple, invoke the scanner thread only if mtime is -1.
yaz
parents:
2504
diff
changeset
|
2676 // no need for break here since this iteration is very short. |
2313 | 2677 } |
2678 } | |
2679 } // on_demand | |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2680 else if (cfg.get_info_on_demand && |
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2681 (!cfg.playlist_visible || cfg.playlist_shaded || !cfg.use_pl_metadata)) |
2313 | 2682 { |
2683 g_mutex_lock(mutex_scan); | |
2684 playlist_get_info_scan_active = FALSE; | |
2685 g_mutex_unlock(mutex_scan); | |
2686 } | |
2687 else /* not on_demand and not on_load... | |
2688 NOTE: this shouldn't happen anymore, sanity check in bmp_config_load now */ | |
2689 { | |
2690 g_mutex_lock(mutex_scan); | |
2691 playlist_get_info_scan_active = FALSE; | |
2692 g_mutex_unlock(mutex_scan); | |
2693 } | |
2694 | |
2695 if (update_playlistwin) { | |
3360
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2696 /* we are in a different thread, so we can't do UI updates directly; |
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2697 instead, schedule a playlist update in the main loop --giacomo */ |
8430c3911856
playlist_get_info_func works in a different thread, so trying to do UI updates from it eventually leads to UI freeze; fixed to schedule those updates in the main loop instead of doing them directly
Giacomo Lozito <james@develia.org>
parents:
3349
diff
changeset
|
2698 g_idle_add_full(G_PRIORITY_HIGH_IDLE, playlist_request_win_update, NULL, NULL); |
2313 | 2699 update_playlistwin = FALSE; |
2700 } | |
2701 | |
3467
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
2702 if (playlist_get_info_scanning()) { |
2313 | 2703 continue; |
2704 } | |
2705 | |
2706 g_mutex_lock(mutex_scan); | |
2707 g_cond_wait(cond_scan, mutex_scan); | |
2708 g_mutex_unlock(mutex_scan); | |
2709 | |
2710 } // while | |
2711 | |
2712 g_thread_exit(NULL); | |
2713 return NULL; | |
2714 } | |
2715 | |
2716 void | |
2717 playlist_start_get_info_thread(void) | |
2718 { | |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2719 g_static_rw_lock_writer_lock(&playlist_get_info_rwlock); |
2313 | 2720 playlist_get_info_going = TRUE; |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2721 g_static_rw_lock_writer_unlock(&playlist_get_info_rwlock); |
2313 | 2722 |
2723 playlist_get_info_thread = g_thread_create(playlist_get_info_func, | |
2724 NULL, TRUE, NULL); | |
2725 } | |
2726 | |
2727 void | |
2728 playlist_stop_get_info_thread(void) | |
2729 { | |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2730 g_static_rw_lock_writer_lock(&playlist_get_info_rwlock); |
2313 | 2731 playlist_get_info_going = FALSE; |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2732 g_static_rw_lock_writer_unlock(&playlist_get_info_rwlock); |
2313 | 2733 |
2734 g_cond_broadcast(cond_scan); | |
2735 g_thread_join(playlist_get_info_thread); | |
2736 } | |
2737 | |
2738 void | |
2739 playlist_start_get_info_scan(void) | |
2740 { | |
2741 g_mutex_lock(mutex_scan); | |
2742 playlist_get_info_scan_active = TRUE; | |
2743 g_mutex_unlock(mutex_scan); | |
3460
0fcff78c0c2c
Make the shutdown procedure more sane and improve playlist clearing
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2744 |
2313 | 2745 g_cond_signal(cond_scan); |
2746 } | |
2747 | |
2748 void | |
2749 playlist_remove_dead_files(Playlist *playlist) | |
2750 { | |
2751 GList *node, *next_node; | |
2752 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2753 PLAYLIST_LOCK(playlist); |
2313 | 2754 |
2755 for (node = playlist->entries; node; node = next_node) { | |
2756 PlaylistEntry *entry = PLAYLIST_ENTRY(node->data); | |
2757 next_node = g_list_next(node); | |
2758 | |
2759 if (!entry || !entry->filename) { | |
2760 g_message(G_STRLOC ": Playlist entry is invalid!"); | |
2761 continue; | |
2762 } | |
2763 | |
2764 /* FIXME: What about 'file:///'? */ | |
2765 /* Don't kill URLs */ | |
2766 if (strstr(entry->filename, "://")) | |
2767 continue; | |
2768 | |
2769 /* FIXME: Should test for readability */ | |
2770 if (vfs_file_test(entry->filename, G_FILE_TEST_EXISTS)) | |
2771 continue; | |
2772 | |
2773 if (entry == playlist->position) { | |
2774 /* Don't remove the currently playing song */ | |
2775 if (playback_get_playing()) | |
2776 continue; | |
2777 | |
2778 if (next_node) | |
2779 playlist->position = PLAYLIST_ENTRY(next_node->data); | |
2780 else | |
2781 playlist->position = NULL; | |
2782 } | |
2783 | |
2784 playlist_entry_free(entry); | |
2785 playlist->entries = g_list_delete_link(playlist->entries, node); | |
2786 } | |
2787 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2788 PLAYLIST_UNLOCK(playlist); |
2313 | 2789 |
2790 playlist_generate_shuffle_list(playlist); | |
2791 playlistwin_update_list(playlist); | |
2792 playlist_recalc_total_time(playlist); | |
2793 playlist_manager_update(); | |
2794 } | |
2795 | |
2796 | |
2797 static gint | |
2798 playlist_dupscmp_title(PlaylistEntry * a, | |
2799 PlaylistEntry * b) | |
2800 { | |
2801 const gchar *a_title, *b_title; | |
2802 | |
2803 g_return_val_if_fail(a != NULL, 0); | |
2804 g_return_val_if_fail(b != NULL, 0); | |
2805 | |
3638
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2806 playlist_get_entry_title(a, &a_title); |
8d2f06fc841c
Slight cleanup of few functions and fix a potential segfault.
Matti Hamalainen <ccr@tnsp.org>
parents:
3636
diff
changeset
|
2807 playlist_get_entry_title(b, &b_title); |
2313 | 2808 |
2809 return strcmp(a_title, b_title); | |
2810 } | |
2811 | |
2812 static gint | |
2813 playlist_dupscmp_filename(PlaylistEntry * a, | |
2814 PlaylistEntry * b ) | |
2815 { | |
2816 gchar *a_filename, *b_filename; | |
2817 | |
2818 g_return_val_if_fail(a != NULL, 0); | |
2819 g_return_val_if_fail(b != NULL, 0); | |
2820 | |
2821 if (strrchr(a->filename, '/')) | |
2822 a_filename = strrchr(a->filename, '/') + 1; | |
2823 else | |
2824 a_filename = a->filename; | |
2825 | |
2826 if (strrchr(b->filename, '/')) | |
2827 b_filename = strrchr(b->filename, '/') + 1; | |
2828 else | |
2829 b_filename = b->filename; | |
2830 | |
2831 return strcmp(a_filename, b_filename); | |
2832 } | |
2833 | |
2834 static gint | |
2835 playlist_dupscmp_path(PlaylistEntry * a, | |
2836 PlaylistEntry * b) | |
2837 { | |
2838 /* simply compare the entire filename string */ | |
2839 return strcmp(a->filename, b->filename); | |
2840 } | |
2841 | |
2842 void | |
2843 playlist_remove_duplicates(Playlist *playlist, PlaylistDupsType type) | |
2844 { | |
2845 GList *node, *next_node; | |
2846 GList *node_cmp, *next_node_cmp; | |
2847 gint (*dups_compare_func)(PlaylistEntry * , PlaylistEntry *); | |
2848 | |
2849 switch ( type ) | |
2850 { | |
2851 case PLAYLIST_DUPS_TITLE: | |
2852 dups_compare_func = playlist_dupscmp_title; | |
2853 break; | |
2854 case PLAYLIST_DUPS_PATH: | |
2855 dups_compare_func = playlist_dupscmp_path; | |
2856 break; | |
2857 case PLAYLIST_DUPS_FILENAME: | |
2858 default: | |
2859 dups_compare_func = playlist_dupscmp_filename; | |
2860 break; | |
2861 } | |
2862 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2863 PLAYLIST_LOCK(playlist); |
2313 | 2864 |
2865 for (node = playlist->entries; node; node = next_node) { | |
2866 PlaylistEntry *entry = PLAYLIST_ENTRY(node->data); | |
2867 next_node = g_list_next(node); | |
2868 | |
2869 if (!entry || !entry->filename) { | |
2870 g_message(G_STRLOC ": Playlist entry is invalid!"); | |
2871 continue; | |
2872 } | |
2873 | |
2874 for (node_cmp = next_node; node_cmp; node_cmp = next_node_cmp) { | |
2875 PlaylistEntry *entry_cmp = PLAYLIST_ENTRY(node_cmp->data); | |
2876 next_node_cmp = g_list_next(node_cmp); | |
2877 | |
2878 if (!entry_cmp || !entry_cmp->filename) { | |
2879 g_message(G_STRLOC ": Playlist entry is invalid!"); | |
2880 continue; | |
2881 } | |
2882 | |
2883 /* compare using the chosen dups_compare_func */ | |
2884 if ( !dups_compare_func( entry , entry_cmp ) ) { | |
2885 | |
2886 if (entry_cmp == playlist->position) { | |
2887 /* Don't remove the currently playing song */ | |
2888 if (playback_get_playing()) | |
2889 continue; | |
2890 | |
2891 if (next_node_cmp) | |
2892 playlist->position = PLAYLIST_ENTRY(next_node_cmp->data); | |
2893 else | |
2894 playlist->position = NULL; | |
2895 } | |
2896 | |
2897 /* check if this was the next item of the external | |
2898 loop; if true, replace it with the next of the next*/ | |
2899 if ( node_cmp == next_node ) | |
2900 next_node = g_list_next(next_node); | |
2901 | |
2902 playlist_entry_free(entry_cmp); | |
2903 playlist->entries = g_list_delete_link(playlist->entries, node_cmp); | |
2904 } | |
2905 } | |
2906 } | |
2907 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2908 PLAYLIST_UNLOCK(playlist); |
2313 | 2909 |
2910 playlistwin_update_list(playlist); | |
2911 playlist_recalc_total_time(playlist); | |
2912 | |
2913 playlist_manager_update(); | |
2914 } | |
2915 | |
2916 void | |
2917 playlist_get_total_time(Playlist * playlist, | |
2918 gulong * total_time, | |
2919 gulong * selection_time, | |
2920 gboolean * total_more, | |
2921 gboolean * selection_more) | |
2922 { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2923 PLAYLIST_LOCK(playlist); |
2313 | 2924 *total_time = playlist->pl_total_time; |
2925 *selection_time = playlist->pl_selection_time; | |
2926 *total_more = playlist->pl_total_more; | |
2927 *selection_more = playlist->pl_selection_more; | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2928 PLAYLIST_UNLOCK(playlist); |
2313 | 2929 } |
2930 | |
2931 | |
2932 static void | |
2933 playlist_recalc_total_time_nolock(Playlist *playlist) | |
2934 { | |
2935 GList *list; | |
2936 PlaylistEntry *entry; | |
2937 | |
2938 REQUIRE_LOCK(playlist->mutex); | |
2939 | |
2940 playlist->pl_total_time = 0; | |
2941 playlist->pl_selection_time = 0; | |
2942 playlist->pl_total_more = FALSE; | |
2943 playlist->pl_selection_more = FALSE; | |
2944 | |
2945 for (list = playlist->entries; list; list = g_list_next(list)) { | |
2946 entry = list->data; | |
2947 | |
2948 if (entry->length != -1) | |
2949 playlist->pl_total_time += entry->length / 1000; | |
2950 else | |
2951 playlist->pl_total_more = TRUE; | |
2952 | |
2953 if (entry->selected) { | |
2954 if (entry->length != -1) | |
2955 playlist->pl_selection_time += entry->length / 1000; | |
2956 else | |
2957 playlist->pl_selection_more = TRUE; | |
2958 } | |
2959 } | |
2960 } | |
2961 | |
2962 static void | |
2963 playlist_recalc_total_time(Playlist *playlist) | |
2964 { | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2965 PLAYLIST_LOCK(playlist); |
2313 | 2966 playlist_recalc_total_time_nolock(playlist); |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2967 PLAYLIST_UNLOCK(playlist); |
2313 | 2968 } |
2969 | |
2970 gint | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
2971 playlist_select_search( Playlist *playlist , Tuple *tuple , gint action ) |
2313 | 2972 { |
2973 GList *entry_list = NULL, *found_list = NULL, *sel_list = NULL; | |
2974 gboolean is_first_search = TRUE; | |
2975 gint num_of_entries_found = 0; | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2976 const gchar *regex_pattern; |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2977 const gchar *track_name = tuple_get_string( tuple, FIELD_TITLE, NULL ); |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2978 const gchar *album_name = tuple_get_string( tuple, FIELD_ALBUM, NULL ); |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2979 const gchar *performer = tuple_get_string( tuple, FIELD_PERFORMER, NULL ); |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2980 const gchar *file_name = tuple_get_string( tuple, FIELD_FILE_NAME, NULL ); |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2981 |
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2982 #if defined(USE_REGEX_ONIGURUMA) |
2313 | 2983 /* set encoding for Oniguruma regex to UTF-8 */ |
2984 reg_set_encoding( REG_POSIX_ENCODING_UTF8 ); | |
2985 onig_set_default_syntax( ONIG_SYNTAX_POSIX_BASIC ); | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2986 #endif |
2313 | 2987 |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
2988 PLAYLIST_LOCK(playlist); |
2313 | 2989 |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2990 if ( (regex_pattern = tuple_get_string(tuple, FIELD_TITLE, NULL)) != NULL ) |
2313 | 2991 { |
2992 /* match by track_name */ | |
2993 regex_t regex; | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2994 #if defined(USE_REGEX_PCRE) |
2313 | 2995 if ( regcomp( ®ex , regex_pattern , REG_NOSUB | REG_ICASE | REG_UTF8 ) == 0 ) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2996 #else |
2313 | 2997 if ( regcomp( ®ex , regex_pattern , REG_NOSUB | REG_ICASE ) == 0 ) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
2998 #endif |
2313 | 2999 { |
3000 GList *tfound_list = NULL; | |
3001 if ( is_first_search == TRUE ) entry_list = playlist->entries; | |
3002 else entry_list = found_list; /* use found_list */ | |
3003 for ( ; entry_list ; entry_list = g_list_next(entry_list) ) | |
3004 { | |
3005 PlaylistEntry *entry = entry_list->data; | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
3006 if ( ( entry->tuple != NULL ) && ( track_name != NULL ) && |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
3007 ( regexec( ®ex , track_name , 0 , NULL , 0 ) == 0 ) ) |
2313 | 3008 { |
3009 tfound_list = g_list_append( tfound_list , entry ); | |
3010 } | |
3011 } | |
3012 g_list_free( found_list ); /* wipe old found_list */ | |
3013 found_list = tfound_list; /* move tfound_list in found_list */ | |
3014 regfree( ®ex ); | |
3015 } | |
3016 is_first_search = FALSE; | |
3017 } | |
3018 | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3019 if ( (regex_pattern = tuple_get_string(tuple, FIELD_ALBUM, NULL)) != NULL ) |
2313 | 3020 { |
3021 /* match by album_name */ | |
3022 regex_t regex; | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3023 #if defined(USE_REGEX_PCRE) |
2313 | 3024 if ( regcomp( ®ex , regex_pattern , REG_NOSUB | REG_ICASE | REG_UTF8 ) == 0 ) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3025 #else |
2313 | 3026 if ( regcomp( ®ex , regex_pattern , REG_NOSUB | REG_ICASE ) == 0 ) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3027 #endif |
2313 | 3028 { |
3029 GList *tfound_list = NULL; | |
3030 if ( is_first_search == TRUE ) entry_list = playlist->entries; | |
3031 else entry_list = found_list; /* use found_list */ | |
3032 for ( ; entry_list ; entry_list = g_list_next(entry_list) ) | |
3033 { | |
3034 PlaylistEntry *entry = entry_list->data; | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
3035 if ( ( entry->tuple != NULL ) && ( album_name != NULL ) && |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
3036 ( regexec( ®ex , album_name , 0 , NULL , 0 ) == 0 ) ) |
2313 | 3037 { |
3038 tfound_list = g_list_append( tfound_list , entry ); | |
3039 } | |
3040 } | |
3041 g_list_free( found_list ); /* wipe old found_list */ | |
3042 found_list = tfound_list; /* move tfound_list in found_list */ | |
3043 regfree( ®ex ); | |
3044 } | |
3045 is_first_search = FALSE; | |
3046 } | |
3047 | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3048 if ( (regex_pattern = tuple_get_string(tuple, FIELD_ARTIST, NULL)) != NULL ) |
2313 | 3049 { |
3050 /* match by performer */ | |
3051 regex_t regex; | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3052 #if defined(USE_REGEX_PCRE) |
2313 | 3053 if ( regcomp( ®ex , regex_pattern , REG_NOSUB | REG_ICASE | REG_UTF8 ) == 0 ) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3054 #else |
2313 | 3055 if ( regcomp( ®ex , regex_pattern , REG_NOSUB | REG_ICASE ) == 0 ) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3056 #endif |
2313 | 3057 { |
3058 GList *tfound_list = NULL; | |
3059 if ( is_first_search == TRUE ) entry_list = playlist->entries; | |
3060 else entry_list = found_list; /* use found_list */ | |
3061 for ( ; entry_list ; entry_list = g_list_next(entry_list) ) | |
3062 { | |
3063 PlaylistEntry *entry = entry_list->data; | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
3064 if ( ( entry->tuple != NULL ) && ( performer != NULL ) && |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
3065 ( regexec( ®ex , performer , 0 , NULL , 0 ) == 0 ) ) |
2313 | 3066 { |
3067 tfound_list = g_list_append( tfound_list , entry ); | |
3068 } | |
3069 } | |
3070 g_list_free( found_list ); /* wipe old found_list */ | |
3071 found_list = tfound_list; /* move tfound_list in found_list */ | |
3072 regfree( ®ex ); | |
3073 } | |
3074 is_first_search = FALSE; | |
3075 } | |
3076 | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3077 if ( (regex_pattern = tuple_get_string(tuple, FIELD_FILE_NAME, NULL)) != NULL ) |
2313 | 3078 { |
3079 /* match by file_name */ | |
3080 regex_t regex; | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3081 #if defined(USE_REGEX_PCRE) |
2313 | 3082 if ( regcomp( ®ex , regex_pattern , REG_NOSUB | REG_ICASE | REG_UTF8 ) == 0 ) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3083 #else |
2313 | 3084 if ( regcomp( ®ex , regex_pattern , REG_NOSUB | REG_ICASE ) == 0 ) |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3085 #endif |
2313 | 3086 { |
3087 GList *tfound_list = NULL; | |
3088 if ( is_first_search == TRUE ) entry_list = playlist->entries; | |
3089 else entry_list = found_list; /* use found_list */ | |
3090 for ( ; entry_list ; entry_list = g_list_next(entry_list) ) | |
3091 { | |
3092 PlaylistEntry *entry = entry_list->data; | |
3298
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
3093 if ( ( entry->tuple != NULL ) && ( file_name != NULL ) && |
f985357757e0
audacious-core: convert to tuple-ng, remove titlestring API.
William Pitcock <nenolod@atheme-project.org>
parents:
3246
diff
changeset
|
3094 ( regexec( ®ex , file_name , 0 , NULL , 0 ) == 0 ) ) |
2313 | 3095 { |
3096 tfound_list = g_list_append( tfound_list , entry ); | |
3097 } | |
3098 } | |
3099 g_list_free( found_list ); /* wipe old found_list */ | |
3100 found_list = tfound_list; /* move tfound_list in found_list */ | |
3101 regfree( ®ex ); | |
3102 } | |
3103 is_first_search = FALSE; | |
3104 } | |
3105 | |
3106 /* NOTE: action = 0 -> default behaviour, select all matching entries */ | |
3107 /* if some entries are still in found_list, those | |
3108 are what the user is searching for; select them */ | |
3109 for ( sel_list = found_list ; sel_list ; sel_list = g_list_next(sel_list) ) | |
3110 { | |
3111 PlaylistEntry *entry = sel_list->data; | |
3112 entry->selected = TRUE; | |
3113 num_of_entries_found++; | |
3114 } | |
3115 | |
3116 g_list_free( found_list ); | |
3117 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3118 PLAYLIST_UNLOCK(playlist); |
2313 | 3119 playlist_recalc_total_time(playlist); |
3120 | |
3121 return num_of_entries_found; | |
3122 } | |
3123 | |
3124 void | |
3125 playlist_select_all(Playlist *playlist, gboolean set) | |
3126 { | |
3127 GList *list; | |
3128 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3129 PLAYLIST_LOCK(playlist); |
2313 | 3130 |
3131 for (list = playlist->entries; list; list = g_list_next(list)) { | |
3132 PlaylistEntry *entry = list->data; | |
3133 entry->selected = set; | |
3134 } | |
3135 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3136 PLAYLIST_UNLOCK(playlist); |
2313 | 3137 playlist_recalc_total_time(playlist); |
3138 } | |
3139 | |
3140 void | |
3141 playlist_select_invert_all(Playlist *playlist) | |
3142 { | |
3143 GList *list; | |
3144 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3145 PLAYLIST_LOCK(playlist); |
2313 | 3146 |
3147 for (list = playlist->entries; list; list = g_list_next(list)) { | |
3148 PlaylistEntry *entry = list->data; | |
3149 entry->selected = !entry->selected; | |
3150 } | |
3151 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3152 PLAYLIST_UNLOCK(playlist); |
2313 | 3153 playlist_recalc_total_time(playlist); |
3154 } | |
3155 | |
3156 gboolean | |
3157 playlist_select_invert(Playlist *playlist, guint pos) | |
3158 { | |
3159 GList *list; | |
3160 gboolean invert_ok = FALSE; | |
3161 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3162 PLAYLIST_LOCK(playlist); |
2313 | 3163 |
3164 if ((list = g_list_nth(playlist->entries, pos))) { | |
3165 PlaylistEntry *entry = list->data; | |
3166 entry->selected = !entry->selected; | |
3167 invert_ok = TRUE; | |
3168 } | |
3169 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3170 PLAYLIST_UNLOCK(playlist); |
2313 | 3171 playlist_recalc_total_time(playlist); |
3172 | |
3173 return invert_ok; | |
3174 } | |
3175 | |
3176 | |
3177 void | |
3178 playlist_select_range(Playlist *playlist, gint min_pos, gint max_pos, gboolean select) | |
3179 { | |
3180 GList *list; | |
3181 gint i; | |
3182 | |
3183 if (min_pos > max_pos) | |
3184 SWAP(min_pos, max_pos); | |
3185 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3186 PLAYLIST_LOCK(playlist); |
2313 | 3187 |
3188 list = g_list_nth(playlist->entries, min_pos); | |
3189 for (i = min_pos; i <= max_pos && list; i++) { | |
3190 PlaylistEntry *entry = list->data; | |
3191 entry->selected = select; | |
3192 list = g_list_next(list); | |
3193 } | |
3194 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3195 PLAYLIST_UNLOCK(playlist); |
2313 | 3196 |
3197 playlist_recalc_total_time(playlist); | |
3198 } | |
3199 | |
3200 gboolean | |
3201 playlist_read_info_selection(Playlist *playlist) | |
3202 { | |
3203 GList *node; | |
3204 gboolean retval = FALSE; | |
3205 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3206 PLAYLIST_LOCK(playlist); |
2313 | 3207 |
3208 for (node = playlist->entries; node; node = g_list_next(node)) { | |
3209 PlaylistEntry *entry = node->data; | |
3210 if (!entry->selected) | |
3211 continue; | |
3212 | |
3213 retval = TRUE; | |
3214 | |
3215 str_replace_in(&entry->title, NULL); | |
3216 entry->length = -1; | |
3217 | |
3218 /* invalidate mtime to reread */ | |
3219 if (entry->tuple != NULL) | |
3490
602ec8c40d0d
Fixed to comply with the Tuple API changes.
Matti Hamalainen <ccr@tnsp.org>
parents:
3401
diff
changeset
|
3220 tuple_associate_int(entry->tuple, FIELD_MTIME, NULL, -1); /* -1 denotes "non-initialized". now 0 is for stream etc. yaz */ |
2313 | 3221 |
3222 if (!playlist_entry_get_info(entry)) { | |
3223 if (g_list_index(playlist->entries, entry) == -1) | |
3224 /* Entry disappeared while we looked it up. Restart. */ | |
3225 node = playlist->entries; | |
3226 } | |
3227 } | |
3228 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3229 PLAYLIST_UNLOCK(playlist); |
2313 | 3230 |
3231 playlistwin_update_list(playlist); | |
3232 playlist_recalc_total_time(playlist); | |
3233 | |
3234 return retval; | |
3235 } | |
3236 | |
3237 void | |
3238 playlist_read_info(Playlist *playlist, guint pos) | |
3239 { | |
3240 GList *node; | |
3241 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3242 PLAYLIST_LOCK(playlist); |
2313 | 3243 |
3244 if ((node = g_list_nth(playlist->entries, pos))) { | |
3245 PlaylistEntry *entry = node->data; | |
3246 str_replace_in(&entry->title, NULL); | |
3247 entry->length = -1; | |
3248 playlist_entry_get_info(entry); | |
3249 } | |
3250 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3251 PLAYLIST_UNLOCK(playlist); |
2313 | 3252 |
3253 playlistwin_update_list(playlist); | |
3254 playlist_recalc_total_time(playlist); | |
3255 } | |
3256 | |
3257 Playlist * | |
3258 playlist_get_active(void) | |
3259 { | |
3260 if (playlists_iter != NULL) | |
3261 return (Playlist *) playlists_iter->data; | |
3262 | |
2736 | 3263 if (playlists) |
3264 return (Playlist *) playlists->data; | |
3265 | |
3266 return NULL; | |
2313 | 3267 } |
3268 | |
3269 void | |
3270 playlist_set_shuffle(gboolean shuffle) | |
3271 { | |
3272 Playlist *playlist = playlist_get_active(); | |
3273 if (!playlist) | |
3274 return; | |
3275 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3276 PLAYLIST_LOCK(playlist); |
2313 | 3277 |
3278 playlist_position_before_jump = NULL; | |
3279 | |
3280 cfg.shuffle = shuffle; | |
3281 playlist_generate_shuffle_list_nolock(playlist); | |
3282 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3283 PLAYLIST_UNLOCK(playlist); |
2313 | 3284 } |
3285 | |
3286 Playlist * | |
3287 playlist_new(void) | |
3288 { | |
3289 Playlist *playlist = g_new0(Playlist, 1); | |
3290 playlist->mutex = g_mutex_new(); | |
3291 playlist->loading_playlist = FALSE; | |
3477
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
3292 playlist->title = NULL; |
57f4971b7086
New functions for associating a filename with a playlist. Made title/filename setting more consistent.
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3476
diff
changeset
|
3293 playlist->filename = NULL; |
2313 | 3294 playlist_clear(playlist); |
3295 | |
3296 return playlist; | |
3297 } | |
3298 | |
3299 void | |
3300 playlist_free(Playlist *playlist) | |
3301 { | |
3467
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
3302 if (!playlist) |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
3303 return; |
5a6896b6000f
Implement playlist_get_info_scanning() with mutex locking.
Matti Hamalainen <ccr@tnsp.org>
parents:
3460
diff
changeset
|
3304 |
2313 | 3305 g_mutex_free( playlist->mutex ); |
3306 g_free( playlist ); | |
3307 } | |
3308 | |
3309 Playlist * | |
3310 playlist_new_from_selected(void) | |
3311 { | |
3312 Playlist *newpl = playlist_new(); | |
3313 Playlist *playlist = playlist_get_active(); | |
3314 GList *list = playlist_get_selected(playlist); | |
3315 | |
3316 playlist_add_playlist( newpl ); | |
3317 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3318 PLAYLIST_LOCK(playlist); |
2313 | 3319 |
3320 while ( list != NULL ) | |
3321 { | |
3322 PlaylistEntry *entry = g_list_nth_data(playlist->entries, GPOINTER_TO_INT(list->data)); | |
3323 if ( entry->filename != NULL ) /* paranoid? oh well... */ | |
3324 playlist_add( newpl , entry->filename ); | |
3325 list = g_list_next(list); | |
3326 } | |
3327 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3328 PLAYLIST_UNLOCK(playlist); |
2313 | 3329 |
3330 playlist_recalc_total_time(newpl); | |
3331 playlistwin_update_list(playlist); | |
3621
2d6106656276
Notify playlist manager of more changes
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3583
diff
changeset
|
3332 playlist_manager_update(); |
2313 | 3333 |
3334 return newpl; | |
3335 } | |
3336 | |
3337 const gchar * | |
3338 playlist_get_filename_to_play(Playlist *playlist) | |
3339 { | |
3340 const gchar *filename = NULL; | |
3341 | |
3342 if (!playlist) | |
3343 return NULL; | |
3344 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3345 PLAYLIST_LOCK(playlist); |
2313 | 3346 |
3347 if (!playlist->position) { | |
3348 if (cfg.shuffle) | |
3349 playlist->position = playlist->shuffle->data; | |
3350 else | |
3351 playlist->position = playlist->entries->data; | |
3352 } | |
3353 | |
3354 filename = playlist->position->filename; | |
3355 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3356 PLAYLIST_UNLOCK(playlist); |
2313 | 3357 |
3358 return filename; | |
3359 } | |
3360 | |
3361 PlaylistEntry * | |
3362 playlist_get_entry_to_play(Playlist *playlist) | |
3363 { | |
3364 if (!playlist) | |
3365 return NULL; | |
3366 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3367 PLAYLIST_LOCK(playlist); |
2313 | 3368 |
3369 if (!playlist->position) { | |
3370 if (cfg.shuffle) | |
3371 playlist->position = playlist->shuffle->data; | |
3372 else | |
3373 playlist->position = playlist->entries->data; | |
3374 } | |
3375 | |
3468
440877c9360e
Changed PLAYLIST_{UN}LOCK() macros to use playlist itself as argument, not
Matti Hamalainen <ccr@tnsp.org>
parents:
3467
diff
changeset
|
3376 PLAYLIST_UNLOCK(playlist); |
2313 | 3377 |
3378 return playlist->position; | |
3379 } | |
3474
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3380 |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3381 gboolean |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3382 playlist_playlists_equal(Playlist *p1, Playlist *p2) |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3383 { |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3384 GList *l1, *l2; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3385 PlaylistEntry *e1, *e2; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3386 if (!p1 || !p2) return FALSE; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3387 l1 = p1->entries; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3388 l2 = p2->entries; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3389 do { |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3390 if (!l1 && !l2) break; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3391 if (!l1 || !l2) return FALSE; /* different length */ |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3392 e1 = (PlaylistEntry *) l1->data; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3393 e2 = (PlaylistEntry *) l2->data; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3394 if (strcmp(e1->filename, e2->filename) != 0) return FALSE; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3395 l1 = l1->next; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3396 l2 = l2->next; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3397 } while(1); |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3398 return TRUE; |
adc785ee517b
Add playlist_playlists_equal for comparing entire playlists
Kieran Clancy <clancy.kieran+audacious@gmail.com>
parents:
3473
diff
changeset
|
3399 } |