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