Skip to content

Commit 73bca6f

Browse files
gralcogralco
committed
MiniAudio: Apply clang-format rules to all source files
Signed-off-by: Eric Kuzmenko <[email protected]>
1 parent 3128639 commit 73bca6f

16 files changed

+374
-269
lines changed

‎Gems/MiniAudio/Code/Source/Clients/MiniAudioImplementation.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ AZ_PUSH_DISABLE_WARNING(4701 4244 4456 4457 4245, "-Wuninitialized")
1818
extern "C" {
1919

2020
#define STB_VORBIS_HEADER_ONLY
21-
#include <stb_vorbis.c> // Enables Vorbis decoding.
21+
#include <stb_vorbis.c> // Enables Vorbis decoding.
2222
}
2323

2424
#define MINIAUDIO_IMPLEMENTATION
@@ -28,7 +28,6 @@ extern "C" {
2828
// The stb_vorbis implementation must come after the implementation of miniaudio.
2929
#undef STB_VORBIS_HEADER_ONLY
3030
#include <stb_vorbis.c>
31-
3231
}
3332

3433
AZ_POP_DISABLE_WARNING

‎Gems/MiniAudio/Code/Source/Clients/MiniAudioListenerComponent.cpp‎

Lines changed: 55 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -29,58 +29,74 @@ namespace MiniAudio
2929

3030
if (auto serializeContext = azrtti_cast<AZ::SerializeContext*>(context))
3131
{
32-
serializeContext->Class<MiniAudioListenerComponent, BaseClass>()
33-
->Version(1);
32+
serializeContext->Class<MiniAudioListenerComponent, BaseClass>()->Version(1);
3433
}
3534

3635
if (auto behaviorContext = azrtti_cast<AZ::BehaviorContext*>(context))
3736
{
38-
behaviorContext->ConstantProperty("MiniAudioListenerComponentTypeId",
39-
BehaviorConstant(AZ::Uuid(MiniAudioListenerComponentTypeId)))
37+
behaviorContext
38+
->ConstantProperty("MiniAudioListenerComponentTypeId", BehaviorConstant(AZ::Uuid(MiniAudioListenerComponentTypeId)))
4039
->Attribute(AZ::Script::Attributes::Module, "MiniAudio")
4140
->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common);
4241

