Mercurial > audlegacy
changeset 1651:a886f0856e32 trunk
[svn] - hammer a little more
| author | nenolod |
|---|---|
| date | Thu, 07 Sep 2006 21:51:36 -0700 |
| parents | cb226180eabb |
| children | 62c5bff8a05b |
| files | ChangeLog audacious/main.c |
| diffstat | 2 files changed, 21 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Sep 07 21:47:45 2006 -0700 +++ b/ChangeLog Thu Sep 07 21:51:36 2006 -0700 @@ -1,3 +1,13 @@ +2006-09-08 04:47:45 +0000 William Pitcock <nenolod@nenolod.net> + revision [2231] + - stuff + + + Changes: Modified: + +0 -2 trunk/audacious/genevent.h + +0 -6 trunk/audacious/main.c + + 2006-09-08 04:44:05 +0000 William Pitcock <nenolod@nenolod.net> revision [2229] - abstractionalize a lot of stuff, build still broken, live with it
--- a/audacious/main.c Thu Sep 07 21:47:45 2006 -0700 +++ b/audacious/main.c Thu Sep 07 21:51:36 2006 -0700 @@ -1057,10 +1057,14 @@ gtk_accel_map_load(bmp_paths[BMP_PATH_ACCEL_FILE]); + current_interface->init(); +#if 0 + /* *** TO WA2GUI *** */ mainwin_create(); playlistwin_create(); equalizerwin_create(); +#endif if (!init_skins(cfg.skin)) { run_load_skin_error_dialog(cfg.skin); @@ -1075,11 +1079,14 @@ playlist_load(bmp_paths[BMP_PATH_PLAYLIST_FILE]); playlist_set_position(cfg.playlist_position); +#if 0 + /* *** TO WA2GUI *** */ /* this needs to be called after all 3 windows are created and * input plugins are setup'ed * but not if we're running headless --nenolod */ mainwin_setup_menus(); +#endif if (options.headless != 1) GDK_THREADS_LEAVE(); @@ -1102,6 +1109,7 @@ create_fileinfo_window(); create_filepopup_window(); +#if 0 if (cfg.player_visible) mainwin_show(TRUE); else if (!cfg.playlist_visible && !cfg.equalizer_visible) @@ -1114,6 +1122,9 @@ playlistwin_show(); hint_set_always(cfg.always_on_top); +#endif + + current_interface->present(); playlist_start_get_info_thread(); mainwin_attach_idle_func();