ShuriZma
/
BizHawk
mirror of https://github.com/TASEmulators/BizHawk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Replace $"{a}{b}" and similar with concatenation

This commit is contained in:
YoshiRulz 2019-04-04 00:58:21 +10:00 committed by James Groom
parent 3b2f890f24
commit a2a5ec7566
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
BizHawk.Client.EmuHawk/tools/NES/NESMusicRipper.cs
View File

@ -59,7 +59,7 @@ namespace BizHawk.Client.EmuHawk
{
int tone = note % 12;
int octave = note / 12;
return $"{noteNames[tone]}{octave}";
return noteNames[tone] + octave;
}
//this isnt thoroughly debugged but it seems to work OK

4
BizHawk.Client.EmuHawk/tools/TraceLogger.cs
View File

@ -413,7 +413,9 @@ namespace BizHawk.Client.EmuHawk
private void StartLogFile(bool append = false)
{
var data = Tracer.Header;
_streamWriter = new StreamWriter($"{_baseName}{(_segmentCount == 0 ? string.Empty : $"_{_segmentCount}")}{_extension}", append);
_streamWriter = new StreamWriter(
string.Concat(_baseName, _segmentCount == 0 ? string.Empty : $"_{_segmentCount}", _extension),
append);
_streamWriter.WriteLine(data);
if (append)
{

6
BizHawk.Common/Extensions/BufferExtensions.cs
View File

@ -100,7 +100,7 @@ namespace BizHawk.Common.BufferExtensions
for (int i = 0; i < buffer.Length && i * 2 < hex.Length; i++)
{
var bytehex = $"{hex[i * 2]}{hex[(i * 2) + 1]}";
var bytehex = hex[i * 2].ToString() + hex[(i * 2) + 1];
buffer[i] = byte.Parse(bytehex, NumberStyles.HexNumber);
}
}
@ -136,7 +136,7 @@ namespace BizHawk.Common.BufferExtensions
for (int i = 0; i < buffer.Length && i * 4 < hex.Length; i++)
{
var shorthex = $"{hex[i * 4]}{hex[(i * 4) + 1]}{hex[(i * 4) + 2]}{hex[(i * 4) + 3]}";
var shorthex = string.Concat(hex[i * 4], hex[(i * 4) + 1], hex[(i * 4) + 2], hex[(i * 4) + 3]);
buffer[i] = short.Parse(shorthex, NumberStyles.HexNumber);
}
}
@ -150,7 +150,7 @@ namespace BizHawk.Common.BufferExtensions
for (int i = 0; i < buffer.Length && i * 4 < hex.Length; i++)
{
var ushorthex = $"{hex[i * 4]}{hex[(i * 4) + 1]}{hex[(i * 4) + 2]}{hex[(i * 4) + 3]}";
var ushorthex = string.Concat(hex[i * 4], hex[(i * 4) + 1], hex[(i * 4) + 2], hex[(i * 4) + 3]);
buffer[i] = ushort.Parse(ushorthex, NumberStyles.HexNumber);
}
}

6
BizHawk.Emulation.DiscSystem/DiscFormats/Blobs/RiffMaster.cs
View File

@ -40,10 +40,8 @@ namespace BizHawk.Emulation.DiscSystem
BaseStream = null;
}
private static string ReadTag(BinaryReader br)
{
return $"{br.ReadChar()}{br.ReadChar()}{br.ReadChar()}{br.ReadChar()}";
}
private static string ReadTag(BinaryReader br) =>
string.Concat(br.ReadChar(), br.ReadChar(), br.ReadChar(), br.ReadChar());
protected static void WriteTag(BinaryWriter bw, string tag)
{