43-
AZ::BehaviorParameterOverrides GetChannelCountParam = {"Channel Count", "Get Channel Count"};
44-
AZ::BehaviorParameterOverrides GetGlobalVolumeParam = {"Global Volume", "Get Global Volume Percent"};
45-
AZ::BehaviorParameterOverrides SetGlobalVolumeParam = {"Global Volume", "Set Global Volume Percent"};
46-
AZ::BehaviorParameterOverrides GetGlobalVolumeDecibelsParam = {"Global Volume Decibels", "Get Global Volume Decibels"};
47-
AZ::BehaviorParameterOverrides SetGlobalVolumeDecibelsParam = {"Global Volume Decibels", "Set Global Volume Decibels"};
48-
AZ::BehaviorParameterOverrides GetInnerConeAngleInRadiansParam = {"Inner Cone Angle In Radians", "Get Inner Cone Angle In Radians"};
49-
AZ::BehaviorParameterOverrides SetInnerConeAngleInRadiansParam = {"Inner Cone Angle In Radians", "Set Inner Cone Angle In Radians"};
50-
AZ::BehaviorParameterOverrides GetInnerConeAngleInDegreesParam = {"Inner Cone Angle In Degrees", "Get Inner Cone Angle In Degrees"};
51-
AZ::BehaviorParameterOverrides SetInnerConeAngleInDegreesParam = {"Inner Cone Angle In Degrees", "Set Inner Cone Angle In Degrees"};
52-
AZ::BehaviorParameterOverrides GetOuterConeAngleInRadiansParam = {"Outer Cone Angle In Radians", "Get Outer Cone Angle In Radians"};
53-
AZ::BehaviorParameterOverrides SetOuterConeAngleInRadiansParam = {"Outer Cone Angle In Radians", "Set Outer Cone Angle In Radians"};
54-
AZ::BehaviorParameterOverrides GetOuterConeAngleInDegreesParam = {"Outer Cone Angle In Degrees", "Get Outer Cone Angle In Degrees"};
55-
AZ::BehaviorParameterOverrides SetOuterConeAngleInDegreesParam = {"Outer Cone Angle In Degrees", "Set Outer Cone Angle In Degrees"};
56-
AZ::BehaviorParameterOverrides GetOuterVolumeParam = {"Outer Volume", "Get Volume Percent Outside Outer Cone"};
57-
AZ::BehaviorParameterOverrides SetOuterVolumeParam = {"Outer Volume", "Set Volume Percent Outside Outer Cone"};
58-
AZ::BehaviorParameterOverrides GetOuterVolumeDecibelsParam = {"Outer Volume Decibels", "Get Volume Decibels Outside Outer Cone"};
59-
AZ::BehaviorParameterOverrides SetOuterVolumeDecibelsParam = {"Outer Volume Decibels", "Set Volume Decibels Outside Outer Cone"};
42+
AZ::BehaviorParameterOverrides GetChannelCountParam = { "Channel Count", "Get Channel Count" };
43+
AZ::BehaviorParameterOverrides GetGlobalVolumeParam = { "Global Volume", "Get Global Volume Percent" };
44+
AZ::BehaviorParameterOverrides SetGlobalVolumeParam = { "Global Volume", "Set Global Volume Percent" };
45+
AZ::BehaviorParameterOverrides GetGlobalVolumeDecibelsParam = { "Global Volume Decibels", "Get Global Volume Decibels" };
46+
AZ::BehaviorParameterOverrides SetGlobalVolumeDecibelsParam = { "Global Volume Decibels", "Set Global Volume Decibels" };
47+
AZ::BehaviorParameterOverrides GetInnerConeAngleInRadiansParam = { "Inner Cone Angle In Radians",
48+
"Get Inner Cone Angle In Radians" };
49+
AZ::BehaviorParameterOverrides SetInnerConeAngleInRadiansParam = { "Inner Cone Angle In Radians",
50+
"Set Inner Cone Angle In Radians" };
51+
AZ::BehaviorParameterOverrides GetInnerConeAngleInDegreesParam = { "Inner Cone Angle In Degrees",
52+
"Get Inner Cone Angle In Degrees" };
53+
AZ::BehaviorParameterOverrides SetInnerConeAngleInDegreesParam = { "Inner Cone Angle In Degrees",
54+
"Set Inner Cone Angle In Degrees" };
55+
AZ::BehaviorParameterOverrides GetOuterConeAngleInRadiansParam = { "Outer Cone Angle In Radians",
56+
"Get Outer Cone Angle In Radians" };
57+
AZ::BehaviorParameterOverrides SetOuterConeAngleInRadiansParam = { "Outer Cone Angle In Radians",
58+
"Set Outer Cone Angle In Radians" };
59+
AZ::BehaviorParameterOverrides GetOuterConeAngleInDegreesParam = { "Outer Cone Angle In Degrees",
60+
"Get Outer Cone Angle In Degrees" };
61+
AZ::BehaviorParameterOverrides SetOuterConeAngleInDegreesParam = { "Outer Cone Angle In Degrees",
62+
"Set Outer Cone Angle In Degrees" };
63+
AZ::BehaviorParameterOverrides GetOuterVolumeParam = { "Outer Volume", "Get Volume Percent Outside Outer Cone" };
64+
AZ::BehaviorParameterOverrides SetOuterVolumeParam = { "Outer Volume", "Set Volume Percent Outside Outer Cone" };
65+
AZ::BehaviorParameterOverrides GetOuterVolumeDecibelsParam = { "Outer Volume Decibels",
66+
"Get Volume Decibels Outside Outer Cone" };
67+
AZ::BehaviorParameterOverrides SetOuterVolumeDecibelsParam = { "Outer Volume Decibels",
68+
"Set Volume Decibels Outside Outer Cone" };
6069
behaviorContext->EBus<MiniAudioListenerRequestBus>("MiniAudioListenerRequestBus")
6170
->Attribute(AZ::Script::Attributes::Scope, AZ::Script::Attributes::ScopeFlags::Common)
6271
->Attribute(AZ::Script::Attributes::Module, "audio")
6372
->Attribute(AZ::Script::Attributes::Category, "MiniAudio Listener")
6473
->Event("SetPosition", &MiniAudioListenerRequests::SetPosition)
6574
->Event("SetFollowEntity", &MiniAudioListenerRequests::SetFollowEntity)
66-
->Event("GetChannelCount", &MiniAudioListenerRequests::GetChannelCount, {GetChannelCountParam})
67-
->Event("GetGlobalVolumePercentage", &MiniAudioListenerRequests::GetGlobalVolumePercentage, {GetGlobalVolumeParam})
68-
->Event("SetGlobalVolumePercentage", &MiniAudioListenerRequests::SetGlobalVolumePercentage, {SetGlobalVolumeParam})
69-
->Event("GetGlobalVolumeDecibels", &MiniAudioListenerRequests::GetGlobalVolumeDecibels, {GetGlobalVolumeDecibelsParam})
70-
->Event("SetGlobalVolumeDecibels", &MiniAudioListenerRequests::SetGlobalVolumeDecibels, {SetGlobalVolumeDecibelsParam})
71-
->Event("GetInnerConeAngleInRadians", &MiniAudioListenerRequests::GetInnerAngleInRadians, {GetInnerConeAngleInRadiansParam})
72-
->Event("SetInnerConeAngleInRadians", &MiniAudioListenerRequests::SetInnerAngleInRadians, {SetInnerConeAngleInRadiansParam})
73-
->Event("GetInnerConeAngleInDegrees", &MiniAudioListenerRequests::GetInnerAngleInDegrees, {GetInnerConeAngleInDegreesParam})
74-
->Event("SetInnerConeAngleInDegrees", &MiniAudioListenerRequests::SetInnerAngleInDegrees, {SetInnerConeAngleInDegreesParam})
75-
->Event("GetOuterConeAngleInRadians", &MiniAudioListenerRequests::GetOuterAngleInRadians, {GetOuterConeAngleInRadiansParam})
76-
->Event("SetOuterConeAngleInRadians", &MiniAudioListenerRequests::SetOuterAngleInRadians, {SetOuterConeAngleInRadiansParam})
77-
->Event("GetOuterConeAngleInDegrees", &MiniAudioListenerRequests::GetOuterAngleInDegrees, {GetOuterConeAngleInDegreesParam})
78-
->Event("SetOuterConeAngleInDegrees", &MiniAudioListenerRequests::SetOuterAngleInDegrees, {SetOuterConeAngleInDegreesParam})
79-
->Event("GetOuterVolumePercentage", &MiniAudioListenerRequests::GetOuterVolumePercentage, {GetOuterVolumeParam})
80-
->Event("SetOuterVolumePercentage", &MiniAudioListenerRequests::SetOuterVolumePercentage, {SetOuterVolumeParam})
81-
->Event("GetOuterVolumeDecibels", &MiniAudioListenerRequests::GetOuterVolumeDecibels, {GetOuterVolumeDecibelsParam})
82-
->Event("SetOuterVolumeDecibels", &MiniAudioListenerRequests::SetOuterVolumeDecibels, {SetOuterVolumeDecibelsParam})
83-
;
75+
->Event("GetChannelCount", &MiniAudioListenerRequests::GetChannelCount, { GetChannelCountParam })
76+
->Event("GetGlobalVolumePercentage", &MiniAudioListenerRequests::GetGlobalVolumePercentage, { GetGlobalVolumeParam })
77+
->Event("SetGlobalVolumePercentage", &MiniAudioListenerRequests::SetGlobalVolumePercentage, { SetGlobalVolumeParam })
78+
->Event("GetGlobalVolumeDecibels", &MiniAudioListenerRequests::GetGlobalVolumeDecibels, { GetGlobalVolumeDecibelsParam })
79+
->Event("SetGlobalVolumeDecibels", &MiniAudioListenerRequests::SetGlobalVolumeDecibels, { SetGlobalVolumeDecibelsParam })
80+
->Event(
81+
"GetInnerConeAngleInRadians", &MiniAudioListenerRequests::GetInnerAngleInRadians, { GetInnerConeAngleInRadiansParam })
82+
->Event(
83+
"SetInnerConeAngleInRadians", &MiniAudioListenerRequests::SetInnerAngleInRadians, { SetInnerConeAngleInRadiansParam })
84+
->Event(
85+
"GetInnerConeAngleInDegrees", &MiniAudioListenerRequests::GetInnerAngleInDegrees, { GetInnerConeAngleInDegreesParam })
86+
->Event(
87+
"SetInnerConeAngleInDegrees", &MiniAudioListenerRequests::SetInnerAngleInDegrees, { SetInnerConeAngleInDegreesParam })
88+
->Event(
89+
"GetOuterConeAngleInRadians", &MiniAudioListenerRequests::GetOuterAngleInRadians, { GetOuterConeAngleInRadiansParam })
90+
->Event(
91+
"SetOuterConeAngleInRadians", &MiniAudioListenerRequests::SetOuterAngleInRadians, { SetOuterConeAngleInRadiansParam })
92+
->Event(
93+
"GetOuterConeAngleInDegrees", &MiniAudioListenerRequests::GetOuterAngleInDegrees, { GetOuterConeAngleInDegreesParam })
94+
->Event(
95+
"SetOuterConeAngleInDegrees", &MiniAudioListenerRequests::SetOuterAngleInDegrees, { SetOuterConeAngleInDegreesParam })
96+
->Event("GetOuterVolumePercentage", &MiniAudioListenerRequests::GetOuterVolumePercentage, { GetOuterVolumeParam })
97+
->Event("SetOuterVolumePercentage", &MiniAudioListenerRequests::SetOuterVolumePercentage, { SetOuterVolumeParam })
98+
->Event("GetOuterVolumeDecibels", &MiniAudioListenerRequests::GetOuterVolumeDecibels, { GetOuterVolumeDecibelsParam })
99+
->Event("SetOuterVolumeDecibels", &MiniAudioListenerRequests::SetOuterVolumeDecibels, { SetOuterVolumeDecibelsParam });
84100

