Mercurial > audlegacy
changeset 1966:fcf3900d05b9 trunk
[svn] - temporarily display the newui at startup along with the oldui
| author | nenolod |
|---|---|
| date | Sun, 12 Nov 2006 05:38:48 -0800 |
| parents | b17f7a09fdd3 |
| children | 00db92cf9bfe |
| files | ChangeLog audacious/main.c |
| diffstat | 2 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Sun Nov 12 05:38:04 2006 -0800 +++ b/ChangeLog Sun Nov 12 05:38:48 2006 -0800 @@ -1,3 +1,11 @@ +2006-11-12 13:38:04 +0000 William Pitcock <nenolod@nenolod.net> + revision [2905] + - add some more controls (seekbar and such) + + trunk/audacious/glade/newui.glade | 891 +++++++++++++++++++++----------------- + 1 file changed, 499 insertions(+), 392 deletions(-) + + 2006-11-12 11:09:28 +0000 William Pitcock <nenolod@nenolod.net> revision [2903] - avoid freeing a NULL pointer in ui_fileinfo.c
--- a/audacious/main.c Sun Nov 12 05:38:04 2006 -0800 +++ b/audacious/main.c Sun Nov 12 05:38:48 2006 -0800 @@ -76,6 +76,8 @@ #include "pixmaps.h" #include "images/audacious_player.xpm" +#include "newui/newui_window.h" + gboolean has_x11_connection = FALSE; /* do we have an X11 connection? */ /* Translatable string for beep.desktop's comment field */ @@ -1132,6 +1134,9 @@ create_fileinfo_window(); create_filepopup_window(); + create_newui_window(); + show_newui_window(); + if (cfg.player_visible) mainwin_show(TRUE); else if (!cfg.playlist_visible && !cfg.equalizer_visible) @@ -1160,7 +1165,11 @@ output_get_volume(&l, &r); output_set_volume(0,0); bmp_playback_initiate(); - for (i = 0; i < 20; i++) { /* Busy wait; loop is fairly tight to minimize duration of "frozen" GUI. Feel free to tune. --chainsaw */ + + /* Busy wait; loop is fairly tight to minimize duration of "frozen" GUI. Feel free to + * tune. --chainsaw + */ + for (i = 0; i < 20; i++) { g_usleep(1000); if (!ip_data.playing) break;