Mercurial > audlegacy
changeset 2092:79b077f6234b trunk
[svn] - update to new API
| author | nenolod |
|---|---|
| date | Mon, 11 Dec 2006 04:53:05 -0800 |
| parents | 3b6bd01ba05c |
| children | b05046902327 |
| files | ChangeLog audacious/playback.c audacious/ui_fileinfo.c |
| diffstat | 3 files changed, 20 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Dec 11 04:48:05 2006 -0800 +++ b/ChangeLog Mon Dec 11 04:53:05 2006 -0800 @@ -1,3 +1,11 @@ +2006-12-11 12:48:05 +0000 William Pitcock <nenolod@nenolod.net> + revision [3187] + - update mainwin.c to new API + + trunk/audacious/mainwin.c | 138 +++++++++++++++++++++++++++------------------- + 1 file changed, 82 insertions(+), 56 deletions(-) + + 2006-12-11 12:46:09 +0000 Kiyoshi Aman <kiyoshi.aman@gmail.com> revision [3185] Make controlsocket.c happier. Still a ton of warnings, but it compiles now.
--- a/audacious/playback.c Mon Dec 11 04:48:05 2006 -0800 +++ b/audacious/playback.c Mon Dec 11 04:53:05 2006 -0800 @@ -82,8 +82,9 @@ bmp_playback_initiate(void) { PlaylistEntry *entry = NULL; + Playlist *playlist = playlist_get_active(); - if (playlist_get_length() == 0) + if (playlist_get_length(playlist) == 0) return; if (bmp_playback_get_playing()) @@ -93,9 +94,9 @@ svis_clear_data(mainwin_svis); mainwin_disable_seekbar(); - entry = playlist_get_entry_to_play(); + entry = playlist_get_entry_to_play(playlist); - if (!entry) + if (entry == NULL) return; /* @@ -106,9 +107,9 @@ */ while (entry != NULL && !bmp_playback_play_file(entry)) { - playlist_next(); + playlist_next(playlist); - entry = playlist_get_entry_to_play(); + entry = playlist_get_entry_to_play(playlist); if (entry == NULL) return; @@ -122,7 +123,7 @@ cfg.equalizer_bands); } - playlist_check_pos_current(); + playlist_check_pos_current(playlist); mainwin_set_info_text(); } @@ -308,6 +309,6 @@ bmp_playback_seek_relative(gint offset) { gint time = CLAMP(bmp_playback_get_time() / 1000 + offset, - 0, playlist_get_current_length() / 1000 - 1); + 0, playlist_get_current_length(playlist_get_active()) / 1000 - 1); bmp_playback_seek(time); }
--- a/audacious/ui_fileinfo.c Mon Dec 11 04:48:05 2006 -0800 +++ b/audacious/ui_fileinfo.c Mon Dec 11 04:53:05 2006 -0800 @@ -212,6 +212,7 @@ static gint shaded_pos = -1, shaded_prev_pos = -1; gboolean skip = FALSE; GdkWindow *win; + Playlist *playlist = playlist_get_active(); win = gdk_window_at_pointer(NULL, NULL); gdk_window_get_pointer(GDK_WINDOW(playlistwin->window), &x, &y, NULL); @@ -246,7 +247,7 @@ skip = TRUE; if (playlistwin_is_shaded()) { - shaded_pos = playlist_get_position(); + shaded_pos = playlist_get_position(playlist); if (shaded_prev_pos != shaded_pos) skip = TRUE; } @@ -257,7 +258,7 @@ return TRUE; } else { /* shaded mode */ - tuple = playlist_get_tuple(shaded_pos); + tuple = playlist_get_tuple(playlist, shaded_pos); filepopup_hide(NULL); filepopup_show_for_tuple(tuple); shaded_prev_pos = shaded_pos; @@ -265,7 +266,7 @@ prev_pos = pos; - tuple = playlist_get_tuple(pos); + tuple = playlist_get_tuple(playlist, pos); filepopup_show_for_tuple(tuple); }