85101
behaviorContext->Class<MiniAudioListenerComponent>()->RequestBus("MiniAudioListenerRequestBus");
86102
}

‎Gems/MiniAudio/Code/Source/Clients/MiniAudioListenerComponentConfig.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,7 @@ namespace MiniAudio
2323
->Field("Global Volume", &MiniAudioListenerComponentConfig::m_globalVolume)
2424
->Field("Inner Cone Angle", &MiniAudioListenerComponentConfig::m_innerAngleInDegrees)
2525
->Field("Outer Cone Angle", &MiniAudioListenerComponentConfig::m_outerAngleInDegrees)
26-
->Field("Outer Volume", &MiniAudioListenerComponentConfig::m_outerVolume)
27-
;
26+
->Field("Outer Volume", &MiniAudioListenerComponentConfig::m_outerVolume);
2827
}
2928
}
3029
} // namespace MiniAudio

‎Gems/MiniAudio/Code/Source/Clients/MiniAudioListenerComponentController.cpp‎

Lines changed: 22 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -21,8 +21,7 @@ namespace MiniAudio
2121
{
2222
}
2323

24-
MiniAudioListenerComponentController::MiniAudioListenerComponentController(
25-
const MiniAudioListenerComponentConfig& config)
24+
MiniAudioListenerComponentController::MiniAudioListenerComponentController(const MiniAudioListenerComponentConfig& config)
2625
{
2726
m_config = config;
2827
}
@@ -68,13 +67,13 @@ namespace MiniAudio
6867

