# HG changeset patch # User giacomo # Date 1167913008 28800 # Node ID 3668594b4fc85ed499b9917ff14ac756be603851 # Parent 2c66f4fe9cfaddba71f1654214e13228379a3b20 [svn] - moved action_playlist_* implementation from ui_main.c to ui_playlist.c (more appropriate) diff -r 2c66f4fe9cfa -r 3668594b4fc8 ChangeLog --- a/ChangeLog Thu Jan 04 04:11:21 2007 -0800 +++ b/ChangeLog Thu Jan 04 04:16:48 2007 -0800 @@ -1,3 +1,14 @@ +2007-01-04 12:11:21 +0000 Giacomo Lozito + revision [3521] + - added delete playlist action (finally :p) + trunk/audacious/actions-mainwin.h | 1 + + trunk/audacious/ui/mainwin.ui | 1 + + trunk/audacious/ui/playlist.ui | 1 + + trunk/audacious/ui_main.c | 6 ++++++ + trunk/audacious/ui_manager.c | 3 +++ + 5 files changed, 12 insertions(+) + + 2007-01-04 11:58:58 +0000 Giacomo Lozito revision [3519] - do not create GtkAccelGroup anymore; use ui_manager_get_accel_group to get accelerator groups from ui_manager diff -r 2c66f4fe9cfa -r 3668594b4fc8 audacious/actions-mainwin.h --- a/audacious/actions-mainwin.h Thu Jan 04 04:11:21 2007 -0800 +++ b/audacious/actions-mainwin.h Thu Jan 04 04:16:48 2007 -0800 @@ -72,10 +72,6 @@ void action_playback_playcd(void); void action_playback_previous(void); void action_playback_stop(void); -void action_playlist_prev(void); -void action_playlist_new(void); -void action_playlist_next(void); -void action_playlist_delete(void); void action_preferences(void); void action_quit(void); void action_track_info(void); diff -r 2c66f4fe9cfa -r 3668594b4fc8 audacious/actions-playlist.h --- a/audacious/actions-playlist.h Thu Jan 04 04:11:21 2007 -0800 +++ b/audacious/actions-playlist.h Thu Jan 04 04:16:48 2007 -0800 @@ -18,13 +18,17 @@ #ifndef ACTIONS_PLAYLIST_H #define ACTIONS_PLAYLIST_H -void action_new_list(void); void action_load_list(void); void action_save_list(void); void action_save_default_list(void); void action_open_list_manager(void); void action_refresh_list(void); +void action_playlist_prev(void); +void action_playlist_new(void); +void action_playlist_next(void); +void action_playlist_delete(void); + void action_search_and_select(void); void action_invert_selection(void); void action_select_all(void); diff -r 2c66f4fe9cfa -r 3668594b4fc8 audacious/ui_main.c --- a/audacious/ui_main.c Thu Jan 04 04:11:21 2007 -0800 +++ b/audacious/ui_main.c Thu Jan 04 04:16:48 2007 -0800 @@ -3983,32 +3983,6 @@ } void -action_playlist_new( void ) -{ - Playlist *new_pl = playlist_new(); - playlist_add_playlist(new_pl); - playlist_select_playlist(new_pl); -} - -void -action_playlist_prev( void ) -{ - playlist_select_prev(); -} - -void -action_playlist_next( void ) -{ - playlist_select_next(); -} - -void -action_playlist_delete( void ) -{ - playlist_remove_playlist( playlist_get_active() ); -} - -void action_preferences( void ) { show_prefs_window(); diff -r 2c66f4fe9cfa -r 3668594b4fc8 audacious/ui_playlist.c --- a/audacious/ui_playlist.c Thu Jan 04 04:11:21 2007 -0800 +++ b/audacious/ui_playlist.c Thu Jan 04 04:16:48 2007 -0800 @@ -2032,6 +2032,7 @@ mainwin_show_add_url_window(); } +/* TODO this is no longer used, remove it void action_new_list(void) { @@ -2042,6 +2043,33 @@ mainwin_clear_song_info(); mainwin_set_info_text(); } +*/ + +void +action_playlist_new( void ) +{ + Playlist *new_pl = playlist_new(); + playlist_add_playlist(new_pl); + playlist_select_playlist(new_pl); +} + +void +action_playlist_prev( void ) +{ + playlist_select_prev(); +} + +void +action_playlist_next( void ) +{ + playlist_select_next(); +} + +void +action_playlist_delete( void ) +{ + playlist_remove_playlist( playlist_get_active() ); +} void action_save_list(void)