Skip to content

Commit

Permalink
UI|Control Panel|Client: Removed the Control Panel's "Audio" page
Browse files Browse the repository at this point in the history 
These options are now present in the DE menu, under "Audio Settings".
  • Loading branch information
@skyjake
skyjake committed Sep 2, 2013
1 parent 912eef9 commit e5f146b
Showing 1 changed file with 36 additions and 35 deletions.
71 changes: 36 additions & 35 deletions doomsday/client/src/ui/ui_panel.cpp
View file
Expand Up @@ -38,7 +38,7 @@

// MACROS ------------------------------------------------------------------

#define NUM_CP_BUTTONS 10
#define NUM_CP_BUTTONS 9
#define NUMITEMS(x) (sizeof(x)/sizeof(uidata_listitem_t))
//#define RES(x, y) ((x) | ((y) << 16))
#define CPID_FRAME (UIF_ID0 | UIF_ID1)
Expand Down Expand Up @@ -89,8 +89,8 @@ void CP_QuickFOV(ui_object_t *ob);
// PUBLIC DATA DEFINITIONS -------------------------------------------------

char panel_buttons[NUM_CP_BUTTONS] = { true }; // The first is active.
char panel_sv_password[100]; //, panel_res_x[40], panel_res_y[40];
int panel_fullscreen, panel_bpp;
//char panel_sv_password[100]; //, panel_res_x[40], panel_res_y[40];
//int panel_fullscreen, panel_bpp;
int panel_help_active = false;
int panel_help_offset = 0; // Zero means the help is completely hidden.
byte panel_show_help = true; // cvar
Expand All @@ -110,9 +110,9 @@ cvarbutton_t cvarbuttons[] = {
{0, "net-nosleep"},
{0, "net-dev"},
{0, "net-queue-show"},
{0, "sound-16bit"},
{0, "sound-3d"},
{0, "sound-info"},
//{0, "sound-16bit"},
//{0, "sound-3d"},
//{0, "sound-info"},
//{0, "vid-vsync", "VSync on", "VSync off"},
//{0, "vid-fsaa", "Antialias", "No antialias"},
{0, "rend-particle"},
Expand Down Expand Up @@ -160,7 +160,6 @@ uidata_listitem_t lstit_con_completion[] = {
uidata_list_t lst_con_completion = {
lstit_con_completion, NUMITEMS(lstit_con_completion), (void*) "con-completion"
};
#endif

uidata_listitem_t lstit_music_source[] = {
{"MUS lumps", 0},
Expand All @@ -179,6 +178,7 @@ uidata_listitem_t lstit_sound_rate[] = {
uidata_list_t lst_sound_rate = {
lstit_sound_rate, NUMITEMS(lstit_sound_rate), (void*) "sound-rate"
};
#endif

uidata_listitem_t lstit_smooth_move[] = {
{"Disabled", 0},
Expand Down Expand Up @@ -274,11 +274,11 @@ uidata_slider_t sld_client_pos_interval =
#if 0
uidata_slider_t sld_server_frame_interval =
{ 0, 35, 0, 1, false, (void*) "server-frame-interval" };
#endif
uidata_slider_t sld_sound_volume = { 0, 255, 0, 1, false, (void*) "sound-volume" };
uidata_slider_t sld_music_volume = { 0, 255, 0, 1, false, (void*) "music-volume" };
uidata_slider_t sld_reverb_volume =
{ 0, 1, 0, .01f, true, (void*) "sound-reverb-volume" };
#endif
uidata_slider_t sld_particle_max =
{ 0, 10000, 0, 10, false, (void*) "rend-particle-max", (char*) "Unlimited" };
uidata_slider_t sld_particle_rate =
Expand Down Expand Up @@ -363,16 +363,16 @@ ui_page_t page_panel;
ui_object_t ob_panel[] =
{
// { UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 210, 240, 60, "Video", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[0] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 210, 240, 60, "Audio", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[0] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 275, 240, 60, "Input", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[1] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 340, 240, 60, "Graphics", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[2] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 40, 405, 210, 60, "Lights", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[3] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 40, 467, 210, 60, "Halos", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[4] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 40, 529, 210, 60, "Textures", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[5] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 40, 591, 210, 60, "Objects", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[6] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 40, 653, 210, 60, "Particles", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[7] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 715, 240, 60, "Network", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[8] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 780, 240, 60, "Console", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[9] },
// { UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 210, 240, 60, "Audio", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[0] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 210, 240, 60, "Input", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[0] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 275, 240, 60, "Graphics", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[1] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 40, 340, 210, 60, "Lights", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[2] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 40, 405, 210, 60, "Halos", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[3] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 40, 467, 210, 60, "Textures", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[4] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 40, 529, 210, 60, "Objects", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[5] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 40, 591, 210, 60, "Particles", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[6] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 653, 240, 60, "Network", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[7] },
{ UI_BUTTON2, 1, UIF_LEFT_ALIGN, 10, 715, 240, 60, "Console", UIButton_Drawer, UIButton_Responder, 0, CP_ChooseGroup, &panel_buttons[8] },
{ UI_BUTTON, 0, UIF_NEVER_FADE, 10, 940, 240, 60, "Close Panel (Esc)", UIButton_Drawer, UIButton_Responder, 0, CP_ClosePanel },
{ UI_BOX, 0, 0, 8, -20, 250, 250, "", CP_DrawLogo },
{ UI_BOX, 0, CPID_FRAME, 280, 55, 720, 945, "", CP_DrawBorder },
Expand Down Expand Up @@ -406,7 +406,7 @@ ui_object_t ob_panel[] =
{ UI_BUTTON, 0, 0, 680, 790, 170, 60, "Set Default", UIButton_Drawer, UIButton_Responder, 0, CP_SetDefaultVidMode },
{ UI_TEXT, 0, 0, 300, 910, 0, 55, "Change to", UIText_Drawer },
{ UI_BUTTON, 0, CPID_SET_RES, 680, 910, 300, 60, "", UIButton_Drawer, UIButton_Responder, 0, CP_SetVidMode },
#endif

{ UI_META, 2 },
{ UI_TEXT, 0, 0, 280, 0, 0, 50, "Audio Options", UIText_BrightDrawer },
{ UI_TEXT, 0, 0, 300, 70, 0, 55, "Sound volume", UIText_Drawer },
Expand All @@ -425,8 +425,9 @@ ui_object_t ob_panel[] =
{ UI_SLIDER, 0, 0, 680, 620, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_reverb_volume },
{ UI_TEXT, 0, 0, 300, 680, 0, 55, "Show status of channels", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 680, 70, 55, "sound-info", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
#endif

{ UI_META, 3 },
{ UI_META, 2 },
{ UI_TEXT, 0, 0, 280, 0, 0, 50, "Input Options", UIText_BrightDrawer },
{ UI_TEXT, 0, 0, 300, 70, 0, 55, "Mouse X sensitivity", UIText_Drawer },
{ UI_SLIDER, 0, 0, 680, 70, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_mouse_x_scale },
Expand All @@ -438,7 +439,7 @@ ui_object_t ob_panel[] =
{ UI_TEXT, 0, 0, 300, 250, 0, 55, "Mouse Y mode", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 250, 80, 55, "input-mouse-y-flags", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton, 0, IDA_INVERT },
{ UI_BUTTON2, 0, 0, 765, 250, 80, 55, "input-mouse-y-flags", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton, 0, IDA_DISABLED },
{ UI_META, 3, 0, 0, 60 },
{ UI_META, 2, 0, 0, 60 },
{ UI_TEXT, 0, 0, 300, 250, 0, 55, "Enable joystick", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 250, 70, 55, "input-joy", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
#if 0
Expand All @@ -448,9 +449,9 @@ ui_object_t ob_panel[] =
{ UI_SLIDER, 0, 0, 680, 490, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_keywait2 },
#endif

{ UI_META, 4 },
{ UI_META, 3 },
{ UI_TEXT, 0, 0, 280, 0, 0, 50, "Graphics Options", UIText_BrightDrawer },
{ UI_META, 4, 0, 0, -60 },
{ UI_META, 3, 0, 0, -60 },
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 130, 0, 55, "Field Of View angle", UIText_Drawer },
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 130, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_fov },
{ UI_BUTTON, 0, UIF_FADE_AWAY, 680, 190, 70, 60, "95", UIButton_Drawer, UIButton_Responder, 0, CP_QuickFOV },
Expand All @@ -459,7 +460,7 @@ ui_object_t ob_panel[] =
{ UI_BUTTON, 0, UIF_FADE_AWAY, 905, 190, 70, 60, "125", UIButton_Drawer, UIButton_Responder, 0, CP_QuickFOV },
{ UI_TEXT, 0, 0, 300, 255, 0, 55, "Mirror player weapon models", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 255, 70, 55, "rend-model-mirror-hud", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
{ UI_META, 4, 0, 0, 60 },
{ UI_META, 3, 0, 0, 60 },
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 255, 0, 55, "Sky sphere radius", UIText_Drawer },
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 255, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_sky_distance },
{ UI_TEXT, 0, 0, 300, 315, 0, 55, "Objects cast shadows", UIText_Drawer },
Expand All @@ -475,7 +476,7 @@ ui_object_t ob_panel[] =
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 615, 0, 55, "Radiosity shadow darkness", UIText_Drawer },
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 615, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_fakeradio_dark },

{ UI_META, 5 },
{ UI_META, 4 },
{ UI_TEXT, 0, 0, 280, 0, 0, 50, "Graphics Options: Lights", UIText_BrightDrawer },
{ UI_TEXT, 0, 0, 300, 70, 0, 55, "Enable dynamic lights", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 70, 70, 55, "rend-light", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
Expand All @@ -489,7 +490,7 @@ ui_object_t ob_panel[] =
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 370, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_light_radmax },
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 430, 0, 55, "Maximum number of dynamic lights", UIText_Drawer },
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 430, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_light_max },
{ UI_META, 5, 0, 0, -120 },
{ UI_META, 4, 0, 0, -120 },
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 610, 0, 55, "Ambient light level", UIText_Drawer },
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 610, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_light_ambient },
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 670, 0, 55, "Light range compression", UIText_Drawer },
Expand All @@ -507,13 +508,13 @@ ui_object_t ob_panel[] =
{ UI_TEXT, 0, 0, 300, 1030, 0, 55, "Enable decorations", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 1030, 70, 55, "rend-light-decor", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },

