eeva/jamulus
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

ASIO first version finished

Browse source
This commit is contained in:
Volker Fischer 2008-07-13 15:49:42 +00:00
parent 6b81e2ce55
commit f75d699116
3 changed files with 3 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/client.cpp
View file

@ -372,20 +372,6 @@ fflush(pFileDelay);
ResampleObjUpL.Resample ( vecdAudioL, vecdAudioSndCrdL );
ResampleObjUpR.Resample ( vecdAudioR, vecdAudioSndCrdR );
// TEST play sinusoidal signal for testing
static int iCnt = 0;
for ( i = 0; i < iSndCrdBlockSizeSam; i++ )
{
vecdAudioSndCrdL[i] = sin(6 * double(iCnt) / 48000 * 2000) * 22000;
vecdAudioSndCrdR[i] = vecdAudioSndCrdL[i];
iCnt++;
}
// copy data from one stereo buffer in two separate buffers
iInCnt = 0;
for ( i = 0; i < iSndCrdBlockSizeSam; i++ )

4
windows/llcon.vcproj
View file

@ -146,7 +146,7 @@
Name="VCCLCompilerTool"
Optimization="2"
InlineFunctionExpansion="1"
AdditionalIncludeDirectories="&quot;$(QTDIR)\include\Qt&quot;;&quot;$(QTDIR)\include&quot;;../src;ASIOSDK2/common;ASIOSDK2/host;ASIOSDK2/host/pc"
AdditionalIncludeDirectories="&quot;$(QTDIR)\include&quot;;&quot;$(QTDIR)\include\Qt&quot;;../src;ASIOSDK2/common;ASIOSDK2/host;ASIOSDK2/host/pc"
PreprocessorDefinitions="WIN32;NDEBUG;_WINDOWS;QT_DLL;QT_THREAD_SUPPORT"
StringPooling="true"
RuntimeLibrary="2"
@ -171,7 +171,7 @@
/>
<Tool
Name="VCLinkerTool"
AdditionalDependencies="winmm.lib $(QTDIR)\lib\qtmain.lib $(QTDIR)\lib\QtCore4.lib $(QTDIR)\lib\QtGui4.lib $(QTDIR)\lib\QtNetwork4.lib"
AdditionalDependencies="$(QTDIR)\lib\qtmain.lib $(QTDIR)\lib\QtCore4.lib $(QTDIR)\lib\QtGui4.lib $(QTDIR)\lib\QtNetwork4.lib $(QTDIR)\lib\QtXml4.lib winmm.lib"
OutputFile=".\Release/llcon.exe"
LinkIncremental="1"
SuppressStartupBanner="true"

10
windows/sound.cpp
View file

@ -107,14 +107,6 @@ bool CSound::Read ( CVector<short>& psData )
// very likely that a buffer got lost -> set error flag
bError = ( iInCurBlockToWrite == iCurNumSndBufIn );
/*
// TEST
if ( bError )
{
iInCurBlockToWrite = 1;
}
*/
ASIOMutex.lock(); // get mutex lock
{
// copy data from sound card in output buffer
@ -516,7 +508,7 @@ pstrDevices[0] = driverInfo.name;
// create event
m_ASIOEvent = CreateEvent ( NULL, FALSE, FALSE, NULL );
// init flag to open devices
// init flags
bChangParamIn = false;
bChangParamOut = false;
}