epic/OpenRA
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Use out var syntax

Browse Source
This commit is contained in:
teinarss
2020-08-16 10:49:33 +02:00
committed by Paul Chote
parent d52e4793fe
commit 27f1a7ab27
193 changed files with 395 additions and 826 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
OpenRA.Platforms.Default/OpenAlSoundEngine.cs
View File

@@ -242,8 +242,7 @@ namespace OpenRA.Platforms.Default
atten = 0.66f * ((PoolSize - activeCount * 0.5f) / PoolSize);
}
uint source;
if (!TryGetSourceFromPool(out source))
if (!TryGetSourceFromPool(out var source))
return null;
var slot = sourcePool[source];
@@ -259,8 +258,7 @@ namespace OpenRA.Platforms.Default
{
var currFrame = Game.LocalTick;
uint source;
if (!TryGetSourceFromPool(out source))
if (!TryGetSourceFromPool(out var source))
return null;
var slot = sourcePool[source];
@@ -295,8 +293,7 @@ namespace OpenRA.Platforms.Default
void PauseSound(uint source, bool paused)
{
int state;
AL10.alGetSourcei(source, AL10.AL_SOURCE_STATE, out state);
AL10.alGetSourcei(source, AL10.AL_SOURCE_STATE, out var state);
if (paused)
{
if (state == AL10.AL_PLAYING)
@@ -317,8 +314,7 @@ namespace OpenRA.Platforms.Default
{
var sounds = sourcePool.Keys.Where(key =>
{
int state;
AL10.alGetSourcei(key, AL10.AL_SOURCE_STATE, out state);
AL10.alGetSourcei(key, AL10.AL_SOURCE_STATE, out var state);
return (state == AL10.AL_PLAYING || state == AL10.AL_PAUSED) &&
(music == null || key != ((OpenAlSound)music).Source) &&
(video == null || key != ((OpenAlSound)video).Source);
@@ -449,7 +445,7 @@ namespace OpenRA.Platforms.Default
public float Volume
{
get { float volume; AL10.alGetSourcef(Source, AL10.AL_GAIN, out volume); return volume; }
get { AL10.alGetSourcef(Source, AL10.AL_GAIN, out var volume); return volume; }
set { AL10.alSourcef(Source, AL10.AL_GAIN, value); }
}
@@ -457,8 +453,7 @@ namespace OpenRA.Platforms.Default
{
get
{
int sampleOffset;
AL10.alGetSourcei(Source, AL11.AL_SAMPLE_OFFSET, out sampleOffset);
AL10.alGetSourcei(Source, AL11.AL_SAMPLE_OFFSET, out var sampleOffset);
return sampleOffset / SampleRate;
}
}
@@ -467,8 +462,7 @@ namespace OpenRA.Platforms.Default
{
get
{
int state;
AL10.alGetSourcei(Source, AL10.AL_SOURCE_STATE, out state);
AL10.alGetSourcei(Source, AL10.AL_SOURCE_STATE, out var state);
return state == AL10.AL_STOPPED;
}
}
@@ -480,8 +474,7 @@ namespace OpenRA.Platforms.Default
protected void StopSource()
{
int state;
AL10.alGetSourcei(Source, AL10.AL_SOURCE_STATE, out state);
AL10.alGetSourcei(Source, AL10.AL_SOURCE_STATE, out var state);
if (state == AL10.AL_PLAYING || state == AL10.AL_PAUSED)
AL10.alSourceStop(Source);
}
@@ -554,8 +547,7 @@ namespace OpenRA.Platforms.Default
// TODO: A race condition can happen between the state check and playing/rewinding if a
// user pauses/resumes at the right moment. The window of opportunity is small and the
// consequences are minor, so for now we'll ignore it.
int state;
AL10.alGetSourcei(Source, AL10.AL_SOURCE_STATE, out state);
AL10.alGetSourcei(Source, AL10.AL_SOURCE_STATE, out var state);
if (state != AL10.AL_STOPPED)
AL10.alSourcePlay(source);
else
@@ -575,8 +567,7 @@ namespace OpenRA.Platforms.Default
// has stopped.
var currentSeek = SeekPosition;
int state;
AL10.alGetSourcei(Source, AL10.AL_SOURCE_STATE, out state);
AL10.alGetSourcei(Source, AL10.AL_SOURCE_STATE, out var state);
if (state == AL10.AL_STOPPED)
break;