Skip to content

Commit f89f3b1

Browse files
committed
Revert "compressor: add infinite release option (eg. combine with input gain of 12db for some sort of replaygain option)"
This reverts commit 9033932.
1 parent 9033932 commit f89f3b1

File tree

3 files changed

+4
-25
lines changed

3 files changed

+4
-25
lines changed

src/emu/audio_effects/compressor.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -388,7 +388,7 @@ void audio_effect_compressor::apply(const emu::detail::output_buffer_flat<sample
388388
float slewed_signal = m_slewed_signal[channel];
389389
if(input_db > slewed_signal)
390390
slewed_signal = attack_coefficient * (slewed_signal - input_db) + input_db;
391-
else if(m_release >= 0)
391+
else
392392
slewed_signal = release_coefficient * (slewed_signal - input_db) + input_db;
393393

394394
m_input_samples[channel] = input_db;

src/frontend/mame/ui/audio_effect_compressor.cpp

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -58,12 +58,7 @@ bool menu_audio_effect_compressor::handle(event const *ev)
5858
return true;
5959

6060
case RELEASE:
61-
if(alt_pressed)
62-
m_effect->set_release(0);
63-
else if(m_effect->release() < 0)
64-
m_effect->set_release(3000);
65-
else
66-
m_effect->set_release(max(0, m_effect->release() - (ctrl_pressed ? 1000 : shift_pressed ? 10 : 100)));
61+
m_effect->set_release(max(0, m_effect->release() - (alt_pressed ? 10000 : ctrl_pressed ? 1000 : shift_pressed ? 10 : 100)));
6762
if(m_chain == 0xffff)
6863
machine().sound().default_effect_changed(m_entry);
6964
reset(reset_options::REMEMBER_POSITION);
@@ -159,10 +154,7 @@ bool menu_audio_effect_compressor::handle(event const *ev)
159154
return true;
160155

161156
case RELEASE:
162-
if(alt_pressed || m_effect->release() == 3000)
163-
m_effect->set_release(-1);
164-
else if(m_effect->release() >= 0)
165-
m_effect->set_release(min(3000, m_effect->release() + (ctrl_pressed ? 1000 : shift_pressed ? 10 : 100)));
157+
m_effect->set_release(min(3000, m_effect->release() + (alt_pressed ? 10000 : ctrl_pressed ? 1000 : shift_pressed ? 10 : 100)));
166158
if(m_chain == 0xffff)
167159
machine().sound().default_effect_changed(m_entry);
168160
reset(reset_options::REMEMBER_POSITION);
@@ -373,18 +365,6 @@ u32 menu_audio_effect_compressor::flag_mode() const
373365
return flag;
374366
}
375367

376-
u32 menu_audio_effect_compressor::flag_release() const
377-
{
378-
u32 flag = 0;
379-
if(!m_effect->isset_release())
380-
flag |= FLAG_INVERT;
381-
if(m_effect->release() != 0)
382-
flag |= FLAG_LEFT_ARROW;
383-
if(m_effect->release() >= 0)
384-
flag |= FLAG_RIGHT_ARROW;
385-
return flag;
386-
}
387-
388368
u32 menu_audio_effect_compressor::flag_lim(float value, float min, float max, bool isset)
389369
{
390370
u32 flag = 0;
@@ -402,7 +382,7 @@ void menu_audio_effect_compressor::populate()
402382
item_append(_(audio_effect::effect_names[audio_effect::COMPRESSOR]), FLAG_UI_HEADING | FLAG_DISABLE, nullptr);
403383
item_append(_("Mode"), m_effect->mode() ? _("Active") : _("Bypass"), flag_mode(), (void *)MODE);
404384
item_append(_("Attack"), format_nodec(m_effect->attack()), flag_lim(m_effect->attack(), 0, 300, m_effect->isset_attack()), (void *)ATTACK);
405-
item_append(_("Release"), (m_effect->release() < 0) ? _("Infinite") : format_nodec(m_effect->release()), flag_release(), (void *)RELEASE);
385+
item_append(_("Release"), format_nodec(m_effect->release()), flag_lim(m_effect->release(), 0, 3000, m_effect->isset_release()), (void *)RELEASE);
406386
item_append(_("Ratio"), format_nodec(m_effect->ratio()), flag_lim(m_effect->ratio(), 1, 20, m_effect->isset_ratio()), (void *)RATIO);
407387

408388
item_append(_("Input gain"), format_db(m_effect->input_gain()), flag_lim(m_effect->input_gain(), -12, 24, m_effect->isset_input_gain()), (void *)INPUT_GAIN);

src/frontend/mame/ui/audio_effect_compressor.h

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,6 @@ class menu_audio_effect_compressor : public menu
5959
static std::string format_2dec(float val);
6060
static std::string format_db(float val);
6161
u32 flag_mode() const;
62-
u32 flag_release() const;
6362
static u32 flag_lim(float value, float min, float max, bool isset);
6463
static float max(float a, float b) { return a > b ? a : b; }
6564
static float min(float a, float b) { return a < b ? a : b; }

0 commit comments

Comments
 (0)