1. Correct the listings of Audio In and Audio Out devices, on unix-like

platforms.
2. This might be temporary: set Audio output on unix platforms to stereo,
i.e., channels=2.  On my Ubuntu system, at least, this makes it play
correctly on all of the relevant audio devices in the list, including
hardware and virtual (".asoundrc-implemented") devices.


git-svn-id: svn+ssh://svn.code.sf.net/p/wsjt/wsjt/branches/wsjtx@3317 ab8295b8-cf94-4d9e-aec4-7959e3be5d79
This commit is contained in:
Joe Taylor 2013-05-28 19:16:25 +00:00
parent 97a9e18846
commit 9a424e0110
3 changed files with 9 additions and 4 deletions

View File

@ -64,7 +64,8 @@ void DevSetup::initDlg()
QString t(p2);
#else
QString t;
t.sprintf("%2d %d %-8s %-39s",id,nchin,p1,pdi->name);
t.sprintf("%2d %d %-8s %-39s",id,nchin,
Pa_GetHostApiInfo(pdi->hostApi)->name,pdi->name);
#endif
ui.comboBoxSndIn->addItem(t);
}
@ -84,7 +85,7 @@ void DevSetup::initDlg()
#ifdef WIN32
// Needs work to compile for Linux
p1=(char*)"";
p=strstr(pa_device_hostapi,"MME");
p=strstr(pa_device_hostapi,"MME");Pa_GetHostApiInfo(pdi->hostApi)->name
if(p!=NULL) p1=(char*)"MME";
p=strstr(pa_device_hostapi,"Direct");
@ -99,7 +100,8 @@ void DevSetup::initDlg()
QString t(p2);
#else
QString t;
t.sprintf("%2d %d %-8s %-39s",id,nchin,p1,pdi->name);
t.sprintf("%2d %d %-8s %-39s",id,nchout,
Pa_GetHostApiInfo(pdi->hostApi)->name,pdi->name);
#endif
ui.comboBoxSndOut->addItem(t);
}

View File

@ -1,4 +1,4 @@
//------------------------------------------------------------- MainWindow
//------------------------------------------------------------ MainWindow
#include "mainwindow.h"
#include "ui_mainwindow.h"
#include "devsetup.h"

View File

@ -143,6 +143,9 @@ void SoundOutThread::run()
outParam.device=m_nDevOut; //Output device number
outParam.channelCount=1; //Number of analog channels
#ifdef unix
outParam.channelCount=2; //Number of analog channels
#endif
outParam.sampleFormat=paInt16; //Send short ints to PortAudio
outParam.suggestedLatency=0.05;
outParam.hostApiSpecificStreamInfo=NULL;