audlegacy: audacious/playlist.c comparison

comparison audacious/playlist.c @ 1588:15d92c51bde6 trunk

[svn] - modified time (mtime) has been introduced into tuple - playlist makes use of mtime for scan control - xspf records and reads mtime

author	yaz
date	Wed, 23 Aug 2006 07:46:33 -0700
parents	c073fd82ded6
children	57676c0f2f33

comparison

equal deleted inserted replaced

-:c073fd82ded6
+:15d92c51bde6
 static gint path_compare(const gchar * a, const gchar * b);
 static gint playlist_compare_path(PlaylistEntry * a, PlaylistEntry * b);
 static gint playlist_compare_filename(PlaylistEntry * a, PlaylistEntry * b);
 static gint playlist_compare_title(PlaylistEntry * a, PlaylistEntry * b);
 static gint playlist_compare_artist(PlaylistEntry * a, PlaylistEntry * b);
+static time_t playlist_get_mtime(const gchar *filename);
 static gint playlist_compare_date(PlaylistEntry * a, PlaylistEntry * b);
 static gint playlist_compare_track(PlaylistEntry * a, PlaylistEntry * b);
 static gint playlist_compare_playlist(PlaylistEntry * a, PlaylistEntry * b);
 static gint playlist_dupscmp_path(PlaylistEntry * a, PlaylistEntry * b);
 playlist_entry_free(PlaylistEntry * entry)
 {
 if (!entry)
 return;
-if (entry->tuple != NULL)
+if (entry->tuple != NULL) {
 bmp_title_input_free(entry->tuple);
+entry->tuple = NULL;
+}
 if (entry->filename != NULL)
 g_free(entry->filename);
 if (entry->title != NULL)
 static gboolean
 playlist_entry_get_info(PlaylistEntry * entry)
 {
 TitleInput *tuple;
+time_t modtime = playlist_get_mtime(entry->filename);
 g_return_val_if_fail(entry != NULL, FALSE);
+/* renew tuple if file mtime is newer than tuple mtime. */
+if(entry->tuple){
+if(entry->tuple->mtime == modtime)
+return TRUE;
+else {
+bmp_title_input_free(entry->tuple);
+entry->tuple = NULL;
+}
+}
 if (entry->decoder == NULL)
 entry->decoder = input_check_file(entry->filename, FALSE);
 if (entry->decoder == NULL || entry->decoder->get_song_tuple == NULL)
 else
 tuple = entry->decoder->get_song_tuple(entry->filename);
 if (tuple == NULL)
 return FALSE;
+/* attach mtime */
+tuple->mtime = modtime;
 /* entry is still around */
 entry->title = xmms_get_titlestring(tuple->formatter != NULL ? tuple->formatter : xmms_get_gentitle_format(), tuple);
 entry->length = tuple->length;
 entry->tuple = tuple;
 	    pos = g_list_length(playlist) - 1; /* last element. */
 }
 node = g_list_nth(playlist, pos);
 entry = PLAYLIST_ENTRY(node->data);
-/* insufficient tuple */
-if(!tuple->track_name || !tuple->performer || !tuple->album_name || !tuple->genre
-|| !tuple->year || !tuple->track_number || !tuple->length){
-//	    printf("tuple discarded: %s\n", filename);
-	    bmp_title_input_free(tuple);
-	    if (entry->decoder == NULL || entry->decoder->get_song_tuple == NULL)
-		    tuple = input_get_song_tuple(entry->filename);
-	    else
-		    tuple = entry->decoder->get_song_tuple(entry->filename);
-}
 if (tuple != NULL) {
 entry->title = xmms_get_titlestring(tuple->formatter != NULL ? tuple->formatter : xmms_get_gentitle_format(), tuple);
 entry->length = tuple->length;
 entry->tuple = tuple;
 }
 entry = node->data;
 /* FIXME: simplify this logic */
-if (!entry->title && entry->length == -1) {
+//    if (!entry->title && entry->length == -1) {
+if ( (!entry->title && entry->length == -1) ||
+	 (entry->tuple && (entry->tuple->mtime != playlist_get_mtime(entry->filename))) ){
 if (playlist_entry_get_info(entry))
 title = entry->title;
 }
 else {
 title = entry->title;
 entry = (PlaylistEntry *) node->data;
 tuple = entry->tuple;
-if (tuple == NULL)
+// if no tuple or tuple with old mtime, get new one.
-{
+if (!tuple || (entry->tuple->mtime != playlist_get_mtime(entry->filename))) {
 playlist_entry_get_info(entry);
 tuple = entry->tuple;
 }
 PLAYLIST_UNLOCK();
 return -1;
 }
 entry = node->data;
-if (!entry->title && entry->length == -1) {
+//    if (!entry->title && entry->length == -1) {
+if (!entry->tuple || (entry->tuple->mtime != playlist_get_mtime(entry->filename))){
 if (playlist_entry_get_info(entry))
 song_time = entry->length;
 PLAYLIST_UNLOCK();
 }
 playlist_compare_path(PlaylistEntry * a,
 PlaylistEntry * b)
 {
 return path_compare(a->filename, b->filename);
 }
+static time_t
+playlist_get_mtime(const gchar *filename)
+{
+	struct stat buf;
+gint rv;
+rv = stat(filename, &buf);
+if (rv == 0) {
+return buf.st_mtime;
+} else {
+return 0; //error
+}
+}
 static gint
 playlist_compare_date(PlaylistEntry * a,
 PlaylistEntry * b)
 {
 }
 PLAYLIST_UNLOCK();
 /* No tuple? Try to set this entry up properly. --nenolod */
-if (entry->tuple == NULL)
+//    if (entry->tuple == NULL)
+if (!entry->tuple || (entry->tuple->mtime != playlist_get_mtime(entry->filename)))
 {
 playlist_entry_get_info(entry);
 tuple = entry->tuple;
 }
 PLAYLIST_LOCK();
 for (node = playlist_get(); node; node = g_list_next(node)) {
 entry = node->data;
-if (entry->title || entry->length != -1)
+if(entry->tuple) {
-continue;
+//                    printf("tuple mtime = %ld file mtime = %ld\n", entry->tuple->mtime, playlist_get_mtime(entry->filename));
+if(entry->tuple->mtime == playlist_get_mtime(entry->filename))
+continue;
+else
+entry->tuple->mtime = 0; /* invalidate mtime */
+}
 if (!playlist_entry_get_info(entry)) {
 if (g_list_index(playlist_get(), entry) == -1)
 /* Entry disappeared while we looked it up.
 Restart. */
 &&
 playlistwin_item_visible(g_list_position
 (playlist_get(), node));
 node = g_list_next(node)) {
 entry = node->data;
-if (entry->title || entry->length != -1)
+//                if (entry->title || entry->length != -1)
+if (entry->tuple && (entry->tuple->mtime == playlist_get_mtime(entry->filename)))
 continue;
 if (!playlist_entry_get_info(entry)) {
 if (g_list_index(playlist_get(), entry) == -1)
 /* Entry disapeared while we
 retval = TRUE;
 str_replace_in(&entry->title, NULL);
 entry->length = -1;
+	/* invalidate mtime to reread */
+	entry->tuple->mtime = 0;
 if (!playlist_entry_get_info(entry)) {
 if (g_list_index(playlist_get(), entry) == -1)
 /* Entry disappeared while we looked it up. Restart. */
 node = playlist_get();
 }

Mercurial > audlegacy

comparison audacious/playlist.c @ 1588:15d92c51bde6 trunk