Commit 1d2f61d6 authored by Dipl.-Ing. Jonas Stienen's avatar Dipl.-Ing. Jonas Stienen
Browse files

Fixing issue #7

parent 95c4951f
......@@ -26,9 +26,11 @@
# Relative configuration path (with some more hardware setup files)
conf_dir = conf
conf_dir_dev = @CMAKE_CURRENT_SOURCE_DIR@/conf
# Relative data path (with some common files)
data_dir = data
data_dir_dev = @CMAKE_CURRENT_SOURCE_DIR@/data
# Absolute data path with further files (big data, not shipped with VA)
big_data_dir = @ITA_VACORE_BIG_DATA_DIR@
......@@ -251,7 +253,7 @@ MixingChannels = ALL
Class = Headphones
Enabled = false
# Headphone impulse response inverse file path (normalized)
HpIRInvFile = $(VADataDir)/HPEQ/HD600_all_eq_128_stereo.wav
HpIRInvFile = HPEQ/HD600_all_eq_128_stereo.wav
#HpIRInvFilterLength = 22050
# Headphone impulse response inverse gain for calibration ( HpIR * HpIRInv == 0dB )
HpIRInvCalibrationGainDecibel = 0.1
......@@ -262,14 +264,14 @@ Outputs = MyDesktopHP
Class = NCTC
Enabled = false
Name = Crosstalk cancellation for N loudspeaker
Outputs = HK_LS
Outputs = MyDesktopLS
TrackedListenerID = 1
# algorithm: reg|...
Algorithm = reg
RegularizationBeta = 0.01
DelaySamples = 2048
UseTrackedListenerHRIR = false
CTCDefaultHRIR = $(VADataDir)\HRIR\ITA-Kunstkopf_HRIR_AP11_Pressure_Equalized_3x3_256.daff
CTCDefaultHRIR = $(DefaultHRIR)
Optimization = OPTIMIZATION_NONE
[Reproduction:MyAmbisonics]
......@@ -285,7 +287,7 @@ Class = BinauralMixdown
Enabled = false
Name = Binaural mixdown of virtual loudspeaker setup using HRIR techniques
Outputs = MyDesktopHP
VirtualOutput = VRLab_Horizontal_LS
VirtualOutput = MyDesktopLS
TrackedListenerID = 1
HRIRFilterLength = 128
......@@ -307,6 +309,10 @@ Outputs = HearingAid
Description = Desktop user with headphones
Devices = MyHP
[Output:MyDesktopLS]
Description = Desktop user with loudspeaker monitors
Devices = MyLSLeft, MyLSRight
# -- inputs
......@@ -322,6 +328,18 @@ Type = HP
Description = Headphone hardware device (two-channels)
Channels = 1,2
[OutputDevice:MyLSLeft]
Type = LS
Description = Loudspeaker hardware device
Channels = 1
Position = -0.5, 0.2, -0.4
[OutputDevice:MyLSRight]
Type = LS
Description = Loudspeaker hardware device
Channels = 2
Position = 0.5, 0.2, -0.4
[InputDevice:MyLineIn]
Type = MIC
Description = Table microphone in front of user using line-in
......
......@@ -127,8 +127,10 @@ CVANCTCReproduction::CVANCTCReproduction( const CVAAudioReproductionModuleInitPa
conf.OptBool( "UseTrackedListenerHRIR", m_bTrackedListenerHRIR, false );
std::string sCTCDefaultHRIR_raw;
conf.OptString( "CTCDefaultHRIR", sCTCDefaultHRIR_raw );
bool bEntryPresent = conf.OptString( "CTCDefaultHRIR", sCTCDefaultHRIR_raw );
std::string sCTCDefaultHRIR = m_oParams.pCore->FindFilePath( sCTCDefaultHRIR_raw );
if( bEntryPresent && sCTCDefaultHRIR.empty() && !m_bTrackedListenerHRIR )
VA_EXCEPT2(INVALID_PARAMETER, "Could not find default HRIR file for NCTC reproduction module. Switch to tracked listener HRIR or specify correct path.")
double dSampleRate = m_oParams.pCore->GetCoreConfig()->oAudioDriverConfig.dSampleRate;
if( sCTCDefaultHRIR.empty() == false )
......
......@@ -598,7 +598,9 @@ void CVACoreImpl::Initialize() {
SetProgress( "Initialization finished", "", 8 );
FinishProgress();
} VA_FINALLY{
}
VA_FINALLY
{
// Aufrumen und Exception weiterwerfen
Tidyup();
throw;
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment