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
9f6c47ac
Commit
9f6c47ac
authored
Apr 03, 2018
by
Dipl.-Ing. Jonas Stienen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Changing ITAExceptions to VAExceptions in core
parent
4918ecac
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
11 deletions
+11
-11
src/Audiosignals/VAAudioSignalSourceManager.cpp
src/Audiosignals/VAAudioSignalSourceManager.cpp
+4
-4
src/Audiosignals/VAMachineSignalSource.cpp
src/Audiosignals/VAMachineSignalSource.cpp
+3
-3
src/Rendering/Prototyping/GenericPath/VAPTGenericPathAudioRenderer.cpp
.../Prototyping/GenericPath/VAPTGenericPathAudioRenderer.cpp
+4
-4
No files found.
src/Audiosignals/VAAudioSignalSourceManager.cpp
View file @
9f6c47ac
...
...
@@ -125,7 +125,7 @@ std::string CVAAudioSignalSourceManager::RegisterSignalSource( IVAAudioSignalSou
{
// Quelle darf nicht bei einem anderen Kernel registriert sein
if
(
(
pSource
->
GetAssociatedCore
()
!=
nullptr
)
&&
(
pSource
->
GetAssociatedCore
()
!=
m_pParentCore
)
)
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"Audio signal already registered by another core instance"
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"Audio signal already registered by another core instance"
);
m_csSignalSourceAccess
.
enter
();
...
...
@@ -133,7 +133,7 @@ std::string CVAAudioSignalSourceManager::RegisterSignalSource( IVAAudioSignalSou
if
(
FindSignalSource
(
pSource
)
!=
m_mSignalSources
.
end
()
)
{
m_csSignalSourceAccess
.
leave
();
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"Audio signal source already contained"
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"Audio signal source already contained"
);
}
// Neue ID (Mnemonic + Zahl) generieren
...
...
@@ -224,7 +224,7 @@ std::string CVAAudioSignalSourceManager::GetAudioDeviceInputSignalSource( int iI
{
// Parameter prfen
if
(
(
iInput
<
0
)
||
(
iInput
>
m_iDeviceInputs
)
)
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"Audio device input index out of range"
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"Audio device input index out of range"
);
return
m_vsDeviceInputSourceIDs
[
iInput
];
}
...
...
@@ -343,7 +343,7 @@ CVASignalSourceInfo CVAAudioSignalSourceManager::GetSignalSourceInfo( const std:
if
(
it
==
m_mSignalSources
.
end
()
)
{
m_csSignalSourceAccess
.
leave
();
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"Could not get information on "
+
sID
+
", audio signal source not found"
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"Could not get information on "
+
sID
+
", audio signal source not found"
);
}
// Informationen zusammenstellen#
...
...
src/Audiosignals/VAMachineSignalSource.cpp
View file @
9f6c47ac
...
...
@@ -404,7 +404,7 @@ void CVAMachineSignalSource::SetParameters( const CVAStruct& oParams )
{
pStruct
=
oParams
.
GetValue
(
"VALUE"
);
if
(
pStruct
->
GetDatatype
()
!=
CVAStructValue
::
STRING
)
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"File path has to be a string"
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"File path has to be a string"
);
const
std
::
string
&
sPathRaw
=
*
pStruct
;
std
::
string
sPath
=
m_oConfig
.
pCore
->
SubstituteMacros
(
sPathRaw
);
...
...
@@ -414,7 +414,7 @@ void CVAMachineSignalSource::SetParameters( const CVAStruct& oParams )
{
pStruct
=
oParams
.
GetValue
(
"VALUE"
);
if
(
pStruct
->
GetDatatype
()
!=
CVAStructValue
::
STRING
)
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"File path has to be a string"
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"File path has to be a string"
);
const
std
::
string
&
sPathRaw
=
*
pStruct
;
std
::
string
sPath
=
m_oConfig
.
pCore
->
SubstituteMacros
(
sPathRaw
);
...
...
@@ -424,7 +424,7 @@ void CVAMachineSignalSource::SetParameters( const CVAStruct& oParams )
{
pStruct
=
oParams
.
GetValue
(
"VALUE"
);
if
(
pStruct
->
GetDatatype
()
!=
CVAStructValue
::
STRING
)
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"File path has to be a string"
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"File path has to be a string"
);
const
std
::
string
&
sPathRaw
=
*
pStruct
;
std
::
string
sPath
=
m_oConfig
.
pCore
->
SubstituteMacros
(
sPathRaw
);
...
...
src/Rendering/Prototyping/GenericPath/VAPTGenericPathAudioRenderer.cpp
View file @
9f6c47ac
...
...
@@ -135,7 +135,7 @@ public:
CVAPTGenericSoundPath
::
CVAPTGenericSoundPath
(
double
dSamplerate
,
int
iBlocklength
,
int
iNumChannels
,
int
iIRFilterLength
)
{
if
(
iNumChannels
<
1
)
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"Number of channels must be positive"
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"Number of channels must be positive"
);
const
int
iAlgorithm
=
CITAVariableDelayLine
::
CUBIC_SPLINE_INTERPOLATION
;
pVariableDelayLine
=
new
CITAVariableDelayLine
(
dSamplerate
,
iBlocklength
,
6
*
dSamplerate
,
iAlgorithm
);
...
...
@@ -214,7 +214,7 @@ void CVAPTGenericPathAudioRenderer::Init( const CVAStruct& oArgs )
conf
.
OptInteger
(
"IRFilterLengthSamples"
,
m_iIRFilterLengthSamples
,
1024
);
if
(
m_iIRFilterLengthSamples
<
0
)
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"IR filter size must be positive"
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"IR filter size must be positive"
);
conf
.
OptBool
(
"OutputMonitoring"
,
m_bOutputMonitoring
,
false
);
...
...
@@ -655,14 +655,14 @@ void CVAPTGenericPathAudioRenderer::UpdateGenericSoundPath( int iListenerID, int
{
ITASampleFrame
sfIR
(
sIRFilePath
);
if
(
sfIR
.
channels
()
!=
m_pOutput
->
GetNumberOfChannels
()
)
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"Filter has mismatching channels"
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"Filter has mismatching channels"
);
UpdateGenericSoundPath
(
iListenerID
,
iSourceID
,
sfIR
);
}
void
CVAPTGenericPathAudioRenderer
::
UpdateGenericSoundPath
(
int
iListenerID
,
int
iSourceID
,
int
iChannelIndex
,
const
std
::
string
&
sIRFilePath
)
{
if
(
iChannelIndex
>=
m_iNumChannels
||
iChannelIndex
<
0
)
ITA_EXCEPT1
(
INVALID_PARAMETER
,
"Requested filter channel greater than output channels or smaller than 1, can not update."
);
VA_EXCEPT2
(
INVALID_PARAMETER
,
"Requested filter channel greater than output channels or smaller than 1, can not update."
);
ITASampleFrame
sfIR
(
sIRFilePath
);
if
(
sfIR
.
channels
()
!=
1
)
...
...
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