6968
float MiniAudioListenerComponentController::GetGlobalVolumePercentage() const
7069
{
71-
return MiniAudioInterface::Get()->GetGlobalVolume()*100.f;
70+
return MiniAudioInterface::Get()->GetGlobalVolume() * 100.f;
7271
}
7372

7473
void MiniAudioListenerComponentController::SetGlobalVolumePercentage(float globalVolume)
7574
{
7675
m_config.m_globalVolume = globalVolume;
77-
MiniAudioInterface::Get()->SetGlobalVolume(m_config.m_globalVolume/100.f);
76+
MiniAudioInterface::Get()->SetGlobalVolume(m_config.m_globalVolume / 100.f);
7877
}
7978

8079
float MiniAudioListenerComponentController::GetGlobalVolumeDecibels() const
@@ -84,8 +83,8 @@ namespace MiniAudio
8483

8584
void MiniAudioListenerComponentController::SetGlobalVolumeDecibels(float globalVolumeDecibels)
8685
{
87-
m_config.m_globalVolume = ma_volume_db_to_linear(globalVolumeDecibels)*100.f;
88-
MiniAudioInterface::Get()->SetGlobalVolume(m_config.m_globalVolume/100.f);
86+
m_config.m_globalVolume = ma_volume_db_to_linear(globalVolumeDecibels) * 100.f;
87+
MiniAudioInterface::Get()->SetGlobalVolume(m_config.m_globalVolume / 100.f);
8988
}
9089

