annotate audacious/playlist.c @ 2257:af716dc0cdb9 trunk

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