Always enable volume control.

This commit is contained in:
sorgelig
2020-03-17 01:27:27 +08:00
parent 5b60007414
commit 5a4df1c8a8
5 changed files with 1 additions and 7 deletions

View File

@@ -6,7 +6,6 @@ composite_sync=0 ; set to 1 for composite sync on HSync signal of VGA outp
vga_scaler=0 ; set to 1 to connect VGA to scaler output.
hdmi_audio_96k=0 ; set to 1 for 96khz/16bit HDMI audio (48khz/16bit otherwise)
keyrah_mode=0x18d80002 ; VIDPID of keyrah for special code translation (0x23418037 for Arduino Micro)
volumectl=0 ; enable audio volume control by multimedia keys
vscale_mode=0 ; 0 - scale to fit the screen height.
; 1 - use integer scale only.
; 2 - use 0.5 steps of scale.

View File

@@ -49,7 +49,6 @@ static const ini_var_t ini_vars[] =
{ "KBD_NOMOUSE", (void*)(&(cfg.kbd_nomouse)), UINT8, 0, 1 },
{ "MOUSE_THROTTLE", (void*)(&(cfg.mouse_throttle)), UINT8, 1, 100 },
{ "BOOTSCREEN", (void*)(&(cfg.bootscreen)), UINT8, 0, 1 },
{ "VOLUMECTL", (void*)(&(cfg.volumectl)), UINT8, 0, 1 },
{ "VSCALE_MODE", (void*)(&(cfg.vscale_mode)), UINT8, 0, 3 },
{ "VSCALE_BORDER", (void*)(&(cfg.vscale_border)), UINT16, 0, 399 },
{ "RBF_HIDE_DATECODE", (void*)(&(cfg.rbf_hide_datecode)), UINT8, 0, 1 },

1
cfg.h
View File

@@ -29,7 +29,6 @@ typedef struct {
uint8_t kbd_nomouse;
uint8_t mouse_throttle;
uint8_t bootscreen;
uint8_t volumectl;
uint8_t vscale_mode;
uint16_t vscale_border;
uint8_t rbf_hide_datecode;

View File

@@ -2327,7 +2327,7 @@ void HandleUI(void)
memset(bar, 0x7f, 8 - m);
}
OsdWrite(13, s, menusub == 0, !cfg.volumectl);
OsdWrite(13, s, menusub == 0);
OsdWrite(15, STD_EXIT, menusub == 1, 0, OSD_ARROW_RIGHT);
break;

View File

@@ -728,7 +728,6 @@ void user_io_init(const char *path, const char *xml)
if(strlen(cfg.font)) LoadFont(cfg.font);
FileLoadConfig("Volume.dat", &vol_att, 1);
vol_att &= 0x1F;
if (!cfg.volumectl) vol_att = 0;
spi_uio_cmd8(UIO_AUDVOL, vol_att);
user_io_send_buttons(1);
@@ -3066,8 +3065,6 @@ int get_volume()
void set_volume(int cmd)
{
if (!cfg.volumectl) return;
vol_set_timeout = GetTimer(1000);
vol_att &= 0x17;