diff --git a/MiSTer.ini b/MiSTer.ini index 63f728e..ddad794 100644 --- a/MiSTer.ini +++ b/MiSTer.ini @@ -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. diff --git a/cfg.cpp b/cfg.cpp index 595ee85..9374bb2 100644 --- a/cfg.cpp +++ b/cfg.cpp @@ -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 }, diff --git a/cfg.h b/cfg.h index e14b652..b98cf44 100644 --- a/cfg.h +++ b/cfg.h @@ -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; diff --git a/menu.cpp b/menu.cpp index 737085f..d8e3aaf 100644 --- a/menu.cpp +++ b/menu.cpp @@ -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; diff --git a/user_io.cpp b/user_io.cpp index 5f74fca..ec1185b 100644 --- a/user_io.cpp +++ b/user_io.cpp @@ -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;