Mercurial > audlegacy
changeset 3023:49ce30748980
added lastfm GUI stub
| author | Cristi Magherusan <majeru@atheme-project.org> |
|---|---|
| date | Tue, 10 Jul 2007 17:13:24 +0300 |
| parents | 5e470f0b4f53 |
| children | 883713b145f8 |
| files | src/audacious/Makefile src/audacious/actions-mainwin.h src/audacious/ui/mainwin.ui src/audacious/ui_lastfm.c src/audacious/ui_lastfm.h src/audacious/ui_main.c src/audacious/ui_main.h src/audacious/ui_manager.c |
| diffstat | 8 files changed, 30 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/src/audacious/Makefile Tue Jul 10 11:58:21 2007 +0200 +++ b/src/audacious/Makefile Tue Jul 10 17:13:24 2007 +0300 @@ -52,6 +52,7 @@ strings.h \ titlestring.h \ ui_fileinfopopup.h \ + ui_lastfm.h\ ui_preferences.h \ util.h \ vfs.h \ @@ -99,6 +100,7 @@ ui_fileinfopopup.c \ ui_fileopener.c \ ui_jumptotrack.c \ + ui_lastfm.c\ ui_main.c \ ui_manager.c \ ui_playlist.c \
--- a/src/audacious/actions-mainwin.h Tue Jul 10 11:58:21 2007 +0200 +++ b/src/audacious/actions-mainwin.h Tue Jul 10 17:13:24 2007 +0300 @@ -72,6 +72,5 @@ void action_preferences(void); void action_quit(void); void action_current_track_info(void); - - +void action_lastfm(void); #endif
--- a/src/audacious/ui/mainwin.ui Tue Jul 10 11:58:21 2007 +0200 +++ b/src/audacious/ui/mainwin.ui Tue Jul 10 17:13:24 2007 +0300 @@ -14,7 +14,9 @@ <separator /> <menuitem action="play file" /> <menuitem action="play location" /> - <separator /> + <menuitem action="playback play cd" /> + <menuitem action="lastfm" /> + <separator /> <menu action="visualization"> <menu action="vismode"> <menuitem action="vismode analyzer" /> @@ -68,8 +70,6 @@ </menu> </menu> <menu action="playback"> - <menuitem action="playback play cd" /> - <separator /> <menuitem action="playback repeat" /> <menuitem action="playback shuffle" /> <menuitem action="playback no playlist advance" />
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/audacious/ui_lastfm.c Tue Jul 10 17:13:24 2007 +0300 @@ -0,0 +1,5 @@ +#include <glib.h> +void ui_lastfm(void) +{ +g_print("lastfm gui stub\n"); +}
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/src/audacious/ui_lastfm.h Tue Jul 10 17:13:24 2007 +0300 @@ -0,0 +1,1 @@ +void ui_lastfm(void);
--- a/src/audacious/ui_main.c Tue Jul 10 11:58:21 2007 +0200 +++ b/src/audacious/ui_main.c Tue Jul 10 17:13:24 2007 +0300 @@ -75,6 +75,7 @@ #include "ui_preferences.h" #include "ui_skinselector.h" #include "ui_urlopener.h" +#include "ui_lastfm.h" #include "strings.h" #include "util.h" #include "visualization.h" @@ -2072,6 +2073,9 @@ case MAINWIN_GENERAL_PLAYLOCATION: mainwin_show_add_url_window(); break; + case MAINWIN_GENERAL_LASTFM: + action_lastfm(); + break; case MAINWIN_GENERAL_FILEINFO: playlist_fileinfo_current(playlist); break; @@ -3439,6 +3443,12 @@ } void +action_lastfm( void ) +{ + ui_lastfm(); +} + +void action_jump_to_playlist_start( void ) { Playlist *playlist = playlist_get_active();
--- a/src/audacious/ui_main.h Tue Jul 10 11:58:21 2007 +0200 +++ b/src/audacious/ui_main.h Tue Jul 10 17:13:24 2007 +0300 @@ -51,6 +51,7 @@ MAINWIN_GENERAL_PLAYFILE, MAINWIN_GENERAL_PLAYLOCATION, + MAINWIN_GENERAL_LASTFM, MAINWIN_GENERAL_FILEINFO, MAINWIN_GENERAL_PREFS,
--- a/src/audacious/ui_manager.c Tue Jul 10 11:58:21 2007 +0200 +++ b/src/audacious/ui_manager.c Tue Jul 10 17:13:24 2007 +0300 @@ -163,10 +163,7 @@ static GtkActionEntry action_entries_playback[] = { { "playback", NULL, N_("Playback") }, - - { "playback play cd", GTK_STOCK_CDROM , N_("Play CD"), "<Alt>C", - N_("Play CD"), G_CALLBACK(action_playback_playcd) }, - + { "playback play", GTK_STOCK_MEDIA_PLAY , N_("Play"), "X", N_("Play"), G_CALLBACK(action_playback_play) }, @@ -393,6 +390,12 @@ { "play location", GTK_STOCK_NETWORK , N_("Play Location"), "<Ctrl>L", N_("Play media from the selected location"), G_CALLBACK(action_play_location) }, + { "playback play cd", GTK_STOCK_CDROM , N_("Play CD"), "<Alt>C", + N_("Play CD"), G_CALLBACK(action_playback_playcd) }, + + { "lastfm", NULL, N_("Last.fm radio"), "<Alt>L", + N_("Play Last.fm radio"), G_CALLBACK(action_lastfm) }, + { "preferences", GTK_STOCK_PREFERENCES , N_("Preferences"), "<Ctrl>P", N_("Open preferences window"), G_CALLBACK(action_preferences) },