# HG changeset patch # User ib # Date 1355056380 0 # Node ID 9bc02a829c4860ab5f146095a43d3905bef3cdf9 # Parent 68a63175f1408f9995e3c069b01097da853226a0 Fix bug with evSetBalance. Calculation was wrong, resulting in a strangely acting GUI item. Moreover, the wrong OSD was displayed. diff -r 68a63175f140 -r 9bc02a829c48 gui/ui/main.c --- a/gui/ui/main.c Sun Dec 09 12:31:32 2012 +0000 +++ b/gui/ui/main.c Sun Dec 09 12:33:00 2012 +0000 @@ -287,10 +287,6 @@ case evSetVolume: guiInfo.Volume=param; - goto set_volume; - case evSetBalance: - guiInfo.Balance=param; -set_volume: { float l = guiInfo.Volume * ( ( 100.0 - guiInfo.Balance ) / 50.0 ); float r = guiInfo.Volume * ( ( guiInfo.Balance ) / 50.0 ); @@ -308,6 +304,17 @@ } break; + case evSetBalance: + guiInfo.Balance=param; + mixer_setbalance( mixer,(guiInfo.Balance - 50.0 ) / 50.0 ); + if ( osd_level ) + { + osd_visible=(GetTimerMS() + 1000) | 1; + vo_osd_progbar_type=OSD_BALANCE; + vo_osd_progbar_value=( ( guiInfo.Balance ) * 256.0 ) / 100.0; + vo_osd_changed( OSDTYPE_PROGBAR ); + } + break; case evMenu: /*if (guiApp.menuIsPresent) NOTE TO MYSELF: Uncomment only after mouse