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