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)
VACore
Commits
d391dde3
Commit
d391dde3
authored
Dec 05, 2017
by
Dipl.-Ing. Jonas Stienen
Browse files
Renaming configured 'outputs' of rendering modules to 'reproductions'
parent
b384c8e3
Changes
4
Hide whitespace changes
Inline
Side-by-side
conf/VACore.ini.proto
View file @
d391dde3
...
...
@@ -128,7 +128,7 @@ DefaultShiftSpeed = 0.0, 0.0, 0.0 # 3D vector in m/s
[
Renderer
:
MyBinauralFreeField
]
Enabled
=
true
Class
=
BinauralFreeField
Output
s
=
MyTalkthroughHeadphones
Reproduction
s
=
MyTalkthroughHeadphones
OutputDetectorEnabled
=
false
RecordOutputEnabled
=
false
RecordOutputFilePath
=
$
(
ProjectName
)
_Renderer_MyBinauralFreeField_Output.wav
...
...
@@ -147,12 +147,12 @@ class = AmbientMixer
Description
=
Low
-
cost
renderer
to
make
sound
audible
without
spatializations
Enabled
=
false
OutputGroup
=
MyDesktopHP
Output
s
=
MyTalkthroughHeadphones
Reproduction
s
=
MyTalkthroughHeadphones
[
Renderer
:
MyBinauralArtificialReverb
]
Class
=
BinauralArtificialReverb
Enabled
=
false
Output
s
=
MyTalkthroughHeadphones
Reproduction
s
=
MyTalkthroughHeadphones
ReverberationTime
=
0.71
RoomVolume
=
200
RoomSurfaceArea
=
88
...
...
@@ -167,7 +167,7 @@ ScatteringCoefficient = 0.1
[
Renderer
:
MyBinauralRoomAcoustics
]
Class
=
BinauralRoomAcoustics
Enabled
=
false
Output
s
=
MyTalkthroughHeadphones
Reproduction
s
=
MyTalkthroughHeadphones
#
Setup
options
:
Local
,
Remote
,
Hybrid
Setup
=
Local
ServerIP
=
PC
-
SEACEN
...
...
@@ -185,7 +185,7 @@ DirectSoundPowerCorrectionFactor = 0.05
[
Renderer
:
MyMonauralFreeField
]
Class
=
MonauralFreeField
Enabled
=
false
Output
s
=
MyTalkthroughHeadphones
Reproduction
s
=
MyTalkthroughHeadphones
MotionModelNumHistoryKeys
=
10000
MotionModelWindowSize
=
0.2
MotionModelWindowDelay
=
0.1
...
...
@@ -198,8 +198,8 @@ SwitchingAlgorithm = linear
[
Renderer
:
MyHearingAidRenderer
]
Class
=
PrototypeHearingAid
Enabled
=
false
Output
s
=
HearingAidTalkthrough
#
Output
s
=
MyTalkthroughHeadphones
Reproduction
s
=
HearingAidTalkthrough
#
Reproduction
s
=
MyTalkthroughHeadphones
UpdateRateDS
=
120.0
UpdateRateIS
=
20.0
UpdateRateRT
=
1.0
...
...
@@ -214,7 +214,7 @@ DumpListenersGain = 10
[
Renderer
:
MyGenericRenderer
]
Class
=
PrototypeGenericPath
Enabled
=
false
Output
s
=
MyTalkthroughHeadphones
Reproduction
s
=
MyTalkthroughHeadphones
NumChannels
=
2
IRFilterLengthSamples
=
88200
IRFilterDelaySamples
=
0
...
...
@@ -223,14 +223,14 @@ OutputMonitoring = true
[
Renderer
:
MyAirTrafficNoiseRenderer
]
Class
=
BinauralAirTrafficNoise
Enabled
=
false
Output
s
=
MyTalkthroughHeadphones
Reproduction
s
=
MyTalkthroughHeadphones
[
Renderer
:
MyVBAPFreefield
]
Class
=
VBAPFreeField
Enabled
=
false
Output
=
VRLab_Horizontal_LS
Output
s
=
MixdownHeadphones
Reproduction
s
=
MixdownHeadphones
[
Renderer
:
MyDummyRenderer
]
...
...
@@ -238,7 +238,7 @@ class = PrototypeDummy
Description
=
Dummy
renderer
for
testing
and
benchmarking
Enabled
=
false
OutputGroup
=
MyDesktopHP
Output
s
=
MyTalkthroughHeadphones
Reproduction
s
=
MyTalkthroughHeadphones
#
--=
Audio
reproduction
=--
...
...
src/Rendering/Ambient/Mixer/VAAmbientMixerAudioRenderer.cpp
View file @
d391dde3
...
...
@@ -38,7 +38,7 @@ CVAAmbientMixerAudioRenderer::CVAAmbientMixerAudioRenderer( const CVAAudioRender
,
m_bIndicateReset
(
false
)
,
m_bResetAck
(
false
)
{
assert
(
m_oParams
.
vs
Output
s
.
size
()
>
0
);
assert
(
m_oParams
.
vs
Reproduction
s
.
size
()
>
0
);
CVAConfigInterpreter
conf
(
*
m_oParams
.
pConfig
);
...
...
src/Rendering/VAAudioRenderer.h
View file @
d391dde3
...
...
@@ -35,7 +35,7 @@ public:
std
::
string
sClass
;
//!< Renderer class
CVACoreImpl
*
pCore
;
//!< Parent core
const
CVAStruct
*
pConfig
;
//!< Renderer configuration
std
::
vector
<
std
::
string
>
vs
Output
s
;
//!< Renderer outputs (e.g. Output:HP, Reproduction:CTC4)
std
::
vector
<
std
::
string
>
vs
Reproduction
s
;
//!< Renderer outputs (e.g. Output:HP, Reproduction:CTC4)
bool
bRecordOutputEnabled
;
//!< Renderer output recording and storing flag
std
::
string
sRecordOutputFilePath
;
//!< Renderer output recording and storing file path
bool
bOutputLevelMeterEnabled
;
//!< Renderer output level meter will be used (uses a little bit CPU resources)
...
...
src/VACoreImpl.cpp
View file @
d391dde3
...
...
@@ -4434,8 +4434,8 @@ void CVACoreImpl::InitializeAudioRenderers()
oParams
.
pCore
=
this
;
oParams
.
pConfig
=
&
cit
->
second
.
GetStruct
();
conf
.
ReqStringListRegex
(
"
Output
s"
,
oParams
.
vs
Output
s
,
"
\\
s*,
\\
s*"
);
std
::
unique
(
oParams
.
vs
Output
s
.
begin
(),
oParams
.
vs
Output
s
.
end
()
);
conf
.
ReqStringListRegex
(
"
Reproduction
s"
,
oParams
.
vs
Reproduction
s
,
"
\\
s*,
\\
s*"
);
std
::
unique
(
oParams
.
vs
Reproduction
s
.
begin
(),
oParams
.
vs
Reproduction
s
.
end
()
);
conf
.
OptBool
(
"OutputDetectorEnabled"
,
oParams
.
bOutputLevelMeterEnabled
,
false
);
...
...
@@ -4477,9 +4477,9 @@ void CVACoreImpl::InitializeAudioRenderers()
int
iInput
=
m_pR2RPatchbay
->
AddInput
(
pRendererOutputTail
);
// Create direct output in output patchbay for each output group [todo, not allowed yet]
for
(
size_t
i
=
0
;
i
<
oParams
.
vs
Output
s
.
size
();
i
++
)
for
(
size_t
i
=
0
;
i
<
oParams
.
vs
Reproduction
s
.
size
();
i
++
)
{
const
std
::
string
&
sOutputID
(
oParams
.
vs
Output
s
[
i
]
);
const
std
::
string
&
sOutputID
(
oParams
.
vs
Reproduction
s
[
i
]
);
const
CVAHardwareOutput
*
pOutput
=
m_oCoreConfig
.
oHardwareSetup
.
GetOutput
(
sOutputID
);
if
(
pOutput
)
...
...
@@ -4490,7 +4490,7 @@ void CVACoreImpl::InitializeAudioRenderers()
}
oRendererDesc
.
iR2RPatchBayInput
=
iInput
;
oRendererDesc
.
vsOutputs
=
oParams
.
vs
Output
s
;
oRendererDesc
.
vsOutputs
=
oParams
.
vs
Reproduction
s
;
m_voRenderers
.
push_back
(
oRendererDesc
);
}
}
...
...
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