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