9190
void MiniAudioListenerComponentController::SetFollowEntity(const AZ::EntityId& followEntity)
@@ -160,12 +159,12 @@ namespace MiniAudio
160159

161160
float MiniAudioListenerComponentController::GetOuterVolumeDecibels() const
162161
{
163-
return ma_volume_linear_to_db(m_config.m_outerVolume/100.f);
162+
return ma_volume_linear_to_db(m_config.m_outerVolume / 100.f);
164163
}
165164

166165
void MiniAudioListenerComponentController::SetOuterVolumeDecibels(float outerVolumeDecibels)
167166
{
168-
m_config.m_outerVolume = ma_volume_db_to_linear(outerVolumeDecibels)*100.f;
167+
m_config.m_outerVolume = ma_volume_db_to_linear(outerVolumeDecibels) * 100.f;
169168
OnConfigurationUpdated();
170169
}
171170

@@ -188,7 +187,12 @@ namespace MiniAudio
188187
{
189188
if (ma_engine* engine = MiniAudioInterface::Get()->GetSoundEngine())
190189
{
191-
ma_engine_listener_set_position(engine, m_config.m_listenerIndex, world.GetTranslation().GetX(), world.GetTranslation().GetY(), world.GetTranslation().GetZ());
190+
ma_engine_listener_set_position(
191+
engine,
192+
m_config.m_listenerIndex,
193+
world.GetTranslation().GetX(),
194+
world.GetTranslation().GetY(),
195+
world.GetTranslation().GetZ());
192196

193197
const AZ::Vector3 forward = world.GetBasisY();
194198
const AZ::Vector3 up = world.GetBasisZ();
@@ -203,7 +207,8 @@ namespace MiniAudio
203207
if (m_config.m_followEntity.IsValid())
204208
{
205209
m_entityMovedHandler.Disconnect();
206-
AZ::TransformBus::Event(m_config.m_followEntity, &AZ::TransformBus::Events::BindTransformChangedEventHandler, m_entityMovedHandler);
210+
AZ::TransformBus::Event(
211+
m_config.m_followEntity, &AZ::TransformBus::Events::BindTransformChangedEventHandler, m_entityMovedHandler);
207212

208213
AZ::Transform worldTm = AZ::Transform::CreateIdentity();
209214
AZ::TransformBus::EventResult(worldTm, m_entityComponentIdPair.GetEntityId(), &AZ::TransformBus::Events::GetWorldTM);
@@ -216,8 +221,13 @@ namespace MiniAudio
216221

217222
if (ma_engine* engine = MiniAudioInterface::Get()->GetSoundEngine())
218223
{
219-
MiniAudioInterface::Get()->SetGlobalVolume(m_config.m_globalVolume/100.f);
220-
ma_engine_listener_set_cone(engine, m_config.m_listenerIndex, m_config.m_innerAngleInRadians, m_config.m_outerAngleInRadians, (m_config.m_outerVolume/100.f));
224+
MiniAudioInterface::Get()->SetGlobalVolume(m_config.m_globalVolume / 100.f);
225+
ma_engine_listener_set_cone(
226+
engine,
227+
m_config.m_listenerIndex,
228+
m_config.m_innerAngleInRadians,
229+
m_config.m_outerAngleInRadians,
230+
(m_config.m_outerVolume / 100.f));
221231
}
222232
}
223233
} // namespace MiniAudio

‎Gems/MiniAudio/Code/Source/Clients/MiniAudioModule.cpp‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,17 @@
66
*
77
*/
88

9-
109
#include <MiniAudioModuleInterface.h>
1110

1211
namespace MiniAudio
1312
{
14-
class MiniAudioModule
15-
: public MiniAudioModuleInterface
13+
class MiniAudioModule : public MiniAudioModuleInterface
1614
{
1715
public:
1816
AZ_RTTI(MiniAudioModule, "{501C94A1-993A-4203-9720-D43D6C1DDB7A}", MiniAudioModuleInterface);
1917
AZ_CLASS_ALLOCATOR(MiniAudioModule, AZ::SystemAllocator, 0);
2018
};
21-
}// namespace MiniAudio
22-
19+
} // namespace MiniAudio
2320

2421
#if defined(O3DE_GEM_NAME)
2522
AZ_DECLARE_MODULE_CLASS(AZ_JOIN(Gem_, O3DE_GEM_NAME), MiniAudio::MiniAudioModule)

0 commit comments

Comments
 (0)