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
d532cfbc
Commit
d532cfbc
authored
Jan 07, 2018
by
Dipl.-Ing. Jonas Stienen
Browse files
Fixing bug in CreateScene and some style changes
parent
8de455e2
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/VACoreImpl.cpp
View file @
d532cfbc
...
...
@@ -3775,6 +3775,8 @@ std::string CVACoreImpl::CreateScene( const CVAStruct& oParams, const std::strin
std
::
string
sDestFilename
=
correctPath
(
m_oCoreConfig
.
mMacros
.
SubstituteMacros
(
sFilePath
)
);
for
(
std
::
vector
<
CVAAudioRendererDesc
>::
iterator
it
=
m_voRenderers
.
begin
();
it
!=
m_voRenderers
.
end
();
++
it
)
it
->
pInstance
->
LoadScene
(
sDestFilename
);
return
sDestFilename
;
}
else
{
...
...
src/VAObjectContainer.h
View file @
d532cfbc
...
...
@@ -105,9 +105,10 @@ public:
m_mID2Ref
.
erase
(
iID
);
};
// Gibt zu einer ID das assozierte Objekt zurck
// (Gibt nullptr zurck, falls das Objekt nicht enthalten ist)
inline
T
*
GetObject
(
int
iID
)
const
//! Gibt zu einer ID das assozierte Objekt zurck
/** (Gibt nullptr zurck, falls das Objekt nicht enthalten ist)
*/
inline
T
*
GetObject
(
const
int
iID
)
const
{
typename
std
::
map
<
int
,
T
*
>::
const_iterator
cit
=
m_mID2Object
.
find
(
iID
);
return
(
cit
==
m_mID2Object
.
end
()
?
nullptr
:
cit
->
second
);
...
...
@@ -142,12 +143,14 @@ public:
return
(
it
==
m_mID2Ref
.
end
()
?
-
1
:
(
it
->
second
>
0
?
--
(
it
->
second
)
:
0
)
);
};
// Wie GetObject(), erhht aber direkt den Referenzzhler
inline
T
*
Request
(
int
iID
)
{
//! Wie GetObject(), erhht aber direkt den Referenzzhler
inline
T
*
Request
(
const
int
iID
)
{
T
*
pObject
=
GetObject
(
iID
);
// Gltige ID? Dann Referenzzhler erhhen
if
(
pObject
)
IncRefCount
(
iID
);
if
(
pObject
)
IncRefCount
(
iID
);
return
pObject
;
};
...
...
src/directivities/VADirectivityManager.cpp
View file @
d532cfbc
...
...
@@ -55,6 +55,7 @@ void CVADirectivityManager::Finalize()
void
CVADirectivityManager
::
Reset
()
{
VA_VERBOSE
(
"DirectivityManager"
,
"Resetting"
);
for
(
CVAObjectContainer
<
IVADirectivity
>::
iterator
it
=
m_oDirectivities
.
begin
();
it
!=
m_oDirectivities
.
end
();
++
it
)
{
delete
it
->
second
;
...
...
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