# HG changeset patch # User ib # Date 1355064084 0 # Node ID fdaab02e71181a62c05a13b7841851ecaf1e8796 # Parent ded4a8c2aa709a3519f24d5667874c1356ed5b7a Set volume in GUI_SET_MIXER. This in missing in r35631. diff -r ded4a8c2aa70 -r fdaab02e7118 gui/interface.c --- a/gui/interface.c Sun Dec 09 13:19:42 2012 +0000 +++ b/gui/interface.c Sun Dec 09 14:41:24 2012 +0000 @@ -751,6 +751,7 @@ if (mixer) { float l, r, b; + static float last_balance = 50.0f; mixer_getvolume(mixer, &l, &r); guiInfo.Volume = FFMAX(l, r); @@ -758,7 +759,14 @@ mixer_getbalance(mixer, &b); guiInfo.Balance = (b + 1.0) * 50.0; - btnModify(evSetBalance, guiInfo.Balance); + + if (guiInfo.Balance != last_balance) { + l = guiInfo.Volume * (100.0 - guiInfo.Balance) / 50.0; + r = guiInfo.Volume * guiInfo.Balance / 50.0; + mixer_setvolume(mixer, FFMIN(l, guiInfo.Volume), FFMIN(r, guiInfo.Volume)); + btnModify(evSetBalance, guiInfo.Balance); + last_balance = guiInfo.Balance; + } } break;