mirror of
https://github.com/holub/mame
synced 2025-06-07 13:23:50 +03:00
Some like it wide
This commit is contained in:
parent
d937adb6a3
commit
7778796ceb
@ -1860,7 +1860,7 @@ std::vector<ui::menu_item> mame_ui_manager::slider_init(running_machine &machine
|
|||||||
m_sliders.clear();
|
m_sliders.clear();
|
||||||
|
|
||||||
// add overall volume
|
// add overall volume
|
||||||
slider_alloc(_("Master Volume"), -48, osd::linear_to_db(0), 6, 1, std::bind(&mame_ui_manager::slider_volume, this, _1, _2));
|
slider_alloc(_("Master Volume"), -96, osd::linear_to_db(0), 12, 1, std::bind(&mame_ui_manager::slider_volume, this, _1, _2));
|
||||||
|
|
||||||
// add per-sound device and per-sound device channel volume
|
// add per-sound device and per-sound device channel volume
|
||||||
for (device_sound_interface &snd : sound_interface_enumerator(machine.root_device()))
|
for (device_sound_interface &snd : sound_interface_enumerator(machine.root_device()))
|
||||||
@ -1869,10 +1869,10 @@ std::vector<ui::menu_item> mame_ui_manager::slider_init(running_machine &machine
|
|||||||
if (dynamic_cast<sound_io_device *>(&snd) || !snd.outputs())
|
if (dynamic_cast<sound_io_device *>(&snd) || !snd.outputs())
|
||||||
continue;
|
continue;
|
||||||
|
|
||||||
slider_alloc(util::string_format(_("%1$s volume"), snd.device().tag()), -48, osd::linear_to_db_int(snd.user_output_gain()), 6, 1, std::bind(&mame_ui_manager::slider_devvol, this, &snd, _1, _2));
|
slider_alloc(util::string_format(_("%1$s volume"), snd.device().tag()), -96, osd::linear_to_db_int(snd.user_output_gain()), 12, 1, std::bind(&mame_ui_manager::slider_devvol, this, &snd, _1, _2));
|
||||||
if (snd.outputs() != 1)
|
if (snd.outputs() != 1)
|
||||||
for (int channel = 0; channel != snd.outputs(); channel ++)
|
for (int channel = 0; channel != snd.outputs(); channel ++)
|
||||||
slider_alloc(util::string_format(_("%1$s channel %d volume"), snd.device().tag(), channel), -48, osd::linear_to_db_int(snd.user_output_gain(channel)), 6, 1, std::bind(&mame_ui_manager::slider_devvol_chan, this, &snd, channel, _1, _2));
|
slider_alloc(util::string_format(_("%1$s channel %d volume"), snd.device().tag(), channel), -96, osd::linear_to_db_int(snd.user_output_gain(channel)), 12, 1, std::bind(&mame_ui_manager::slider_devvol_chan, this, &snd, channel, _1, _2));
|
||||||
}
|
}
|
||||||
|
|
||||||
// add analog adjusters
|
// add analog adjusters
|
||||||
@ -2015,13 +2015,13 @@ std::vector<ui::menu_item> mame_ui_manager::slider_init(running_machine &machine
|
|||||||
int32_t mame_ui_manager::slider_volume(std::string *str, int32_t newval)
|
int32_t mame_ui_manager::slider_volume(std::string *str, int32_t newval)
|
||||||
{
|
{
|
||||||
if (newval != SLIDER_NOCHANGE)
|
if (newval != SLIDER_NOCHANGE)
|
||||||
machine().sound().set_master_gain(newval == -48 ? 0 : osd::db_to_linear(newval));
|
machine().sound().set_master_gain(newval == -96 ? 0 : osd::db_to_linear(newval));
|
||||||
|
|
||||||
int curval = machine().sound().master_gain() == 0 ? -48 : osd::linear_to_db_int(machine().sound().master_gain());
|
int curval = machine().sound().master_gain() == 0 ? -96 : osd::linear_to_db_int(machine().sound().master_gain());
|
||||||
|
|
||||||
if (str)
|
if (str)
|
||||||
{
|
{
|
||||||
if (curval == -48)
|
if (curval == -96)
|
||||||
*str = _("Mute");
|
*str = _("Mute");
|
||||||
else
|
else
|
||||||
*str = string_format(_(u8"%1$3d\u00a0dB"), curval);
|
*str = string_format(_(u8"%1$3d\u00a0dB"), curval);
|
||||||
@ -2038,13 +2038,13 @@ int32_t mame_ui_manager::slider_volume(std::string *str, int32_t newval)
|
|||||||
int32_t mame_ui_manager::slider_devvol(device_sound_interface *snd, std::string *str, int32_t newval)
|
int32_t mame_ui_manager::slider_devvol(device_sound_interface *snd, std::string *str, int32_t newval)
|
||||||
{
|
{
|
||||||
if (newval != SLIDER_NOCHANGE)
|
if (newval != SLIDER_NOCHANGE)
|
||||||
snd->set_user_output_gain(newval == -48 ? 0 : osd::db_to_linear(newval));
|
snd->set_user_output_gain(newval == -96 ? 0 : osd::db_to_linear(newval));
|
||||||
|
|
||||||
int curval = snd->user_output_gain() == 0 ? -48 : osd::linear_to_db_int(snd->user_output_gain());
|
int curval = snd->user_output_gain() == 0 ? -96 : osd::linear_to_db_int(snd->user_output_gain());
|
||||||
|
|
||||||
if (str)
|
if (str)
|
||||||
{
|
{
|
||||||
if (curval == -48)
|
if (curval == -96)
|
||||||
*str = _("Mute");
|
*str = _("Mute");
|
||||||
else
|
else
|
||||||
*str = string_format(_(u8"%1$3d\u00a0dB"), curval);
|
*str = string_format(_(u8"%1$3d\u00a0dB"), curval);
|
||||||
@ -2061,13 +2061,13 @@ int32_t mame_ui_manager::slider_devvol(device_sound_interface *snd, std::string
|
|||||||
int32_t mame_ui_manager::slider_devvol_chan(device_sound_interface *snd, int channel, std::string *str, int32_t newval)
|
int32_t mame_ui_manager::slider_devvol_chan(device_sound_interface *snd, int channel, std::string *str, int32_t newval)
|
||||||
{
|
{
|
||||||
if (newval != SLIDER_NOCHANGE)
|
if (newval != SLIDER_NOCHANGE)
|
||||||
snd->set_user_output_gain(channel, newval == -48 ? 0 : osd::db_to_linear(newval));
|
snd->set_user_output_gain(channel, newval == -96 ? 0 : osd::db_to_linear(newval));
|
||||||
|
|
||||||
int curval = snd->user_output_gain(channel) == 0 ? -48 : osd::linear_to_db_int(snd->user_output_gain(channel));
|
int curval = snd->user_output_gain(channel) == 0 ? -96 : osd::linear_to_db_int(snd->user_output_gain(channel));
|
||||||
|
|
||||||
if (str)
|
if (str)
|
||||||
{
|
{
|
||||||
if (curval == -48)
|
if (curval == -96)
|
||||||
*str = _("Mute");
|
*str = _("Mute");
|
||||||
else
|
else
|
||||||
*str = string_format(_(u8"%1$3d\u00a0dB"), curval);
|
*str = string_format(_(u8"%1$3d\u00a0dB"), curval);
|
||||||
|
Loading…
Reference in New Issue
Block a user