Mercurial > audlegacy
comparison audacious/main.c @ 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 | 80150c2b4b83 |
children | 55b05e25d4ef |
comparison
equal
deleted
inserted
replaced
1965:b17f7a09fdd3 | 1966:fcf3900d05b9 |
---|---|
73 #include "build_stamp.h" | 73 #include "build_stamp.h" |
74 #include "ui_fileinfo.h" | 74 #include "ui_fileinfo.h" |
75 | 75 |
76 #include "pixmaps.h" | 76 #include "pixmaps.h" |
77 #include "images/audacious_player.xpm" | 77 #include "images/audacious_player.xpm" |
78 | |
79 #include "newui/newui_window.h" | |
78 | 80 |
79 gboolean has_x11_connection = FALSE; /* do we have an X11 connection? */ | 81 gboolean has_x11_connection = FALSE; /* do we have an X11 connection? */ |
80 | 82 |
81 /* Translatable string for beep.desktop's comment field */ | 83 /* Translatable string for beep.desktop's comment field */ |
82 const gchar *desktop_comment = N_("Audacious"); | 84 const gchar *desktop_comment = N_("Audacious"); |
1130 create_prefs_window(); | 1132 create_prefs_window(); |
1131 | 1133 |
1132 create_fileinfo_window(); | 1134 create_fileinfo_window(); |
1133 create_filepopup_window(); | 1135 create_filepopup_window(); |
1134 | 1136 |
1137 create_newui_window(); | |
1138 show_newui_window(); | |
1139 | |
1135 if (cfg.player_visible) | 1140 if (cfg.player_visible) |
1136 mainwin_show(TRUE); | 1141 mainwin_show(TRUE); |
1137 else if (!cfg.playlist_visible && !cfg.equalizer_visible) | 1142 else if (!cfg.playlist_visible && !cfg.equalizer_visible) |
1138 mainwin_show(TRUE); | 1143 mainwin_show(TRUE); |
1139 | 1144 |
1158 gint l=0, r=0; | 1163 gint l=0, r=0; |
1159 while (gtk_events_pending()) gtk_main_iteration(); | 1164 while (gtk_events_pending()) gtk_main_iteration(); |
1160 output_get_volume(&l, &r); | 1165 output_get_volume(&l, &r); |
1161 output_set_volume(0,0); | 1166 output_set_volume(0,0); |
1162 bmp_playback_initiate(); | 1167 bmp_playback_initiate(); |
1163 for (i = 0; i < 20; i++) { /* Busy wait; loop is fairly tight to minimize duration of "frozen" GUI. Feel free to tune. --chainsaw */ | 1168 |
1169 /* Busy wait; loop is fairly tight to minimize duration of "frozen" GUI. Feel free to | |
1170 * tune. --chainsaw | |
1171 */ | |
1172 for (i = 0; i < 20; i++) { | |
1164 g_usleep(1000); | 1173 g_usleep(1000); |
1165 if (!ip_data.playing) | 1174 if (!ip_data.playing) |
1166 break; | 1175 break; |
1167 } | 1176 } |
1168 bmp_playback_seek(cfg.resume_playback_on_startup_time / | 1177 bmp_playback_seek(cfg.resume_playback_on_startup_time / |