[beepmp-cvs] bmp/beep controlsocket.c,1.34.4.1,1.34.4.2

[Chong K. X. <des...@us...>]

Update of /cvsroot/beepmp/bmp/beep
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv17768/beep

Modified Files:
      Tag: release_0_9_7_1
	controlsocket.c 
Log Message:

* beep/controlsocket.c: Merge fix for #331 from HEAD.


Index: controlsocket.c
===================================================================
RCS file: /cvsroot/beepmp/bmp/beep/controlsocket.c,v
retrieving revision 1.34.4.1
retrieving revision 1.34.4.2
diff -C2 -d -r1.34.4.1 -r1.34.4.2
*** controlsocket.c	11 Aug 2005 07:25:51 -0000	1.34.4.1
--- controlsocket.c	4 Sep 2005 22:36:04 -0000	1.34.4.2
***************
*** 369,373 ****
          case CMD_GET_BALANCE:
              input_get_volume(&v[0], &v[1]);
!             if (v[0] > v[1])
                  b = -100 + ((v[1] * 100) / v[0]);
              else if (v[1] > v[0])
--- 369,375 ----
          case CMD_GET_BALANCE:
              input_get_volume(&v[0], &v[1]);
!             if (v[0] < 0 || v[1] < 0)
!                 b = 0;
!             else if (v[0] > v[1])
                  b = -100 + ((v[1] * 100) / v[0]);
              else if (v[1] > v[0])