Mercurial > audlegacy
annotate src/audacious/util.c @ 4097:96194518173c
Fix memory leak in read_ini_string() (Bugzilla #24)
author | Jussi Judin <jjudin+audacious@iki.fi> |
---|---|
date | Wed, 19 Dec 2007 00:48:05 -0600 |
parents | 7e57ace6385a |
children | d217b71e5836 |
rev | line source |
---|---|
2313 | 1 /* Audacious - Cross-platform multimedia player |
2 * Copyright (C) 2005-2007 Audacious development team | |
3 * | |
4 * Based on BMP: | |
5 * Copyright (C) 2003-2004 BMP development team. | |
6 * | |
7 * Based on XMMS: | |
8 * Copyright (C) 1998-2003 XMMS development team. | |
9 * | |
10 * This program is free software; you can redistribute it and/or modify | |
11 * it under the terms of the GNU General Public License as published by | |
3121
3b6d316f8b09
GPL3 relicensing.
William Pitcock <nenolod@atheme-project.org>
parents:
3103
diff
changeset
|
12 * the Free Software Foundation; under version 3 of the License. |
2313 | 13 * |
14 * This program is distributed in the hope that it will be useful, | |
15 * but WITHOUT ANY WARRANTY; without even the implied warranty of | |
16 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | |
17 * GNU General Public License for more details. | |
18 * | |
19 * You should have received a copy of the GNU General Public License | |
3121
3b6d316f8b09
GPL3 relicensing.
William Pitcock <nenolod@atheme-project.org>
parents:
3103
diff
changeset
|
20 * 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:
3122
diff
changeset
|
21 * |
f1c756f39e6c
Invoke "Plugins are not derived work" clause provided by GPL3.
William Pitcock <nenolod@atheme-project.org>
parents:
3122
diff
changeset
|
22 * 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:
3122
diff
changeset
|
23 * Audacious or using our public API to be a derived work. |
2313 | 24 */ |
25 | |
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:
3993
diff
changeset
|
26 /* #define AUD_DEBUG 1 */ |
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:
3993
diff
changeset
|
27 |
2313 | 28 #ifdef HAVE_CONFIG_H |
29 # include "config.h" | |
30 #endif | |
31 | |
32 #include "util.h" | |
33 | |
34 #include <glib.h> | |
35 #include <glib/gi18n.h> | |
36 #include <gtk/gtk.h> | |
37 #include <stdlib.h> | |
38 #include <string.h> | |
39 #include <ctype.h> | |
40 | |
41 #include "platform/smartinclude.h" | |
42 #include <errno.h> | |
43 | |
44 #ifdef HAVE_FTS_H | |
3033 | 45 # include <sys/types.h> |
46 # include <sys/stat.h> | |
2313 | 47 # include <fts.h> |
48 #endif | |
49 | |
50 #include "input.h" | |
51 #include "main.h" | |
52 #include "playback.h" | |
2373
ad1d7687814c
[svn] made strings.h for existing strings.c, cleanups
mf0102
parents:
2365
diff
changeset
|
53 #include "strings.h" |
2313 | 54 #include "ui_playlist.h" |
55 | |
56 #ifdef USE_CHARDET | |
3210
5939941ba48b
More librcd removal.
William Pitcock <nenolod@atheme-project.org>
parents:
3123
diff
changeset
|
57 #include "../libguess/libguess.h" |
2313 | 58 #ifdef HAVE_UDET |
59 #include <libudet_c.h> | |
60 #endif | |
61 #endif | |
62 | |
63 /* | |
64 * find <file> in directory <dirname> or subdirectories. return | |
65 * pointer to complete filename which has to be freed by calling | |
66 * "g_free()" after use. Returns NULL if file could not be found. | |
67 */ | |
68 | |
69 typedef struct { | |
70 const gchar *to_match; | |
71 gchar *match; | |
72 gboolean found; | |
73 } FindFileContext; | |
74 | |
75 static gboolean | |
76 find_file_func(const gchar * path, const gchar * basename, gpointer data) | |
77 { | |
78 FindFileContext *context = data; | |
79 | |
80 if (strlen(path) > FILENAME_MAX) { | |
81 g_warning("Ignoring path: name too long (%s)", path); | |
82 return TRUE; | |
83 } | |
84 | |
2989
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
85 if (vfs_file_test(path, G_FILE_TEST_IS_REGULAR)) { |
2313 | 86 if (!strcasecmp(basename, context->to_match)) { |
87 context->match = g_strdup(path); | |
88 context->found = TRUE; | |
89 return TRUE; | |
90 } | |
91 } | |
2989
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
92 else if (vfs_file_test(path, G_FILE_TEST_IS_DIR)) { |
2313 | 93 dir_foreach(path, find_file_func, context, NULL); |
94 if (context->found) | |
95 return TRUE; | |
96 } | |
97 | |
98 return FALSE; | |
99 } | |
100 | |
101 gchar * | |
102 find_file_recursively(const gchar * path, const gchar * filename) | |
103 { | |
104 FindFileContext context; | |
2989
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
105 gchar *out = NULL; |
2313 | 106 |
107 context.to_match = filename; | |
108 context.match = NULL; | |
109 context.found = FALSE; | |
110 | |
111 dir_foreach(path, find_file_func, &context, NULL); | |
2989
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
112 |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
113 if (context.match) |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
114 { |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
115 out = g_filename_to_uri(context.match, NULL, NULL); |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
116 g_free(context.match); |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
117 } |
2988
43a075cb5c81
find_file_recursively(): Return a valid URI instead of a literal path.
William Pitcock <nenolod@atheme-project.org>
parents:
2977
diff
changeset
|
118 |
43a075cb5c81
find_file_recursively(): Return a valid URI instead of a literal path.
William Pitcock <nenolod@atheme-project.org>
parents:
2977
diff
changeset
|
119 return out; |
2313 | 120 } |
121 | |
2989
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
122 gchar * |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
123 find_path_recursively(const gchar * path, const gchar * filename) |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
124 { |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
125 FindFileContext context; |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
126 |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
127 context.to_match = filename; |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
128 context.match = NULL; |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
129 context.found = FALSE; |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
130 |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
131 dir_foreach(path, find_file_func, &context, NULL); |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
132 |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
133 return context.match; |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
134 } |
15f6c9949cde
Add and use find_path_recursively() which search the FS without using VFS (for GTK).
William Pitcock <nenolod@atheme-project.org>
parents:
2988
diff
changeset
|
135 |
2313 | 136 |
137 typedef enum { | |
138 ARCHIVE_UNKNOWN = 0, | |
139 ARCHIVE_DIR, | |
140 ARCHIVE_TAR, | |
141 ARCHIVE_TGZ, | |
142 ARCHIVE_ZIP, | |
143 ARCHIVE_TBZ2 | |
144 } ArchiveType; | |
145 | |
146 typedef gchar *(*ArchiveExtractFunc) (const gchar *, const gchar *); | |
147 | |
148 typedef struct { | |
149 ArchiveType type; | |
150 const gchar *ext; | |
151 } ArchiveExtensionType; | |
152 | |
153 static ArchiveExtensionType archive_extensions[] = { | |
154 {ARCHIVE_TAR, ".tar"}, | |
155 {ARCHIVE_ZIP, ".wsz"}, | |
156 {ARCHIVE_ZIP, ".zip"}, | |
157 {ARCHIVE_TGZ, ".tar.gz"}, | |
158 {ARCHIVE_TGZ, ".tgz"}, | |
159 {ARCHIVE_TBZ2, ".tar.bz2"}, | |
160 {ARCHIVE_TBZ2, ".bz2"}, | |
161 {ARCHIVE_UNKNOWN, NULL} | |
162 }; | |
163 | |
164 static gchar *archive_extract_tar(const gchar * archive, const gchar * dest); | |
165 static gchar *archive_extract_zip(const gchar * archive, const gchar * dest); | |
166 static gchar *archive_extract_tgz(const gchar * archive, const gchar * dest); | |
167 static gchar *archive_extract_tbz2(const gchar * archive, const gchar * dest); | |
168 | |
169 static ArchiveExtractFunc archive_extract_funcs[] = { | |
170 NULL, | |
171 NULL, | |
172 archive_extract_tar, | |
173 archive_extract_tgz, | |
174 archive_extract_zip, | |
175 archive_extract_tbz2 | |
176 }; | |
177 | |
178 | |
179 /* FIXME: these functions can be generalised into a function using a | |
180 * command lookup table */ | |
181 | |
182 static const gchar * | |
183 get_tar_command(void) | |
184 { | |
185 static const gchar *command = NULL; | |
186 | |
187 if (!command) { | |
188 if (!(command = getenv("TARCMD"))) | |
189 command = "tar"; | |
190 } | |
191 | |
192 return command; | |
193 } | |
194 | |
195 static const gchar * | |
196 get_unzip_command(void) | |
197 { | |
198 static const gchar *command = NULL; | |
199 | |
200 if (!command) { | |
201 if (!(command = getenv("UNZIPCMD"))) | |
202 command = "unzip"; | |
203 } | |
204 | |
205 return command; | |
206 } | |
207 | |
208 | |
209 static gchar * | |
210 archive_extract_tar(const gchar * archive, const gchar * dest) | |
211 { | |
212 return g_strdup_printf("%s >/dev/null xf \"%s\" -C %s", | |
213 get_tar_command(), archive, dest); | |
214 } | |
215 | |
216 static gchar * | |
217 archive_extract_zip(const gchar * archive, const gchar * dest) | |
218 { | |
219 return g_strdup_printf("%s >/dev/null -o -j \"%s\" -d %s", | |
220 get_unzip_command(), archive, dest); | |
221 } | |
222 | |
223 static gchar * | |
224 archive_extract_tgz(const gchar * archive, const gchar * dest) | |
225 { | |
226 return g_strdup_printf("%s >/dev/null xzf \"%s\" -C %s", | |
227 get_tar_command(), archive, dest); | |
228 } | |
229 | |
230 static gchar * | |
231 archive_extract_tbz2(const gchar * archive, const gchar * dest) | |
232 { | |
233 return g_strdup_printf("bzip2 -dc \"%s\" | %s >/dev/null xf - -C %s", | |
234 archive, get_tar_command(), dest); | |
235 } | |
236 | |
237 | |
238 ArchiveType | |
239 archive_get_type(const gchar * filename) | |
240 { | |
241 gint i = 0; | |
242 | |
243 if (g_file_test(filename, G_FILE_TEST_IS_DIR)) | |
244 return ARCHIVE_DIR; | |
245 | |
246 while (archive_extensions[i].ext) { | |
247 if (g_str_has_suffix(filename, archive_extensions[i].ext)) { | |
248 return archive_extensions[i].type; | |
249 } | |
250 i++; | |
251 } | |
252 | |
253 return ARCHIVE_UNKNOWN; | |
254 } | |
255 | |
256 gboolean | |
257 file_is_archive(const gchar * filename) | |
258 { | |
259 return (archive_get_type(filename) > ARCHIVE_DIR); | |
260 } | |
261 | |
262 gchar * | |
263 archive_basename(const gchar * str) | |
264 { | |
265 gint i = 0; | |
266 | |
267 while (archive_extensions[i].ext) { | |
268 if (str_has_suffix_nocase(str, archive_extensions[i].ext)) { | |
269 const gchar *end = g_strrstr(str, archive_extensions[i].ext); | |
270 if (end) { | |
271 return g_strndup(str, end - str); | |
272 } | |
273 break; | |
274 } | |
275 i++; | |
276 } | |
277 | |
278 return NULL; | |
279 } | |
280 | |
281 /* | |
282 decompress_archive | |
283 | |
284 Decompresses the archive "filename" to a temporary directory, | |
285 returns the path to the temp dir, or NULL if failed, | |
286 watch out tho, doesn't actually check if the system command succeeds :-| | |
287 */ | |
288 | |
289 gchar * | |
290 archive_decompress(const gchar * filename) | |
291 { | |
292 gchar *tmpdir, *cmd, *escaped_filename; | |
293 ArchiveType type; | |
2328 | 294 #ifndef HAVE_MKDTEMP |
2313 | 295 mode_t mode755 = S_IRWXU | S_IRGRP | S_IXGRP | S_IROTH | S_IXOTH; |
2328 | 296 #endif |
2313 | 297 |
298 if ((type = archive_get_type(filename)) <= ARCHIVE_DIR) | |
299 return NULL; | |
300 | |
301 #ifdef HAVE_MKDTEMP | |
302 tmpdir = g_build_filename(g_get_tmp_dir(), "audacious.XXXXXXXX", NULL); | |
303 if (!mkdtemp(tmpdir)) { | |
304 g_free(tmpdir); | |
305 g_message("Unable to load skin: Failed to create temporary " | |
306 "directory: %s", g_strerror(errno)); | |
307 return NULL; | |
308 } | |
309 #else | |
3637 | 310 tmpdir = g_strdup_printf("%s/audacious.%ld", g_get_tmp_dir(), (long) rand()); |
2313 | 311 make_directory(tmpdir, mode755); |
312 #endif | |
313 | |
314 escaped_filename = escape_shell_chars(filename); | |
315 cmd = archive_extract_funcs[type] (escaped_filename, tmpdir); | |
316 g_free(escaped_filename); | |
317 | |
318 if (!cmd) { | |
319 g_message("extraction function is NULL!"); | |
320 g_free(tmpdir); | |
321 return NULL; | |
322 } | |
323 | |
2361
f24ae4f40e29
[svn] - security and warning fixes from ssommer@suse
nenolod
parents:
2332
diff
changeset
|
324 if(system(cmd) == -1) |
f24ae4f40e29
[svn] - security and warning fixes from ssommer@suse
nenolod
parents:
2332
diff
changeset
|
325 { |
f24ae4f40e29
[svn] - security and warning fixes from ssommer@suse
nenolod
parents:
2332
diff
changeset
|
326 g_message("could not execute cmd %s",cmd); |
f24ae4f40e29
[svn] - security and warning fixes from ssommer@suse
nenolod
parents:
2332
diff
changeset
|
327 g_free(cmd); |
f24ae4f40e29
[svn] - security and warning fixes from ssommer@suse
nenolod
parents:
2332
diff
changeset
|
328 return NULL; |
f24ae4f40e29
[svn] - security and warning fixes from ssommer@suse
nenolod
parents:
2332
diff
changeset
|
329 } |
2313 | 330 g_free(cmd); |
331 | |
332 return tmpdir; | |
333 } | |
334 | |
335 | |
336 #ifdef HAVE_FTS_H | |
337 | |
338 void | |
339 del_directory(const gchar * dirname) | |
340 { | |
341 gchar *const argv[2] = { (gchar *) dirname, NULL }; | |
342 FTS *fts; | |
343 FTSENT *p; | |
344 | |
345 fts = fts_open(argv, FTS_PHYSICAL, (gint(*)())NULL); | |
346 while ((p = fts_read(fts))) { | |
347 switch (p->fts_info) { | |
348 case FTS_D: | |
349 break; | |
350 case FTS_DNR: | |
351 case FTS_ERR: | |
352 break; | |
353 case FTS_DP: | |
354 rmdir(p->fts_accpath); | |
355 break; | |
356 default: | |
357 unlink(p->fts_accpath); | |
358 break; | |
359 } | |
360 } | |
361 fts_close(fts); | |
362 } | |
363 | |
364 #else /* !HAVE_FTS */ | |
365 | |
366 gboolean | |
367 del_directory_func(const gchar * path, const gchar * basename, | |
368 gpointer params) | |
369 { | |
370 if (!strcmp(basename, ".") || !strcmp(path, "..")) | |
371 return FALSE; | |
372 | |
373 if (g_file_test(path, G_FILE_TEST_IS_DIR)) { | |
374 dir_foreach(path, del_directory_func, NULL, NULL); | |
375 rmdir(path); | |
376 return FALSE; | |
377 } | |
378 | |
379 unlink(path); | |
380 | |
381 return FALSE; | |
382 } | |
383 | |
384 void | |
385 del_directory(const gchar * path) | |
386 { | |
387 dir_foreach(path, del_directory_func, NULL, NULL); | |
388 rmdir(path); | |
389 } | |
390 | |
391 #endif /* ifdef HAVE_FTS */ | |
392 | |
2529 | 393 static void |
394 strip_string(GString *string) | |
395 { | |
396 while (string->len > 0 && string->str[0] == ' ') | |
397 g_string_erase(string, 0, 1); | |
398 | |
399 while (string->len > 0 && string->str[string->len - 1] == ' ') | |
400 g_string_erase(string, string->len - 1, 1); | |
401 } | |
402 | |
403 static void | |
404 strip_lower_string(GString *string) | |
405 { | |
2660
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
406 gchar *lower; |
2529 | 407 strip_string(string); |
2609 | 408 |
2660
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
409 lower = g_ascii_strdown(string->str, -1); |
2529 | 410 g_free(string->str); |
411 string->str = lower; | |
412 } | |
413 | |
414 INIFile * | |
415 open_ini_file(const gchar *filename) | |
2313 | 416 { |
2529 | 417 GHashTable *ini_file = g_hash_table_new(NULL, NULL); |
418 GHashTable *section = g_hash_table_new(NULL, NULL); | |
419 GString *section_name, *key_name, *value; | |
420 gpointer section_hash, key_hash; | |
421 gchar *buffer = NULL; | |
2313 | 422 gsize off = 0; |
2529 | 423 gsize filesize = 0; |
424 | |
2313 | 425 unsigned char x[] = { 0xff, 0xfe, 0x00 }; |
2529 | 426 |
427 | |
428 g_return_val_if_fail(filename, NULL); | |
429 | |
430 section_name = g_string_new(""); | |
431 key_name = g_string_new(NULL); | |
432 value = g_string_new(NULL); | |
2313 | 433 |
2529 | 434 /* make a nameless section which should store all entries that are not |
435 * embedded in a section */ | |
436 section_hash = GINT_TO_POINTER(g_string_hash(section_name)); | |
437 g_hash_table_insert(ini_file, section_hash, section); | |
438 | |
439 vfs_file_get_contents(filename, &buffer, &filesize); | |
440 if (buffer == NULL) | |
2313 | 441 return NULL; |
442 | |
443 | |
444 /* | |
445 * Convert UTF-16 into something useful. Original implementation | |
446 * by incomp@#audacious. Cleanups \nenolod | |
2529 | 447 * FIXME: can't we use a GLib function for that? -- 01mf02 |
2313 | 448 */ |
2607
65543c999c7e
[svn] Check filesize before doing memcmp (potential sigsegv).
hansmi
parents:
2556
diff
changeset
|
449 if (filesize > 2 && !memcmp(&buffer[0],&x,2)) |
2529 | 450 { |
451 gchar *outbuf = g_malloc (filesize); /* it's safe to waste memory. */ | |
452 guint counter; | |
2313 | 453 |
454 for (counter = 2; counter < filesize; counter += 2) | |
2529 | 455 { |
2313 | 456 if (!memcmp(&buffer[counter+1], &x[2], 1)) |
457 outbuf[(counter-2)/2] = buffer[counter]; | |
458 else | |
2529 | 459 return NULL; |
460 } | |
2313 | 461 |
462 outbuf[(counter-2)/2] = '\0'; | |
463 | |
2529 | 464 if ((filesize - 2) / 2 == (counter - 2) / 2) |
465 { | |
2313 | 466 g_free(buffer); |
467 buffer = outbuf; | |
2529 | 468 } |
469 else | |
470 { | |
2313 | 471 g_free(outbuf); |
2529 | 472 return NULL; /* XXX wrong encoding */ |
2313 | 473 } |
474 } | |
475 | |
2529 | 476 while (off < filesize) |
477 { | |
478 /* ignore the following characters */ | |
479 if (buffer[off] == '\r' || buffer[off] == '\n' || | |
480 buffer[off] == ' ' || buffer[off] == '\t') | |
481 { | |
482 if (buffer[off] == '\n') | |
483 { | |
484 g_string_free(key_name, TRUE); | |
4095
7e57ace6385a
Fix memory leak in open_ini_file() function. (Bugzilla #17)
Jussi Judin <jjudin+audacious@iki.fi>
parents:
4073
diff
changeset
|
485 g_string_free(value, TRUE); |
2529 | 486 key_name = g_string_new(NULL); |
487 value = g_string_new(NULL); | |
488 } | |
489 | |
490 off++; | |
491 continue; | |
492 } | |
493 | |
494 /* if we encounter a possible section statement */ | |
495 if (buffer[off] == '[') | |
496 { | |
497 g_string_free(section_name, TRUE); | |
498 section_name = g_string_new(NULL); | |
2313 | 499 off++; |
2529 | 500 |
501 if (off >= filesize) | |
502 goto return_sequence; | |
503 | |
504 while (buffer[off] != ']') | |
505 { | |
506 /* if the section statement has not been closed before a | |
507 * linebreak */ | |
508 if (buffer[off] == '\n') | |
509 break; | |
510 | |
511 g_string_append_c(section_name, buffer[off]); | |
512 off++; | |
513 if (off >= filesize) | |
514 goto return_sequence; | |
515 } | |
516 if (buffer[off] == '\n') | |
517 continue; | |
518 if (buffer[off] == ']') | |
519 { | |
520 off++; | |
521 if (off >= filesize) | |
522 goto return_sequence; | |
523 | |
524 strip_lower_string(section_name); | |
525 section_hash = GINT_TO_POINTER(g_string_hash(section_name)); | |
526 | |
527 /* if this section already exists, we don't make a new one, | |
528 * but reuse the old one */ | |
529 if (g_hash_table_lookup(ini_file, section_hash) != NULL) | |
530 section = g_hash_table_lookup(ini_file, section_hash); | |
531 else | |
532 { | |
533 section = g_hash_table_new(NULL, NULL); | |
534 g_hash_table_insert(ini_file, section_hash, section); | |
2313 | 535 } |
2529 | 536 |
537 continue; | |
2313 | 538 } |
539 } | |
2529 | 540 |
541 if (buffer[off] == '=') | |
542 { | |
543 off++; | |
2313 | 544 if (off >= filesize) |
2529 | 545 goto return_sequence; |
546 | |
2556 | 547 while (buffer[off] != '\n' && buffer[off] != '\r') |
2529 | 548 { |
549 g_string_append_c(value, buffer[off]); | |
2313 | 550 off++; |
551 if (off >= filesize) | |
552 break; | |
553 } | |
2529 | 554 |
555 strip_lower_string(key_name); | |
556 key_hash = GINT_TO_POINTER(g_string_hash(key_name)); | |
557 strip_string(value); | |
558 | |
559 if (key_name->len > 0 && value->len > 0) | |
2609 | 560 g_hash_table_insert(section, key_hash, g_strdup(value->str)); |
2313 | 561 } |
2529 | 562 else |
563 { | |
564 g_string_append_c(key_name, buffer[off]); | |
2313 | 565 off++; |
2529 | 566 if (off >= filesize) |
567 goto return_sequence; | |
568 } | |
2313 | 569 } |
570 | |
2529 | 571 return_sequence: |
572 g_string_free(section_name, TRUE); | |
573 g_string_free(key_name, TRUE); | |
574 g_string_free(value, TRUE); | |
575 g_free(buffer); | |
576 return ini_file; | |
577 } | |
578 | |
579 void | |
580 close_ini_file(INIFile *inifile) | |
581 { | |
582 g_return_if_fail(inifile); | |
583 | |
584 /* we don't have to destroy anything in the hash table manually, as the | |
585 * keys are represented as integers and the string values may be used in | |
586 * functions which have read the strings from the hash table | |
587 */ | |
588 g_hash_table_destroy(inifile); | |
589 } | |
590 | |
591 gchar * | |
592 read_ini_string(INIFile *inifile, const gchar *section, const gchar *key) | |
593 { | |
2660
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
594 GString *section_string; |
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
595 GString *key_string; |
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
596 gchar *value = NULL; |
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
597 gpointer section_hash, key_hash; |
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
598 GHashTable *section_table; |
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
599 |
2529 | 600 g_return_val_if_fail(inifile, NULL); |
601 | |
2660
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
602 section_string = g_string_new(section); |
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
603 key_string = g_string_new(key); |
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
604 value = NULL; |
2529 | 605 |
606 strip_lower_string(section_string); | |
607 strip_lower_string(key_string); | |
2660
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
608 section_hash = GINT_TO_POINTER(g_string_hash(section_string)); |
8d0b89db56e5
[svn] - fixed c++ish declaration in a c file (part 7)
giacomo
parents:
2635
diff
changeset
|
609 key_hash = GINT_TO_POINTER(g_string_hash(key_string)); |
4097
96194518173c
Fix memory leak in read_ini_string() (Bugzilla #24)
Jussi Judin <jjudin+audacious@iki.fi>
parents:
4095
diff
changeset
|
610 section_table = g_hash_table_lookup(inifile, section_hash); |
2529 | 611 |
4097
96194518173c
Fix memory leak in read_ini_string() (Bugzilla #24)
Jussi Judin <jjudin+audacious@iki.fi>
parents:
4095
diff
changeset
|
612 if (section_table) { |
96194518173c
Fix memory leak in read_ini_string() (Bugzilla #24)
Jussi Judin <jjudin+audacious@iki.fi>
parents:
4095
diff
changeset
|
613 value = g_hash_table_lookup(section_table, GINT_TO_POINTER(key_hash)); |
96194518173c
Fix memory leak in read_ini_string() (Bugzilla #24)
Jussi Judin <jjudin+audacious@iki.fi>
parents:
4095
diff
changeset
|
614 } |
2529 | 615 |
4097
96194518173c
Fix memory leak in read_ini_string() (Bugzilla #24)
Jussi Judin <jjudin+audacious@iki.fi>
parents:
4095
diff
changeset
|
616 g_string_free(section_string, TRUE); |
96194518173c
Fix memory leak in read_ini_string() (Bugzilla #24)
Jussi Judin <jjudin+audacious@iki.fi>
parents:
4095
diff
changeset
|
617 g_string_free(key_string, TRUE); |
96194518173c
Fix memory leak in read_ini_string() (Bugzilla #24)
Jussi Judin <jjudin+audacious@iki.fi>
parents:
4095
diff
changeset
|
618 |
96194518173c
Fix memory leak in read_ini_string() (Bugzilla #24)
Jussi Judin <jjudin+audacious@iki.fi>
parents:
4095
diff
changeset
|
619 g_return_val_if_fail(value, NULL); |
2529 | 620 return value; |
2313 | 621 } |
622 | |
623 GArray * | |
2529 | 624 read_ini_array(INIFile *inifile, const gchar *section, const gchar *key) |
2514
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
625 { |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
626 gchar *temp; |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
627 GArray *a; |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
628 |
2529 | 629 g_return_val_if_fail((temp = read_ini_string(inifile, section, key)), NULL); |
630 | |
2514
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
631 a = string_to_garray(temp); |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
632 g_free(temp); |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
633 return a; |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
634 } |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
635 |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
636 GArray * |
2313 | 637 string_to_garray(const gchar * str) |
638 { | |
639 GArray *array; | |
640 gint temp; | |
641 const gchar *ptr = str; | |
642 gchar *endptr; | |
643 | |
644 array = g_array_new(FALSE, TRUE, sizeof(gint)); | |
645 for (;;) { | |
646 temp = strtol(ptr, &endptr, 10); | |
647 if (ptr == endptr) | |
648 break; | |
649 g_array_append_val(array, temp); | |
650 ptr = endptr; | |
651 while (!isdigit((int) *ptr) && (*ptr) != '\0') | |
652 ptr++; | |
653 if (*ptr == '\0') | |
654 break; | |
655 } | |
656 return (array); | |
657 } | |
658 | |
659 void | |
660 glist_movedown(GList * list) | |
661 { | |
662 gpointer temp; | |
663 | |
664 if (g_list_next(list)) { | |
665 temp = list->data; | |
666 list->data = list->next->data; | |
667 list->next->data = temp; | |
668 } | |
669 } | |
670 | |
671 void | |
672 glist_moveup(GList * list) | |
673 { | |
674 gpointer temp; | |
675 | |
676 if (g_list_previous(list)) { | |
677 temp = list->data; | |
678 list->data = list->prev->data; | |
679 list->prev->data = temp; | |
680 } | |
681 } | |
682 | |
683 | |
684 void | |
685 util_menu_position(GtkMenu * menu, gint * x, gint * y, | |
686 gboolean * push_in, gpointer data) | |
687 { | |
688 GtkRequisition requisition; | |
689 gint screen_width; | |
690 gint screen_height; | |
691 MenuPos *pos = data; | |
692 | |
693 gtk_widget_size_request(GTK_WIDGET(menu), &requisition); | |
694 | |
695 screen_width = gdk_screen_width(); | |
696 screen_height = gdk_screen_height(); | |
697 | |
698 *x = CLAMP(pos->x - 2, 0, MAX(0, screen_width - requisition.width)); | |
699 *y = CLAMP(pos->y - 2, 0, MAX(0, screen_height - requisition.height)); | |
700 } | |
701 | |
702 GdkFont * | |
703 util_font_load(const gchar * name) | |
704 { | |
705 GdkFont *font; | |
706 PangoFontDescription *desc; | |
707 | |
708 desc = pango_font_description_from_string(name); | |
709 font = gdk_font_from_description(desc); | |
710 | |
711 return font; | |
712 } | |
713 | |
714 /* text_get_extents() taken from The GIMP (C) Spencer Kimball, Peter | |
715 * Mattis et al */ | |
716 gboolean | |
717 text_get_extents(const gchar * fontname, | |
718 const gchar * text, | |
719 gint * width, gint * height, gint * ascent, gint * descent) | |
720 { | |
721 PangoFontDescription *font_desc; | |
722 PangoLayout *layout; | |
723 PangoRectangle rect; | |
724 | |
725 g_return_val_if_fail(fontname != NULL, FALSE); | |
726 g_return_val_if_fail(text != NULL, FALSE); | |
727 | |
728 /* FIXME: resolution */ | |
729 layout = gtk_widget_create_pango_layout(GTK_WIDGET(mainwin), text); | |
730 | |
731 font_desc = pango_font_description_from_string(fontname); | |
732 pango_layout_set_font_description(layout, font_desc); | |
733 pango_font_description_free(font_desc); | |
734 pango_layout_get_pixel_extents(layout, NULL, &rect); | |
735 | |
736 if (width) | |
737 *width = rect.width; | |
738 if (height) | |
739 *height = rect.height; | |
740 | |
741 if (ascent || descent) { | |
742 PangoLayoutIter *iter; | |
743 PangoLayoutLine *line; | |
744 | |
745 iter = pango_layout_get_iter(layout); | |
746 line = pango_layout_iter_get_line(iter); | |
747 pango_layout_iter_free(iter); | |
748 | |
749 pango_layout_line_get_pixel_extents(line, NULL, &rect); | |
750 | |
751 if (ascent) | |
752 *ascent = PANGO_ASCENT(rect); | |
753 if (descent) | |
754 *descent = -PANGO_DESCENT(rect); | |
755 } | |
756 | |
757 g_object_unref(layout); | |
758 | |
759 return TRUE; | |
760 } | |
761 | |
762 /* counts number of digits in a gint */ | |
763 guint | |
764 gint_count_digits(gint n) | |
765 { | |
766 guint count = 0; | |
767 | |
768 n = ABS(n); | |
769 do { | |
770 count++; | |
771 n /= 10; | |
772 } while (n > 0); | |
773 | |
774 return count; | |
775 } | |
776 | |
777 gboolean | |
778 dir_foreach(const gchar * path, DirForeachFunc function, | |
779 gpointer user_data, GError ** error) | |
780 { | |
781 GError *error_out = NULL; | |
782 GDir *dir; | |
783 const gchar *entry; | |
784 gchar *entry_fullpath; | |
785 | |
786 if (!(dir = g_dir_open(path, 0, &error_out))) { | |
787 g_propagate_error(error, error_out); | |
788 return FALSE; | |
789 } | |
790 | |
791 while ((entry = g_dir_read_name(dir))) { | |
792 entry_fullpath = g_build_filename(path, entry, NULL); | |
793 | |
794 if ((*function) (entry_fullpath, entry, user_data)) { | |
795 g_free(entry_fullpath); | |
796 break; | |
797 } | |
798 | |
799 g_free(entry_fullpath); | |
800 } | |
801 | |
802 g_dir_close(dir); | |
803 | |
804 return TRUE; | |
805 } | |
806 | |
807 GtkWidget * | |
2514
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
808 make_filebrowser(const gchar *title, gboolean save) |
2313 | 809 { |
810 GtkWidget *dialog; | |
811 GtkWidget *button; | |
812 | |
813 g_return_val_if_fail(title != NULL, NULL); | |
814 | |
815 dialog = gtk_file_chooser_dialog_new(title, GTK_WINDOW(mainwin), | |
2514
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
816 save ? |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
817 GTK_FILE_CHOOSER_ACTION_SAVE : |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
818 GTK_FILE_CHOOSER_ACTION_OPEN, |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
819 NULL, NULL); |
2313 | 820 |
2514
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
821 button = gtk_dialog_add_button(GTK_DIALOG(dialog), GTK_STOCK_CANCEL, |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
822 GTK_RESPONSE_REJECT); |
2313 | 823 |
2514
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
824 gtk_button_set_use_stock(GTK_BUTTON(button), TRUE); |
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
825 GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); |
2313 | 826 |
827 button = gtk_dialog_add_button(GTK_DIALOG(dialog), save ? | |
828 GTK_STOCK_SAVE : GTK_STOCK_OPEN, | |
829 GTK_RESPONSE_ACCEPT); | |
2514
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
830 |
2313 | 831 gtk_button_set_use_stock(GTK_BUTTON(button), TRUE); |
2514
7934ac463591
[svn] - removed unused function bmp_menu_translate()
mf0102
parents:
2494
diff
changeset
|
832 gtk_dialog_set_default_response(GTK_DIALOG(dialog), GTK_RESPONSE_ACCEPT); |
2635 | 833 gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); /* centering */ |
2313 | 834 |
835 return dialog; | |
836 } | |
837 | |
838 /* | |
839 * Resizes a GDK pixmap. | |
840 */ | |
841 GdkPixmap *audacious_pixmap_resize(GdkWindow *src, GdkGC *src_gc, GdkPixmap *in, gint width, gint height) | |
842 { | |
2402 | 843 GdkPixmap *out; |
844 gint owidth, oheight; | |
2313 | 845 |
2402 | 846 g_return_val_if_fail(src != NULL, NULL); |
847 g_return_val_if_fail(src_gc != NULL, NULL); | |
848 g_return_val_if_fail(in != NULL, NULL); | |
849 g_return_val_if_fail(width > 0 && height > 0, NULL); | |
2313 | 850 |
2402 | 851 gdk_drawable_get_size(in, &owidth, &oheight); |
2313 | 852 |
2402 | 853 if (oheight == height && owidth == width) |
854 return NULL; | |
2313 | 855 |
2402 | 856 out = gdk_pixmap_new(src, width, height, -1); |
2313 | 857 |
2402 | 858 gdk_draw_rectangle(out, src_gc, TRUE, 0, 0, width, height); |
2313 | 859 |
2402 | 860 gdk_window_copy_area(out, src_gc, 0, 0, in, 0, 0, owidth, oheight); |
861 g_object_unref(src); | |
2313 | 862 |
2402 | 863 return out; |
2313 | 864 } |
865 | |
3077
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
866 GdkPixmap *create_dblsize_pixmap(GdkPixmap *pix) { |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
867 int w, h; |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
868 gdk_drawable_get_size(pix, &w, &h); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
869 GdkGC* gc = gdk_gc_new(pix); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
870 GdkPixbuf *img, *img2x; |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
871 GdkColormap *colormap = gdk_colormap_get_system(); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
872 img = gdk_pixbuf_new(GDK_COLORSPACE_RGB, FALSE, 8, w, h); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
873 gdk_pixbuf_get_from_drawable(img, pix, colormap, 0, 0, 0, 0, w, h); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
874 img2x = gdk_pixbuf_scale_simple(img, w*2, h*2, GDK_INTERP_NEAREST); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
875 |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
876 GdkPixmap *image; |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
877 image = gdk_pixmap_new(NULL, w*2, h*2, gdk_rgb_get_visual()->depth); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
878 gdk_draw_pixbuf(image, gc, img2x, 0, 0, 0, 0, w*2, h*2, GDK_RGB_DITHER_NONE, 0, 0); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
879 g_object_unref(img); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
880 g_object_unref(img2x); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
881 g_object_unref(gc); |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
882 return image; |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
883 } |
4b076ad636e6
use GdkPixmaps for doublesizing
Tomasz Mon <desowin@gmail.com>
parents:
3033
diff
changeset
|
884 |
2421
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
885 /** |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
886 * xmms_show_message: |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
887 * @title: The title of the message to show. |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
888 * @text: The text of the message to show. |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
889 * @button_text: The text of the button which will close the messagebox. |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
890 * @modal: Whether or not the messagebox should be modal. |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
891 * @button_action: Code to execute on when the messagebox is closed, or %NULL. |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
892 * @action_data: Optional opaque data to pass to @button_action. |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
893 * |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
894 * Displays a message box. |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
895 * |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
896 * Return value: A GTK widget handle for the message box. |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
897 **/ |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
898 GtkWidget * |
3731
0e5da33a32b7
fun util dialog shit -> vtable
William Pitcock <nenolod@atheme.org>
parents:
3730
diff
changeset
|
899 util_info_dialog(const gchar * title, const gchar * text, |
0e5da33a32b7
fun util dialog shit -> vtable
William Pitcock <nenolod@atheme.org>
parents:
3730
diff
changeset
|
900 const gchar * button_text, gboolean modal, |
0e5da33a32b7
fun util dialog shit -> vtable
William Pitcock <nenolod@atheme.org>
parents:
3730
diff
changeset
|
901 GCallback button_action, gpointer action_data) |
2421
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
902 { |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
903 GtkWidget *dialog; |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
904 GtkWidget *dialog_vbox, *dialog_hbox, *dialog_bbox; |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
905 GtkWidget *dialog_bbox_b1; |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
906 GtkWidget *dialog_textlabel; |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
907 GtkWidget *dialog_icon; |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
908 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
909 dialog = gtk_window_new(GTK_WINDOW_TOPLEVEL); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
910 gtk_window_set_type_hint( GTK_WINDOW(dialog) , GDK_WINDOW_TYPE_HINT_DIALOG ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
911 gtk_window_set_modal( GTK_WINDOW(dialog) , modal ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
912 gtk_window_set_title( GTK_WINDOW(dialog) , title ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
913 gtk_container_set_border_width( GTK_CONTAINER(dialog) , 10 ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
914 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
915 dialog_vbox = gtk_vbox_new( FALSE , 0 ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
916 dialog_hbox = gtk_hbox_new( FALSE , 0 ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
917 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
918 /* icon */ |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
919 dialog_icon = gtk_image_new_from_stock( GTK_STOCK_DIALOG_INFO , GTK_ICON_SIZE_DIALOG ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
920 gtk_box_pack_start( GTK_BOX(dialog_hbox) , dialog_icon , FALSE , FALSE , 2 ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
921 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
922 /* label */ |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
923 dialog_textlabel = gtk_label_new( text ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
924 /* gtk_label_set_selectable( GTK_LABEL(dialog_textlabel) , TRUE ); */ |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
925 gtk_box_pack_start( GTK_BOX(dialog_hbox) , dialog_textlabel , TRUE , TRUE , 2 ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
926 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
927 gtk_box_pack_start( GTK_BOX(dialog_vbox) , dialog_hbox , FALSE , FALSE , 2 ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
928 gtk_box_pack_start( GTK_BOX(dialog_vbox) , gtk_hseparator_new() , FALSE , FALSE , 4 ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
929 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
930 dialog_bbox = gtk_hbutton_box_new(); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
931 gtk_button_box_set_layout( GTK_BUTTON_BOX(dialog_bbox) , GTK_BUTTONBOX_END ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
932 dialog_bbox_b1 = gtk_button_new_with_label( button_text ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
933 g_signal_connect_swapped( G_OBJECT(dialog_bbox_b1) , "clicked" , |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
934 G_CALLBACK(gtk_widget_destroy) , dialog ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
935 if ( button_action ) |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
936 g_signal_connect( G_OBJECT(dialog_bbox_b1) , "clicked" , |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
937 button_action , action_data ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
938 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
939 gtk_container_add( GTK_CONTAINER(dialog_bbox) , dialog_bbox_b1 ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
940 gtk_box_pack_start( GTK_BOX(dialog_vbox) , dialog_bbox , FALSE , FALSE , 0 ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
941 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
942 gtk_container_add( GTK_CONTAINER(dialog) , dialog_vbox ); |
3120
3262bf0b8831
Moving gtk_widget_grab_default() below gtk_container_add() to avoid this
Christian Birchinger <joker@netswarm.net>
parents:
3103
diff
changeset
|
943 |
3262bf0b8831
Moving gtk_widget_grab_default() below gtk_container_add() to avoid this
Christian Birchinger <joker@netswarm.net>
parents:
3103
diff
changeset
|
944 GTK_WIDGET_SET_FLAGS( dialog_bbox_b1 , GTK_CAN_DEFAULT); |
3262bf0b8831
Moving gtk_widget_grab_default() below gtk_container_add() to avoid this
Christian Birchinger <joker@netswarm.net>
parents:
3103
diff
changeset
|
945 gtk_widget_grab_default( dialog_bbox_b1 ); |
3262bf0b8831
Moving gtk_widget_grab_default() below gtk_container_add() to avoid this
Christian Birchinger <joker@netswarm.net>
parents:
3103
diff
changeset
|
946 |
2421
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
947 gtk_widget_show_all(dialog); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
948 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
949 return dialog; |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
950 } |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
951 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
952 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
953 /** |
3757
d24d28e76588
export util_get_localdir().
William Pitcock <nenolod@atheme.org>
parents:
3731
diff
changeset
|
954 * util_get_localdir: |
2421
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
955 * |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
956 * Returns a string with the full path of Audacious local datadir (where config files are placed). |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
957 * It's useful in order to put in the right place custom config files for audacious plugins. |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
958 * |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
959 * Return value: a string with full path of Audacious local datadir (should be freed after use) |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
960 **/ |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
961 gchar* |
3757
d24d28e76588
export util_get_localdir().
William Pitcock <nenolod@atheme.org>
parents:
3731
diff
changeset
|
962 util_get_localdir(void) |
2421
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
963 { |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
964 gchar *datadir; |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
965 gchar *tmp; |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
966 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
967 if ( (tmp = getenv("XDG_CONFIG_HOME")) == NULL ) |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
968 datadir = g_build_filename( g_get_home_dir() , ".config" , "audacious" , NULL ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
969 else |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
970 datadir = g_build_filename( tmp , "audacious" , NULL ); |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
971 |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
972 return datadir; |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
973 } |
74ec16ef847b
[svn] - fix accidental removal of xmms_show_message
nenolod
parents:
2416
diff
changeset
|
974 |
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:
3993
diff
changeset
|
975 |
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:
3993
diff
changeset
|
976 gchar * |
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:
3993
diff
changeset
|
977 construct_uri(gchar *string, const gchar *playlist_name) // uri, path and anything 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:
3993
diff
changeset
|
978 { |
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:
3993
diff
changeset
|
979 gchar *filename = g_strdup(string); |
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:
3993
diff
changeset
|
980 gchar *tmp, *path; |
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:
3993
diff
changeset
|
981 gchar *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:
3993
diff
changeset
|
982 |
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:
3993
diff
changeset
|
983 /* try to translate dos path */ |
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:
3993
diff
changeset
|
984 convert_dos_path(filename); /* in place replacement */ |
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:
3993
diff
changeset
|
985 |
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:
3993
diff
changeset
|
986 /* convert backslash to slash */ |
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:
3993
diff
changeset
|
987 while ((tmp = strchr(filename, '\\')) != 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:
3993
diff
changeset
|
988 *tmp = '/'; |
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:
3993
diff
changeset
|
989 |
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:
3993
diff
changeset
|
990 // make full path uri here |
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:
3993
diff
changeset
|
991 // case 1: filename is raw full path or 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:
3993
diff
changeset
|
992 if (filename[0] == '/' || strstr(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:
3993
diff
changeset
|
993 uri = g_filename_to_uri(filename, NULL, 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:
3993
diff
changeset
|
994 if(!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:
3993
diff
changeset
|
995 uri = g_strdup(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:
3993
diff
changeset
|
996 } |
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:
3993
diff
changeset
|
997 g_free(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:
3993
diff
changeset
|
998 } |
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:
3993
diff
changeset
|
999 // case 2: filename is not raw full path nor uri, playlist path is full path |
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:
3993
diff
changeset
|
1000 // make full path by replacing last part of playlist path with filename. (using g_build_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:
3993
diff
changeset
|
1001 else if (playlist_name[0] == '/' || strstr(playlist_name, "://")) { |
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:
3993
diff
changeset
|
1002 path = g_strdup(playlist_name); |
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:
3993
diff
changeset
|
1003 tmp = strrchr(path, '/'); *tmp = '\0'; |
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:
3993
diff
changeset
|
1004 tmp = g_build_filename(path, filename, NULL); |
4073 | 1005 g_free(path); g_free(filename); |
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:
3993
diff
changeset
|
1006 uri = g_filename_to_uri(tmp, NULL, NULL); |
4073 | 1007 g_free(tmp); |
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:
3993
diff
changeset
|
1008 } |
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:
3993
diff
changeset
|
1009 // case 3: filename is not raw full path nor uri, playlist path is not full path |
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:
3993
diff
changeset
|
1010 // just abort. |
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:
3993
diff
changeset
|
1011 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:
3993
diff
changeset
|
1012 g_free(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:
3993
diff
changeset
|
1013 return 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:
3993
diff
changeset
|
1014 } |
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:
3993
diff
changeset
|
1015 |
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:
3993
diff
changeset
|
1016 AUDDBG("uri=%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:
3993
diff
changeset
|
1017 return 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:
3993
diff
changeset
|
1018 } |