comicsansg/CubicSDR
comicsansg
/
CubicSDR
mirror of https://github.com/cjcliffe/CubicSDR.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Other apps seem to want I/Q pipe in this format; going with the flow

This commit is contained in:
Charles J. Cliffe 2015-08-28 19:55:25 -04:00
parent e5b7f76b2a
commit b549f9748e
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
CMakeLists.txt
View File

@ -423,6 +423,12 @@ IF (MSVC)
set(CMAKE_CREATE_WIN32_EXE "/SUBSYSTEM:WINDOWS /ENTRY:\"mainCRTStartup\"") set(CMAKE_CREATE_WIN32_EXE "/SUBSYSTEM:WINDOWS /ENTRY:\"mainCRTStartup\"")
ENDIF(MSVC) ENDIF(MSVC)
IF (APPLE)
ADD_DEFINITIONS(
-DHAVE_TYPE_TRAITS=1
)
ENDIF(APPLE)
IF (APPLE AND BUNDLE_APP) IF (APPLE AND BUNDLE_APP)
PROJECT(CubicSDR) PROJECT(CubicSDR)
SET(MACOSX_BUNDLE_BUNDLE_NAME CubicSDR) SET(MACOSX_BUNDLE_BUNDLE_NAME CubicSDR)
@ -431,7 +437,6 @@ IF (APPLE AND BUNDLE_APP)
-std=c++0x -std=c++0x
-pthread -pthread
-D_OSX_APP_ -D_OSX_APP_
-DHAVE_TYPE_TRAITS=1
-mmacosx-version-min=10.9 -mmacosx-version-min=10.9
) )

4
src/demod/DemodulatorThread.cpp
View File

@ -320,8 +320,8 @@ void DemodulatorThread::run() {
} }
ati->data.resize(numAudioWritten * 2); ati->data.resize(numAudioWritten * 2);
for (int i = 0; i < numAudioWritten; i++) { for (int i = 0; i < numAudioWritten; i++) {
ati->data[i * 2] = (*inputData)[i].real; ati->data[i * 2] = (*inputData)[i].imag;
ati->data[i * 2 + 1] = (*inputData)[i].imag; ati->data[i * 2 + 1] = (*inputData)[i].real;
} }
} else if (stereo && inp->sampleRate >= 100000) { } else if (stereo && inp->sampleRate >= 100000) {
ati->channels = 2; ati->channels = 2;