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
adf12942
Commit
adf12942
authored
Feb 21, 2017
by
Dipl.-Ing. Jonas Stienen
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of
https://git.rwth-aachen.de/ita/ITASampler
into develop
parents
95e87de7
1da6bdd5
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
23 additions
and
15 deletions
+23
-15
CMakeLists.txt
CMakeLists.txt
+3
-0
src/ITASoundSampleImpl.cpp
src/ITASoundSampleImpl.cpp
+1
-0
src/ITASoundSampleImpl.h
src/ITASoundSampleImpl.h
+1
-1
src/ITASoundSamplerImpl.cpp
src/ITASoundSamplerImpl.cpp
+3
-1
src/ITASoundSamplerImpl.h
src/ITASoundSamplerImpl.h
+3
-3
tests/CMakeLists.txt
tests/CMakeLists.txt
+9
-7
tests/RainyDay.cpp
tests/RainyDay.cpp
+2
-2
tests/Tests.cpp
tests/Tests.cpp
+1
-1
No files found.
CMakeLists.txt
View file @
adf12942
...
...
@@ -53,6 +53,9 @@ else( )
add_definitions
(
-DITA_SAMPLER_STATIC -DITA_CTC_STATIC -DITA_CONVOLUTION_STATIC -DITA_FFT_STATIC -DITA_BASE_STATIC -DITA_DATA_SOURCES_STATIC
)
endif
(
)
if
(
NOT WIN32
)
add_definitions
(
-std=gnu++11
)
endif
(
)
# linker
add_library
(
ITASampler
${
ITASamplerHeader
}
${
ITASamplerSources
}
)
...
...
src/ITASoundSampleImpl.cpp
View file @
adf12942
...
...
@@ -21,6 +21,7 @@
#include <ITAException.h>
#include <ITAFunctors.h>
#include <cstring>
#include <algorithm>
ITASoundSampleImpl
::
ITASoundSampleImpl
(
const
std
::
string
&
sFilename
,
int
iMaxNumberOfChannels
,
double
dRequiredSamplerate
,
std
::
string
sName
)
...
...
src/ITASoundSampleImpl.h
View file @
adf12942
...
...
@@ -44,7 +44,7 @@ public:
*
* Hinweis: Die Sample-Daten werden kopiert.
*/
ITASoundSampleImpl
::
ITASoundSampleImpl
(
const
float
**
ppfChannelData
,
int
iNumberOfChannels
,
int
iLength
,
std
::
string
sName
=
""
);
ITASoundSampleImpl
(
const
float
**
ppfChannelData
,
int
iNumberOfChannels
,
int
iLength
,
std
::
string
sName
=
""
);
~
ITASoundSampleImpl
();
...
...
src/ITASoundSamplerImpl.cpp
View file @
adf12942
...
...
@@ -31,6 +31,8 @@
#include <ITANumericUtils.h>
#include <ITAStringUtils.h>
#include <cstring>
// Vorgabe: Anzahl Samples fr Fading bei Pause/Fortsetzen einer Wiedergabe
#define DEFAULT_PAUSE_FADE_LENGTH 256
...
...
@@ -799,4 +801,4 @@ void ITASoundSamplerImpl::RenderOutputBlock() {
m_csSlotbuf
.
leave
();
m_csTracks
.
leave
();
}
\ No newline at end of file
}
src/ITASoundSamplerImpl.h
View file @
adf12942
#ifndef INCLUDE_WATCHER_ITA_SOUND_SAMPLER_IMPL
#define INCLUDE_WATCHER_ITA_SOUND_SAMPLER_IMPL
#include <ITASoundSampler.h>
#include <map>
#include <string>
#include <vector>
#include "ITASoundSamplerSlotbuffer.h"
#include <ITACriticalSection.h>
#include <ITAData
s
ourceRealization.h>
#include <ITAData
S
ourceRealization.h>
class
ITADatasourceRealization
;
class
ITASoundSampleImpl
;
...
...
@@ -84,7 +84,7 @@ private:
std
::
vector
<
int
>
viChannelRoutings
;
// Ausgabe Kanle der einzelnen Spurkanle
std
::
vector
<
double
>
vdChannelGains
;
// Lautstrken der Spurkanle
inline
Track
()
{}
inline
Track
()
{}
;
inline
Track
(
int
iChannels
)
{
...
...
tests/CMakeLists.txt
View file @
adf12942
...
...
@@ -17,16 +17,18 @@ if( ITA_CORE_LIBS_BUILD_STATIC )
endif
(
)
add_executable
(
DrumsOnKeyboard DrumsOnKeyboard.cpp
)
target_link_libraries
(
DrumsOnKeyboard
${
VISTA_USE_PACKAGE_LIBRARIES
}
)
if
(
VASIO_FOUND
)
add_executable
(
DrumsOnKeyboard DrumsOnKeyboard.cpp
)
target_link_libraries
(
DrumsOnKeyboard
${
VISTA_USE_PACKAGE_LIBRARIES
}
)
vista_configure_app
(
DrumsOnKeyboard
)
vista_install
(
DrumsOnKeyboard
)
vista_create_default_info_file
(
DrumsOnKeyboard
)
vista_configure_app
(
DrumsOnKeyboard
)
vista_install
(
DrumsOnKeyboard
)
vista_create_default_info_file
(
DrumsOnKeyboard
)
set_property
(
TARGET DrumsOnKeyboard PROPERTY FOLDER
"ITACoreLibs/Tests/ITASampler"
)
set_property
(
TARGET DrumsOnKeyboard PROPERTY FOLDER
"ITACoreLibs/Tests/ITASampler"
)
endif
(
)
if
(
VOPENDAFF_FOUND
)
if
(
VOPENDAFF_FOUND
AND VASIO_FOUND
)
add_executable
(
RainyDay RainyDay.cpp
)
target_link_libraries
(
RainyDay
${
VISTA_USE_PACKAGE_LIBRARIES
}
)
...
...
tests/RainyDay.cpp
View file @
adf12942
...
...
@@ -2,10 +2,10 @@
#include <ITAException.h>
#include <ITASampleClock.h>
#include <ITANumericUtils.h>
#include <ITAData
s
ourceUtils.h>
#include <ITAData
S
ourceUtils.h>
#include <ITAAsioInterface.h>
#include <ITASampleFrame.h>
#include <ITAStop
W
atch.h>
#include <ITAStop
S
atch.h>
#include <ITAConstants.h>
// ITA sampler
...
...
tests/Tests.cpp
View file @
adf12942
...
...
@@ -2,7 +2,7 @@
#include <ITASoundSampler.h>
#include <ITASampleClock.h>
#include <ITANumericUtils.h>
#include <ITAData
s
ourceUtils.h>
#include <ITAData
S
ourceUtils.h>
#include <time.h>
#include <iostream>
...
...
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