{ UI_META, 6 },
{ UI_META, 5 },
{ UI_TEXT, 0, 0, 280, 0, 0, 50, "Graphics Options: Halos", UIText_BrightDrawer },
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 70, 0, 55, "Number of flares per halo", UIText_Drawer },
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 70, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo },
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 130, 0, 55, "Use realistic halos", UIText_Drawer },
{ UI_BUTTON2, 0, UIF_FADE_AWAY, 680, 130, 70, 55, "rend-halo-realistic", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
{ UI_META, 6, 0, 0, 60 },
{ UI_META, 5, 0, 0, 60 },
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 130, 0, 55, "Halo brightness", UIText_Drawer },
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 130, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo_bright },
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 190, 0, 55, "Halo size factor", UIText_Drawer },
Expand All @@ -531,7 +532,7 @@ ui_object_t ob_panel[] =
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 550, 0, 55, "Z magnification divisor", UIText_Drawer },
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 550, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_halo_zmagdiv },

{ UI_META, 7 },
{ UI_META, 6 },
{ UI_TEXT, 0, 0, 280, 0, 0, 50, "Graphics Options: Textures", UIText_BrightDrawer },
{ UI_TEXT, 0, 0, 300, 70, 0, 55, "Enable textures", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 70, 70, 55, "rend-tex", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
Expand All @@ -541,14 +542,14 @@ ui_object_t ob_panel[] =
{ UI_BUTTON2, 0, 0, 880, 130, 95, 55, "rend-model-shiny-multitex", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
{ UI_TEXT, 0, 0, 300, 190, 0, 55, "Smooth texture animation", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 190, 70, 55, "rend-tex-anim-smooth", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
{ UI_META, 7, 0, 0, 120 },
{ UI_META, 6, 0, 0, 120 },
{ UI_TEXT, 0, 0, 300, 130, 0, 55, "Mipmapping filter", UIText_Drawer },
{ UI_LIST, 0, 0, 680, 130, 300, 175, "", UIList_Drawer, UIList_Responder, UIList_Ticker, CP_CvarList, &lst_mipmap },
{ UI_TEXT, 0, 0, 300, 310, 0, 55, "Texture quality", UIText_Drawer },
{ UI_SLIDER, 0, 0, 680, 310, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_tex_quality },
{ UI_TEXT, 0, 0, 300, 370, 0, 55, "Smart texture filtering", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 370, 70, 55, "rend-tex-filter-smart", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
{ UI_META, 7, 0, 0, 180 },
{ UI_META, 6, 0, 0, 180 },
{ UI_TEXT, 0, 0, 300, 370, 0, 55, "Bilinear filtering", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 370, 95, 55, "rend-tex-filter-sprite", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
{ UI_BUTTON2, 0, 0, 780, 370, 95, 55, "rend-tex-filter-mag", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
Expand All @@ -562,7 +563,7 @@ ui_object_t ob_panel[] =
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 610, 0, 55, "Detail texture contrast", UIText_Drawer },
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 610, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_detail_strength },

{ UI_META, 8 },
{ UI_META, 7 },
{ UI_TEXT, 0, 0, 280, 0, 0, 50, "Graphics Options: Objects", UIText_BrightDrawer },
{ UI_TEXT, 0, 0, 300, 70, 0, 55, "Enable 3D models", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 70, 70, 55, "rend-model", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
Expand Down Expand Up @@ -591,7 +592,7 @@ ui_object_t ob_panel[] =
{ UI_TEXT, 0, 0, 300, 850, 0, 55, "Smooth actor movement", UIText_Drawer },
{ UI_LIST, 0, 0, 680, 850, 300, 115, "", UIList_Drawer, UIList_Responder, UIList_Ticker, CP_CvarList, &lst_smooth_move },

{ UI_META, 9 },
{ UI_META, 8 },
{ UI_TEXT, 0, 0, 280, 0, 0, 50, "Graphics Options: Particles", UIText_BrightDrawer },
{ UI_TEXT, 0, 0, 300, 70, 0, 55, "Enable particle effects", UIText_Drawer },
{ UI_BUTTON2, 0, 0, 680, 70, 70, 55, "rend-particle", UIButton_Drawer, UIButton_Responder, 0, CP_CvarButton },
Expand All @@ -604,7 +605,7 @@ ui_object_t ob_panel[] =
{ UI_TEXT, 0, UIF_FADE_AWAY, 300, 310, 0, 55, "Near clip distance", UIText_Drawer },
{ UI_SLIDER, 0, UIF_FADE_AWAY, 680, 310, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_particle_visnear },

{ UI_META, 10 },
{ UI_META, 9 },
{ UI_TEXT, 0, 0, 280, 0, 0, 50, "Network Options", UIText_BrightDrawer },
#if 0
{ UI_TEXT, 0, 0, 300, 70, 0, 55, "Continuous screen refresh", UIText_Drawer },
Expand All @@ -623,7 +624,7 @@ ui_object_t ob_panel[] =
{ UI_SLIDER, 0, 0, 680, 190, 300, 55, "", UISlider_Drawer, UISlider_Responder, UISlider_Ticker, CP_CvarSlider, &sld_server_frame_interval },
#endif

{ UI_META, 11 },
{ UI_META, 10 },
{ UI_TEXT, 0, 0, 280, 0, 0, 50, "Console Options", UIText_BrightDrawer },
#if 0
{ UI_TEXT, 0, 0, 300, 70, 0, 55, "Display FPS counter", UIText_Drawer },
Expand Down

0 comments on commit e5f146b

Please sign in to comment.