Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
VACore
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Issues
6
Issues
6
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)
VACore
Commits
f2aaa7dc
Commit
f2aaa7dc
authored
Nov 13, 2018
by
lmoesch
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'ma_2018/moesch' of
https://git.rwth-aachen.de/ita/VACore
into ma_2018/moesch
parents
8b5ab993
31a1ed39
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
10 additions
and
4 deletions
+10
-4
src/Rendering/Prototyping/GenericPath/VAPTGenericPathAudioRenderer.cpp
.../Prototyping/GenericPath/VAPTGenericPathAudioRenderer.cpp
+5
-2
src/core/rendering.cpp
src/core/rendering.cpp
+2
-1
src/core/reproduction.cpp
src/core/reproduction.cpp
+3
-1
No files found.
src/Rendering/Prototyping/GenericPath/VAPTGenericPathAudioRenderer.cpp
View file @
f2aaa7dc
...
...
@@ -739,7 +739,7 @@ void CVAPTGenericPathAudioRenderer::UpdateGenericSoundPath( int iListenerID, int
if
(
sbIR
.
length
()
>
m_iIRFilterLengthSamples
)
VA_WARN
(
"PTGenericPathAudioRenderer"
,
"Filter length for generic sound path channel too long, cropping."
);
std
::
list
<
CVAPTGenericSoundPath
*
>::
const_iterator
spcit
=
m_lSoundPaths
.
begin
();
while
(
spcit
!=
m_lSoundPaths
.
end
()
)
{
...
...
@@ -924,7 +924,10 @@ void CVAPTGenericPathAudioRenderer::SetParameters( const CVAStruct& oArgs )
{
// Update
if
(
oArgs
.
HasKey
(
"receiver"
)
==
false
||
oArgs
.
HasKey
(
"source"
)
==
false
)
VA_EXCEPT2
(
INVALID_PARAMETER
,
"PrototypeGenericPath filter update requires a receiver and a source identifier"
);
{
VA_INFO
(
"PrototypeGenericPath"
,
"Parameter setter was called without source or receiver id, did not update any generic path filter"
);
return
;
}
int
iReceiverID
=
oArgs
[
"receiver"
];
int
iSourceID
=
oArgs
[
"source"
];
...
...
src/core/rendering.cpp
View file @
f2aaa7dc
...
...
@@ -99,7 +99,8 @@ void CVACoreImpl::GetRenderingModules( std::vector< CVAAudioRendererInfo >& vRen
oRendererInfo
.
bEnabled
=
oRenderer
.
bEnabled
;
oRendererInfo
.
bOutputDetectorEnabled
=
oRenderer
.
bOutputDetectorEnabled
;
oRendererInfo
.
oParams
=
oRenderer
.
oParams
;
oRendererInfo
.
sOutputRecordingFilePath
=
oRenderer
.
pOutputRecorder
->
GetFilePath
();
if
(
oRenderer
.
pOutputRecorder
)
oRendererInfo
.
sOutputRecordingFilePath
=
oRenderer
.
pOutputRecorder
->
GetFilePath
();
if
(
!
bFilterEnabled
||
oRendererInfo
.
bEnabled
)
vRenderers
.
push_back
(
oRendererInfo
);
}
...
...
src/core/reproduction.cpp
View file @
f2aaa7dc
...
...
@@ -136,8 +136,10 @@ void CVACoreImpl::GetReproductionModules( std::vector< CVAAudioReproductionInfo
oRepInfo
.
sDescription
=
oRepro
.
sDescription
;
oRepInfo
.
bEnabled
=
oRepro
.
bEnabled
;
oRepInfo
.
bInputDetectorEnabled
=
oRepro
.
bInputDetectorEnabled
;
oRepInfo
.
sInputRecordingFilePath
=
oRepro
.
pInputRecorder
->
GetFilePath
();
if
(
oRepro
.
pInputRecorder
)
oRepInfo
.
sInputRecordingFilePath
=
oRepro
.
pInputRecorder
->
GetFilePath
();
oRepInfo
.
bOutputDetectorEnabled
=
oRepro
.
bOutputDetectorEnabled
;
if
(
oRepro
.
pOutputRecorder
)
oRepInfo
.
sOutputRecordingFilePath
=
oRepro
.
pOutputRecorder
->
GetFilePath
();
oRepInfo
.
oParams
=
oRepro
.
oParams
;
if
(
!
bFilterEnabled
||
oRepInfo
.
bEnabled
)
...
...
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