Mercurial > audlegacy
changeset 1270:feff5a622f06 trunk
[svn] - improvements
| author | nenolod |
|---|---|
| date | Thu, 15 Jun 2006 22:58:15 -0700 |
| parents | 681b629322c4 |
| children | 3f618ef7a892 |
| files | ChangeLog audacious/playlist.c audacious/ui_fileinfo.c |
| diffstat | 3 files changed, 23 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Jun 15 22:23:39 2006 -0700 +++ b/ChangeLog Thu Jun 15 22:58:15 2006 -0700 @@ -1,3 +1,13 @@ +2006-06-16 05:23:39 +0000 William Pitcock <nenolod@nenolod.net> + revision [1452] + - hook up fileinfo box stuff + + + Changes: Modified: + +38 -7 trunk/audacious/playlist.c + +1 -1 trunk/audacious/ui_fileinfo.c + + 2006-06-16 05:15:56 +0000 William Pitcock <nenolod@nenolod.net> revision [1450] - generic info box support
--- a/audacious/playlist.c Thu Jun 15 22:23:39 2006 -0700 +++ b/audacious/playlist.c Thu Jun 15 22:58:15 2006 -0700 @@ -2134,13 +2134,18 @@ { if (entry->decoder != NULL && entry->decoder->file_info_box == NULL) fileinfo_show_for_tuple(tuple); + else if (entry->decoder != NULL && entry->decoder->file_info_box != NULL) + entry->decoder->file_info_box(path); else fileinfo_show_for_path(path); g_free(path); } else if (path != NULL) { - fileinfo_show_for_path(path); + if (entry != NULL && entry->decoder != NULL && entry->decoder->file_info_box != NULL) + entry->decoder->file_info_box(path); + else + fileinfo_show_for_path(path); g_free(path); } } @@ -2165,13 +2170,18 @@ { if (playlist_position->decoder != NULL && playlist_position->decoder->file_info_box == NULL) fileinfo_show_for_tuple(tuple); + else if (playlist_position->decoder != NULL && playlist_position->decoder->file_info_box != NULL) + playlist_position->decoder->file_info_box(path); else fileinfo_show_for_path(path); g_free(path); } else if (path != NULL) { - fileinfo_show_for_path(path); + if (playlist_position != NULL && playlist_position->decoder != NULL && playlist_position->decoder->file_info_box != NULL) + playlist_position->decoder->file_info_box(path); + else + fileinfo_show_for_path(path); g_free(path); } }
--- a/audacious/ui_fileinfo.c Thu Jun 15 22:23:39 2006 -0700 +++ b/audacious/ui_fileinfo.c Thu Jun 15 22:58:15 2006 -0700 @@ -139,7 +139,7 @@ fileinfo_entry_set_text("entry_album", tuple->album_name); fileinfo_entry_set_text("entry_comment", tuple->comment); fileinfo_entry_set_text("entry_genre", tuple->genre); - fileinfo_entry_set_text("entry_location", tuple->file_path); + fileinfo_entry_set_text_free("entry_location", g_strdup_printf("%s/%s", tuple->file_path, tuple->file_name)); if (tuple->year != 0) fileinfo_entry_set_text_free("entry_year", g_strdup_printf("%d", tuple->year));