Mercurial > audlegacy
comparison src/audacious/main.c @ 2651:4d5e6a8717dd trunk
[svn] - allow the player to start with all of its windows hidden (but give a warning to the user, whose display can be disabled); also, try to remember player windows positions when they stay hidden between sessions
| author | giacomo |
|---|---|
| date | Thu, 05 Apr 2007 09:26:13 -0700 |
| parents | 67082557b2c4 |
| children | 09b404d61ebd |
comparison
equal
deleted
inserted
replaced
| 2650:f41ca301852a | 2651:4d5e6a8717dd |
|---|---|
| 147 FALSE, /* stop after current song */ | 147 FALSE, /* stop after current song */ |
| 148 TRUE, /* refresh file list */ | 148 TRUE, /* refresh file list */ |
| 149 TRUE, /* UNUSED (smooth title scrolling) */ | 149 TRUE, /* UNUSED (smooth title scrolling) */ |
| 150 TRUE, /* use playlist metadata */ | 150 TRUE, /* use playlist metadata */ |
| 151 TRUE, /* warn about unplayables */ | 151 TRUE, /* warn about unplayables */ |
| 152 TRUE, /* warn about windows visibility */ | |
| 152 FALSE, /* use \ as directory delimiter */ | 153 FALSE, /* use \ as directory delimiter */ |
| 153 FALSE, /* random skin on play */ | 154 FALSE, /* random skin on play */ |
| 154 FALSE, /* use fontsets */ | 155 FALSE, /* use fontsets */ |
| 155 FALSE, /* use X font for mainwin */ | 156 FALSE, /* use X font for mainwin */ |
| 156 TRUE, /* use custom cursors */ | 157 TRUE, /* use custom cursors */ |
| 278 {"no_playlist_advance", &cfg.no_playlist_advance, TRUE}, | 279 {"no_playlist_advance", &cfg.no_playlist_advance, TRUE}, |
| 279 {"refresh_file_list", &cfg.refresh_file_list, TRUE}, | 280 {"refresh_file_list", &cfg.refresh_file_list, TRUE}, |
| 280 {"sort_jump_to_file", &cfg.sort_jump_to_file, TRUE}, | 281 {"sort_jump_to_file", &cfg.sort_jump_to_file, TRUE}, |
| 281 {"use_pl_metadata", &cfg.use_pl_metadata, TRUE}, | 282 {"use_pl_metadata", &cfg.use_pl_metadata, TRUE}, |
| 282 {"warn_about_unplayables", &cfg.warn_about_unplayables, TRUE}, | 283 {"warn_about_unplayables", &cfg.warn_about_unplayables, TRUE}, |
| 284 {"warn_about_win_visibility", &cfg.warn_about_win_visibility, TRUE}, | |
| 283 {"use_backslash_as_dir_delimiter", &cfg.use_backslash_as_dir_delimiter, TRUE}, | 285 {"use_backslash_as_dir_delimiter", &cfg.use_backslash_as_dir_delimiter, TRUE}, |
| 284 {"player_shaded", &cfg.player_shaded, TRUE}, | 286 {"player_shaded", &cfg.player_shaded, TRUE}, |
| 285 {"player_visible", &cfg.player_visible, TRUE}, | 287 {"player_visible", &cfg.player_visible, TRUE}, |
| 286 {"shuffle", &cfg.shuffle, TRUE}, | 288 {"shuffle", &cfg.shuffle, TRUE}, |
| 287 {"repeat", &cfg.repeat, TRUE}, | 289 {"repeat", &cfg.repeat, TRUE}, |
| 677 playlist_get_position(playlist)); | 679 playlist_get_position(playlist)); |
| 678 | 680 |
| 679 /* FIXME: we're looking up SkinnedWindow::x &c ourselves here. | 681 /* FIXME: we're looking up SkinnedWindow::x &c ourselves here. |
| 680 * this isn't exactly right. -nenolod | 682 * this isn't exactly right. -nenolod |
| 681 */ | 683 */ |
| 682 bmp_cfg_db_set_int(db, NULL, "playlist_x", | 684 if ( SKINNED_WINDOW(playlistwin)->x != -1 && |
| 683 SKINNED_WINDOW(playlistwin)->x); | 685 SKINNED_WINDOW(playlistwin)->y != -1 ) |
| 684 | 686 { |
| 685 bmp_cfg_db_set_int(db, NULL, "playlist_y", | 687 bmp_cfg_db_set_int(db, NULL, "playlist_x", |
| 686 SKINNED_WINDOW(playlistwin)->y); | 688 SKINNED_WINDOW(playlistwin)->x); |
| 687 | 689 bmp_cfg_db_set_int(db, NULL, "playlist_y", |
| 688 bmp_cfg_db_set_int(db, NULL, "player_x", | 690 SKINNED_WINDOW(playlistwin)->y); |
| 689 SKINNED_WINDOW(mainwin)->x); | 691 } |
| 690 | 692 |
| 691 bmp_cfg_db_set_int(db, NULL, "player_y", | 693 if ( SKINNED_WINDOW(mainwin)->x != -1 && |
| 692 SKINNED_WINDOW(mainwin)->y); | 694 SKINNED_WINDOW(mainwin)->y != -1 ) |
| 693 | 695 { |
| 694 bmp_cfg_db_set_int(db, NULL, "equalizer_x", | 696 bmp_cfg_db_set_int(db, NULL, "player_x", |
| 695 SKINNED_WINDOW(equalizerwin)->x); | 697 SKINNED_WINDOW(mainwin)->x); |
| 696 | 698 bmp_cfg_db_set_int(db, NULL, "player_y", |
| 697 bmp_cfg_db_set_int(db, NULL, "equalizer_y", | 699 SKINNED_WINDOW(mainwin)->y); |
| 698 SKINNED_WINDOW(equalizerwin)->y); | 700 } |
| 701 | |
| 702 if ( SKINNED_WINDOW(equalizerwin)->x != -1 && | |
| 703 SKINNED_WINDOW(equalizerwin)->y != -1 ) | |
| 704 { | |
| 705 bmp_cfg_db_set_int(db, NULL, "equalizer_x", | |
| 706 SKINNED_WINDOW(equalizerwin)->x); | |
| 707 bmp_cfg_db_set_int(db, NULL, "equalizer_y", | |
| 708 SKINNED_WINDOW(equalizerwin)->y); | |
| 709 } | |
| 699 | 710 |
| 700 bmp_cfg_db_set_bool(db, NULL, "mainwin_use_xfont", | 711 bmp_cfg_db_set_bool(db, NULL, "mainwin_use_xfont", |
| 701 cfg.mainwin_use_xfont); | 712 cfg.mainwin_use_xfont); |
| 702 | 713 |
| 703 for (i = 0; i < ncfgsent; ++i) { | 714 for (i = 0; i < ncfgsent; ++i) { |
| 1180 | 1191 |
| 1181 | 1192 |
| 1182 if (cfg.player_visible) | 1193 if (cfg.player_visible) |
| 1183 mainwin_show(TRUE); | 1194 mainwin_show(TRUE); |
| 1184 else if (!cfg.playlist_visible && !cfg.equalizer_visible) | 1195 else if (!cfg.playlist_visible && !cfg.equalizer_visible) |
| 1185 mainwin_show(TRUE); | 1196 { |
| 1197 /* all of the windows are hidden... warn user about this */ | |
| 1198 mainwin_show_visibility_warning(); | |
| 1199 } | |
| 1186 | 1200 |
| 1187 if (cfg.equalizer_visible) | 1201 if (cfg.equalizer_visible) |
| 1188 equalizerwin_show(TRUE); | 1202 equalizerwin_show(TRUE); |
| 1189 | 1203 |
| 1190 if (cfg.playlist_visible) | 1204 if (cfg.playlist_visible) |