Mercurial > audlegacy
changeset 2569:b3ca1bfcae6c trunk
[svn] - Spring clean (removed one function)
| author | mf0102 |
|---|---|
| date | Sat, 24 Feb 2007 13:36:36 -0800 |
| parents | 62a9da5d40a8 |
| children | 7b1b52eb663b |
| files | ChangeLog src/audacious/build_stamp.c src/audacious/input.c src/audacious/input.h |
| diffstat | 4 files changed, 28 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sat Feb 24 07:53:09 2007 -0800 +++ b/ChangeLog Sat Feb 24 13:36:36 2007 -0800 @@ -1,3 +1,11 @@ +2007-02-24 15:53:09 +0000 William Pitcock <nenolod@sacredspiral.co.uk> + revision [4146] + - make a note that MCS is required now. + + trunk/README | 3 +++ + 1 file changed, 3 insertions(+) + + 2007-02-24 15:52:26 +0000 William Pitcock <nenolod@sacredspiral.co.uk> revision [4144] - GTK+ 2.6 is required.
--- a/src/audacious/build_stamp.c Sat Feb 24 07:53:09 2007 -0800 +++ b/src/audacious/build_stamp.c Sat Feb 24 13:36:36 2007 -0800 @@ -1,2 +1,2 @@ #include <glib.h> -const gchar *svn_stamp = "20070224-4144"; +const gchar *svn_stamp = "20070224-4146";
--- a/src/audacious/input.c Sat Feb 24 07:53:09 2007 -0800 +++ b/src/audacious/input.c Sat Feb 24 13:36:36 2007 -0800 @@ -260,12 +260,6 @@ } void -input_add_vis(gint time, guchar * s, InputVisType type) -{ - g_warning("plugin uses obsoleted input_add_vis()"); -} - -void input_add_vis_pcm(gint time, AFormat fmt, gint nch, gint length, gpointer ptr) { VisNode *vis_node; @@ -325,8 +319,8 @@ GTK_MESSAGE_ERROR, GTK_BUTTONS_OK, _(markup)); - gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE); - gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); + gtk_window_set_resizable(GTK_WINDOW(dialog), TRUE); + gtk_window_set_position(GTK_WINDOW(dialog), GTK_WIN_POS_CENTER); vbox = gtk_vbox_new(FALSE, 6); @@ -439,7 +433,9 @@ ext = strrchr(filename_proxy, '.') + 1; - use_ext_filter = (fd != NULL && (!g_strncasecmp(filename, "/", 1) || !g_strncasecmp(filename, "file://", 7))) ? TRUE : FALSE; + use_ext_filter = + (fd != NULL && (!g_strncasecmp(filename, "/", 1) || + !g_strncasecmp(filename, "file://", 7))) ? TRUE : FALSE; for (node = get_input_list(); node != NULL; node = g_list_next(node)) { @@ -450,8 +446,8 @@ vfs_rewind(fd); - if (cfg.use_extension_probing == TRUE && ip->vfs_extensions != NULL - && ext != NULL && ext != (gpointer) 0x1 && use_ext_filter == TRUE) + if (cfg.use_extension_probing == TRUE && ip->vfs_extensions != NULL && + ext != NULL && ext != (gpointer) 0x1 && use_ext_filter == TRUE) { gint i; gboolean is_our_ext = FALSE; @@ -601,6 +597,7 @@ input->file_path = g_path_get_dirname(filename); } + g_free(filename_proxy); return input; } @@ -753,13 +750,12 @@ { gint h_vol[2]; - if (playback_get_playing()) { - if (get_current_input_playback() && - get_current_input_playback()->plugin->set_volume && - get_current_input_playback()->plugin->set_volume(l, r)) { - return; - } - } + if (playback_get_playing() && + get_current_input_playback() && + get_current_input_playback()->plugin->set_volume && + get_current_input_playback()->plugin->set_volume(l, r)) + return; + output_set_volume(l, r); h_vol[0] = l;
--- a/src/audacious/input.h Sat Feb 24 07:53:09 2007 -0800 +++ b/src/audacious/input.h Sat Feb 24 13:36:36 2007 -0800 @@ -44,8 +44,10 @@ void set_current_input_data(void * data); InputVisType input_get_vis_type(); void free_vis_data(void); + InputPlugin *input_check_file(const gchar * filename, gboolean show_warning); TitleInput *input_get_song_tuple(const gchar * filename); + void input_play(gchar * filename); void input_stop(void); void input_pause(void); @@ -54,12 +56,14 @@ void input_seek(gint time); void input_get_song_info(const gchar * filename, gchar ** title, gint * length); + guchar *input_get_vis(gint time); void input_update_vis_plugin(gint time); + gchar *input_get_info_text(void); void input_about(gint index); void input_configure(gint index); -void input_add_vis(gint time, guchar * s, InputVisType type); + void input_add_vis_pcm(gint time, AFormat fmt, gint nch, gint length, gpointer ptr); InputVisType input_get_vis_type();