Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
ITASampler
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Iterations
Merge Requests
0
Merge Requests
0
Requirements
Requirements
List
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Incidents
Analytics
Analytics
Code Review
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
Institute of Technical Acoustics (ITA)
ITASampler
Commits
de969453
Commit
de969453
authored
Sep 30, 2016
by
Dipl.-Ing. Jonas Stienen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fixing bugs in static/dynamic library configuration
parent
cb6f89e3
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
9 additions
and
6 deletions
+9
-6
src/ITASoundSamplerImpl.h
src/ITASoundSamplerImpl.h
+7
-4
tests/CMakeLists.txt
tests/CMakeLists.txt
+1
-1
tests/Tests.cpp
tests/Tests.cpp
+1
-1
No files found.
src/ITASoundSamplerImpl.h
View file @
de969453
...
...
@@ -15,7 +15,8 @@ class ITADatasourceRealization;
class
ITASoundSampleImpl
;
class
ITASoundSamplePoolImpl
;
class
ITASoundSamplerImpl
:
public
ITASoundSampler
,
private
ITADatasourceRealization
{
class
ITASoundSamplerImpl
:
public
ITASoundSampler
,
private
ITADatasourceRealization
{
public:
ITASoundSamplerImpl
(
int
iOutputChannels
,
double
dSamplerate
,
int
iBlocklength
,
ITASoundSamplePool
*
pSamplepool
=
NULL
);
~
ITASoundSamplerImpl
();
...
...
@@ -74,7 +75,8 @@ public:
private:
// Interne Datenklasse die Spuren beschreibt
class
Track
{
class
Track
{
public:
std
::
string
sName
;
int
iChannels
;
// Anzahl Kanle
...
...
@@ -82,9 +84,10 @@ private:
std
::
vector
<
int
>
viChannelRoutings
;
// Ausgabe Kanle der einzelnen Spurkanle
std
::
vector
<
double
>
vdChannelGains
;
// Lautstrken der Spurkanle
Track
()
{}
inline
Track
()
{}
Track
(
int
iChannels
)
{
inline
Track
(
int
iChannels
)
{
/*
* Standardlautstrke fr die Spur und alle ihre Kanle = 0 dB.
* Standardmig werden die Kanle der Spur linear auf die Ausgangskanle abgebildet
...
...
tests/CMakeLists.txt
View file @
de969453
...
...
@@ -16,7 +16,7 @@ vista_use_package( OpenDAFF QUIET )
add_definitions
(
-DIEEE754_64FLOAT=1
)
if
(
ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC
)
add_definitions
(
-DITA_BASE_STATIC -DITA_SAMPLER_STATIC
)
add_definitions
(
-DITA_BASE_STATIC -DITA_SAMPLER_STATIC
-DITA_DATA_SOURCES_STATIC
)
endif
(
ITA_CORE_LIBS_BUILD_STATIC AND DEFINED ITA_CORE_LIBS_BUILD_STATIC
)
...
...
tests/Tests.cpp
View file @
de969453
...
...
@@ -127,7 +127,7 @@ int main(int argc, char* argv[]) {
sampler
->
AddPlaybackBySamplecount
(
SAMPLE_TOM1
+
irandx
(
3
),
TRACK_TOMS
,
int
(
t
+
(
j
+
p
)
*
u
),
false
,
randgain
()
);
if
(
randmatch
(
0.75
))
sampler
->
AddPlaybackBySamplecount
(
SAMPLE_CRASH
,
TRACK_CRASH
,
int
(
t
+
(
j
+
p
+
1
)
*
u
),
false
,
randgain
()
);
sampler
->
AddPlaybackBySamplecount
(
SAMPLE_CRASH
,
TRACK_CRASH
,
int
(
t
+
(
j
+
p
+
1
)
*
u
),
false
,
randgain
()
);
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a 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