Commit 3e7ae971 authored by aymeric's avatar aymeric
Browse files

Minor Adjustments for WaveAPI.

git-svn-id: svn+ssh://svn.savannah.nongnu.org/linphone/trunk@473 3f6dc0c8-ddfe-455d-9043-3cd528dc4637
parent 9db49818
...@@ -41,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. ...@@ -41,7 +41,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
#define WINSND_NBUFS 10 #define WINSND_NBUFS 10
#define WINSND_OUT_NBUFS 20 #define WINSND_OUT_NBUFS 20
#define WINSND_NSAMPLES 320 #define WINSND_NSAMPLES 160
#define WINSND_MINIMUMBUFFER 5 #define WINSND_MINIMUMBUFFER 5
static MSFilter *ms_winsnd_read_new(MSSndCard *card); static MSFilter *ms_winsnd_read_new(MSSndCard *card);
...@@ -64,11 +64,11 @@ static void winsndcard_set_level(MSSndCard *card, MSSndCardMixerElem e, int perc ...@@ -64,11 +64,11 @@ static void winsndcard_set_level(MSSndCard *card, MSSndCardMixerElem e, int perc
MMRESULT mr = MMSYSERR_NOERROR; MMRESULT mr = MMSYSERR_NOERROR;
DWORD dwVolume = ((0xFFFF) * percent) / 100; DWORD dwVolume = ((0xFFFF) * percent) / 100;
WORD wLeftVol, wRightVol; WORD wLeftVol, wRightVol;
DWORD dwNewVol; DWORD dwNewVol;
wLeftVol = LOWORD(dwVolume); // get higher WORD wLeftVol = LOWORD(dwVolume); // get higher WORD
wRightVol = LOWORD(dwVolume); // get lower WORD wRightVol = LOWORD(dwVolume); // get lower WORD
dwNewVol = MAKELONG(wLeftVol, wRightVol); dwNewVol = MAKELONG(wLeftVol, wRightVol);
switch(e){ switch(e){
...@@ -262,8 +262,6 @@ static int winsndcard_get_level(MSSndCard *card, MSSndCardMixerElem e){ ...@@ -262,8 +262,6 @@ static int winsndcard_get_level(MSSndCard *card, MSSndCardMixerElem e){
MMRESULT mr = MMSYSERR_NOERROR; MMRESULT mr = MMSYSERR_NOERROR;
int percent; int percent;
WORD dwRightVol;
switch(e){ switch(e){
case MS_SND_CARD_MASTER: case MS_SND_CARD_MASTER:
case MS_SND_CARD_PLAYBACK: case MS_SND_CARD_PLAYBACK:
...@@ -1356,6 +1354,7 @@ static int get_rate(MSFilter *f, void *arg){ ...@@ -1356,6 +1354,7 @@ static int get_rate(MSFilter *f, void *arg){
static int set_rate(MSFilter *f, void *arg){ static int set_rate(MSFilter *f, void *arg){
WinSnd *d=(WinSnd*)f->data; WinSnd *d=(WinSnd*)f->data;
d->wfx.nSamplesPerSec=*((int*)arg); d->wfx.nSamplesPerSec=*((int*)arg);
d->wfx.nSamplesPerSec=44100;
return 0; return 0;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment