Mercurial > audlegacy
changeset 2331:d7ccaa59630f trunk
[svn] Wiped out some error messages
author | mf0102 |
---|---|
date | Sun, 14 Jan 2007 10:54:06 -0800 |
parents | 716975bb5b65 |
children | 593fd166af00 |
files | ChangeLog src/audacious/input.c src/audacious/ui_equalizer.c src/audacious/util.c |
diffstat | 4 files changed, 24 insertions(+), 36 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Jan 14 02:50:21 2007 -0800 +++ b/ChangeLog Sun Jan 14 10:54:06 2007 -0800 @@ -1,3 +1,10 @@ +2007-01-14 10:50:21 +0000 Michael Farber <01mf02@gmail.com> + revision [3670] + Added myself to the developer list + trunk/src/audacious/ui_credits.c | 1 + + 1 file changed, 1 insertion(+) + + 2007-01-14 01:02:39 +0000 Jonathan Schleifer <js@h3c.de> revision [3668] Fixed make install.
--- a/src/audacious/input.c Sun Jan 14 02:50:21 2007 -0800 +++ b/src/audacious/input.c Sun Jan 14 10:54:06 2007 -0800 @@ -424,8 +424,8 @@ ext = strrchr(filename_proxy, '.') + 1; use_ext_filter = (fd != NULL && - (!g_strcasecmp(fd->base->uri_id, "/") || - !g_strcasecmp(fd->base->uri_id, "file"))) ? TRUE : FALSE; + (!g_strcasecmp(fd->base->uri_id, "/") || + !g_strcasecmp(fd->base->uri_id, "file"))) ? TRUE : FALSE; for (node = get_input_list(); node != NULL; node = g_list_next(node)) { @@ -437,7 +437,7 @@ vfs_fseek(fd, 0, SEEK_SET); if (cfg.use_extension_probing == TRUE && ip->vfs_extensions != NULL - && ext != NULL && ext != (gpointer) 0x1 && use_ext_filter == TRUE) + && ext != NULL && ext != (gpointer) 0x1 && use_ext_filter == TRUE) { gint i; gboolean is_our_ext = FALSE; @@ -445,10 +445,10 @@ for (i = 0; ip->vfs_extensions[i] != NULL; i++) { if (str_has_prefix_nocase(ext, ip->vfs_extensions[i])) - { - is_our_ext = TRUE; - break; - } + { + is_our_ext = TRUE; + break; + } } /* not a plugin that supports this extension */ @@ -479,8 +479,8 @@ } } - if (ret <= -1) - break; + if (ret <= -1) + break; } g_free(filename_proxy); @@ -512,7 +512,6 @@ { InputPlugin *ip = NULL; BmpTitleInput *input; - GList *node; gchar *tmp = NULL, *ext; gchar *filename_proxy; @@ -524,7 +523,7 @@ ip = input_check_file(filename_proxy, FALSE); - if (ip && node && ip->get_song_info) { + if (ip && ip->get_song_info) { ip->get_song_info(filename_proxy, &tmp, length); *title = str_to_utf8(tmp); g_free(tmp); @@ -562,29 +561,29 @@ { InputPlugin *ip = NULL; TitleInput *input; - GList *node; gchar *tmp = NULL, *ext; gchar *filename_proxy; if (filename == NULL) - return NULL; + return NULL; filename_proxy = g_strdup(filename); ip = input_check_file(filename_proxy, FALSE); - if (ip && node && ip->get_song_tuple) + if (ip && ip->get_song_tuple) input = ip->get_song_tuple(filename_proxy); - else { + else + { input = bmp_title_input_new(); tmp = g_strdup(filename); if ((ext = strrchr(tmp, '.'))) *ext = '\0'; - input->track_name = NULL; - input->length = -1; - input_get_song_info(filename, &input->track_name, &input->length); + input->track_name = NULL; + input->length = -1; + input_get_song_info(filename, &input->track_name, &input->length); input->file_name = g_path_get_basename(tmp); input->file_ext = ext ? ext + 1 : NULL; input->file_path = g_path_get_dirname(tmp); @@ -670,7 +669,6 @@ void input_file_info_box(const gchar * filename) { - GList *node; InputPlugin *ip; gchar *filename_proxy;
--- a/src/audacious/ui_equalizer.c Sun Jan 14 02:50:21 2007 -0800 +++ b/src/audacious/ui_equalizer.c Sun Jan 14 10:54:06 2007 -0800 @@ -813,20 +813,6 @@ G_CALLBACK(equalizerwin_scroll), NULL); } -static GtkWidget * -ui_manager_get_popup(GtkUIManager * self, const gchar * path) -{ - GtkWidget *menu_item; - - menu_item = gtk_ui_manager_get_widget(self, path); - - if (GTK_IS_MENU_ITEM(menu_item)) - return gtk_menu_item_get_submenu(GTK_MENU_ITEM(menu_item)); - else - return NULL; -} - - void equalizerwin_create(void) {
--- a/src/audacious/util.c Sun Jan 14 02:50:21 2007 -0800 +++ b/src/audacious/util.c Sun Jan 14 10:54:06 2007 -0800 @@ -65,9 +65,6 @@ #endif #endif -static GQuark quark_popup_data; - - /* * find <file> in directory <dirname> or subdirectories. return * pointer to complete filename which has to be freed by calling