Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
Institute of Technical Acoustics (ITA)
ITABase
Commits
ae917c9e
Commit
ae917c9e
authored
Aug 26, 2016
by
js908001
Browse files
Fixes for linux build
parent
13a59d61
Changes
9
Hide whitespace changes
Inline
Side-by-side
CMakeLists.txt
View file @
ae917c9e
...
...
@@ -63,9 +63,7 @@ set( ITABaseHeader
"include/ITAFileSystemUtils.h"
"include/ITAHDFTSpectrum.h"
"include/ITAFunctors.h"
"include/ITAHPT.h"
"include/ITALog.h"
"include/ITAMutex.h"
"include/ITANumericUtils.h"
"include/ITASampleBuffer.h"
"include/ITASampleFrame.h"
...
...
@@ -95,9 +93,7 @@ set( ITABaseSources
"src/ITAFade.cpp"
"src/ITAFileSystemUtils.cpp"
"src/ITAHDFTSpectrum.cpp"
"src/ITAHPT.cpp"
"src/ITALog.cpp"
"src/ITAMutex.cpp"
"src/ITANumericUtils.cpp"
"src/ITASampleBuffer.cpp"
"src/ITASampleFrame.cpp"
...
...
@@ -109,6 +105,13 @@ set( ITABaseSources
"src/spline.cpp"
)
# Win32 implementations
if
(
WIN32
)
list
(
APPEND
${
ITABaseHeader
}
"include/ITAHPT.h"
"include/ITAMutex.h"
)
list
(
APPEND
${
ITABaseHeader
}
"src/ITAHPT.cpp"
"include/ITAMutex.h"
)
endif
(
WIN32
)
if
(
VSNDFILE_FOUND AND ITA_BASE_WITH_SNDFILE
)
set
(
ITABaseHeader
"
${
ITABaseHeader
}
"
"include/ITAAudiofileCommon.h"
...
...
@@ -173,6 +176,8 @@ endif( ITA_BASE_WITH_CONFIG_OLD_IMPL AND NOT ITA_BASE_WITH_CONFIG_SIMPLE_INI )
# Windows DLL compiler flags
if
(
WIN32
)
add_definitions
(
-DITA_BASE_DLL -DITA_BASE_EXPORT
)
else
(
WIN32
)
#add_definitions( -std=c++0x )
endif
(
WIN32
)
...
...
include/ITAEndianness.h
View file @
ae917c9e
...
...
@@ -23,6 +23,8 @@
// ITABase
#include
<ITABaseDefinitions.h>
#include
<stddef.h>
//! Literals for Endianness
enum
ITA_BASE_API
{
...
...
include/ITASampleTypeConversion.h
View file @
ae917c9e
...
...
@@ -22,6 +22,7 @@
// ITABase
#include
<ITABaseDefinitions.h>
#include
<stddef.h>
//! Converts signed integer 16-Bit -> single precision floating point (32-Bit)
void
ITA_BASE_API
stc_sint16_to_float
(
float
*
dest
,
const
short
*
src
,
size_t
count
,
int
input_stride
=
1
,
int
output_stride
=
1
);
...
...
src/ITABufferedAudioFileWriter.cpp
View file @
ae917c9e
#include
<ITABufferedAudio
f
ileWriter.h>
#include
<ITABufferedAudio
F
ileWriter.h>
#include
<ITAException.h>
#include
<ITASampleFrame.h>
...
...
src/ITACriticalSectionPosixImpl.h
View file @
ae917c9e
...
...
@@ -3,7 +3,7 @@
#ifndef INCLUDE_WATCHER_ITA_CRITICALSECTION_POSIXIMPL
#define INCLUDE_WATCHER_ITA_CRITICALSECTION_POSIXIMPL
#include
<
ITACriticalSectionImpl.h
>
#include
"
ITACriticalSectionImpl.h
"
#include
<pthread.h>
/*
...
...
src/ITAFileSystemUtils.cpp
View file @
ae917c9e
#include
<ITAFile
s
ystemUtils.h>
#include
<ITAFile
S
ystemUtils.h>
#if defined(WIN32) || defined(PLATFORM_X64)
#include
<windows.h>
...
...
src/ITASampleBuffer.cpp
View file @
ae917c9e
...
...
@@ -6,6 +6,7 @@
#include
<assert.h>
#include
<math.h>
#include
<sstream>
#include
<memory.h>
#include
<ITAException.h>
#include
<ITAFade.h>
...
...
@@ -101,6 +102,7 @@ namespace CRels
}
}
// Complex-valued multiply-accumulate
// Complex-valued multiply-accumulate
// Semantic: srcdest[i] += src1[i]*src2[i]
void fm_cmuladd_f32(float* srcdest, const float* src1, const float* src2, int count) {
...
...
@@ -590,7 +592,6 @@ ITASampleBuffer& ITASampleBuffer::operator=(const ITASampleBuffer& rhs) {
if
(
m_pParent
)
{
if
(
rhs
.
m_iLength
!=
m_iLength
)
ITA_EXCEPT1
(
MODAL_EXCEPTION
,
"Assignment impossible. Would change length, but sample buffer is part of a parent sample frame."
);
}
...
...
src/ITASampleTypeConversion.cpp
View file @
ae917c9e
#include
<ITASampleTypeConversion.h>
#include
<ITAEndianness.h>
#include
<stddef.h>
void
stc_sint16_to_float
(
float
*
dest
,
const
short
*
src
,
size_t
count
,
int
input_stride
,
int
output_stride
)
{
for
(
size_t
i
=
0
;
i
<
count
;
i
++
)
...
...
src/ITAStopWatch.cpp
View file @
ae917c9e
...
...
@@ -4,6 +4,7 @@
#include
<ITAException.h>
#include
<string>
#include
<cmath>
#include
<float.h>
#include
<sstream>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment