Skip to content

Commit ad8e518

Browse files
ookii-tsukiookii-tsuki
committed
Code clean up
1 parent f0ca0d1 commit ad8e518

32 files changed

Lines changed: 105 additions & 205 deletions

‎ControlSync/AddProfile.xaml.cs‎

Lines changed: 1 addition & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
using System.Windows;
5-
using System.Windows.Controls;
6-
using System.Windows.Data;
7-
using System.Windows.Documents;
8-
using System.Windows.Input;
9-
using System.Windows.Media;
10-
using System.Windows.Media.Imaging;
11-
using System.Windows.Navigation;
12-
using System.Windows.Shapes;
1+
using System.Windows.Controls;
132

143
namespace ControlSync
154
{

‎ControlSync/App.xaml.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Configuration;
4-
using System.Data;
5-
using System.Linq;
6-
using System.Threading.Tasks;
7-
using System.Windows;
1+
using System.Windows;
82

93
namespace ControlSync
104
{

‎ControlSync/Client.xaml.cs‎

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,10 @@
11
using ControlSync.Client;
2-
using System;
32
using System.Collections.Generic;
43
using System.Linq;
5-
using System.Text;
64
using System.Text.RegularExpressions;
75
using System.Windows;
86
using System.Windows.Controls;
9-
using System.Windows.Data;
10-
using System.Windows.Documents;
117
using System.Windows.Input;
12-
using System.Windows.Media;
13-
using System.Windows.Media.Imaging;
14-
using System.Windows.Navigation;
158

169
namespace ControlSync
1710
{
@@ -24,11 +17,11 @@ public partial class ClientPg : Page
2417
static string logData;
2518

2619
public Client.Client.Event onConnect, onDisconnect;
27-
public List<Client.PlayerManager> Players { get => Client.Manager.players.Values.OrderBy(x => x.Id).ToList();}
20+
public List<Client.PlayerManager> Players { get => Client.Manager.players.Values.OrderBy(x => x.Id).ToList(); }
2821
public ClientPg()
2922
{
3023
InitializeComponent();
31-
if(instance != null)
24+
if (instance != null)
3225
{
3326
portTB.Text = instance.portTB.Text;
3427
ipTB.Text = instance.ipTB.Text;
@@ -63,7 +56,7 @@ private void ShowScreen_Click(object sender, RoutedEventArgs e)
6356

6457
private void joinBtn_Click(object sender, RoutedEventArgs e)
6558
{
66-
59+
6760
if (!Client.Client.isConnected)
6861
{
6962
if (portTB.Text.Length == 0)
@@ -99,8 +92,8 @@ private void joinBtn_Click(object sender, RoutedEventArgs e)
9992
public static void Log(string message)
10093
{
10194
logData += message + "\n";
102-
instance.Dispatcher.Invoke(() =>
103-
{
95+
instance.Dispatcher.Invoke(() =>
96+
{
10497
instance.consoleBox.AppendText(message + "\n");
10598
instance.consoleBox.ScrollToEnd();
10699
});

‎ControlSync/Client/Client.cs‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
1-
using System.Collections.Generic;
1+
using System;
2+
using System.Collections.Generic;
23
using System.Net;
34
using System.Net.Sockets;
4-
using System;
5-
using System.Diagnostics;
65

76
namespace ControlSync.Client
87
{
@@ -23,7 +22,7 @@ public static class Client
2322
public static Event onFailConnect;
2423
public static Event onDisconnect;
2524
public static Event onConnect;
26-
25+
2726
private delegate void PacketHandler(Packet _packet);
2827
private static Dictionary<int, PacketHandler> packetHandlers;
2928

@@ -56,7 +55,7 @@ public void Connect()
5655
socket.BeginConnect(ip, port, ConnectCallback, socket);
5756
}
5857
catch (Exception ex)
59-
{
58+
{
6059
ClientPg.Log(ex.Message);
6160
}
6261
}
@@ -96,7 +95,7 @@ public void SendData(Packet _packet)
9695
stream.BeginWrite(_packet.ToArray(), 0, _packet.Length(), (IAsyncResult ar) =>
9796
{
9897
if (packetId == (int)ClientPackets.ClosePeerConnection)
99-
Disconnect();
98+
Disconnect();
10099
// if this is the host peer we must wait for it to tell the other clients
101100
// to close connections before disconnecting
102101
}, null);
@@ -200,7 +199,8 @@ public UDP()
200199
try
201200
{
202201
endPoint = new IPEndPoint(IPAddress.Parse(ip), port);
203-
}catch(Exception ex)
202+
}
203+
catch (Exception ex)
204204
{
205205
ClientPg.Log(ex.Message);
206206
}
@@ -219,7 +219,8 @@ public void Connect(int _localPort)
219219
{
220220
SendData(_packet);
221221
}
222-
}catch(Exception ex)
222+
}
223+
catch (Exception ex)
223224
{
224225
ClientPg.Log(ex.Message);
225226
onFailConnect?.Invoke();
@@ -323,7 +324,8 @@ public static void Disconnect()
323324
udp.socket?.Close();
324325
ClientPg.Log("Disconnected from server.");
325326
onDisconnect?.Invoke();
326-
}catch(Exception ex)
327+
}
328+
catch (Exception ex)
327329
{
328330
ClientPg.Log(ex.Message);
329331
}

‎ControlSync/Client/ClientHandle.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,5 @@
1-
using System.Collections;
2-
using System.Numerics;
1+
using ScpDriverInterface;
32
using System.Net;
4-
using ScpDriverInterface;
5-
using System.Diagnostics;
63

74
namespace ControlSync.Client
85
{
@@ -39,13 +36,13 @@ public static void ButtonState(Packet _packet)
3936
{
4037
int _id = _packet.ReadInt();
4138
int clickState = _packet.ReadInt();
42-
if(Manager.players.ContainsKey(_id))
39+
if (Manager.players.ContainsKey(_id))
4340
Manager.players[_id].Click((X360Buttons)clickState);
4441
}
4542
public static void AnalogState(Packet _packet)
4643
{
4744
int _id = _packet.ReadInt();
48-
if (Manager.players.ContainsKey(_id))
45+
if (Manager.players.ContainsKey(_id))
4946
{
5047
for (int i = 0; i < 6; i++)
5148
{

‎ControlSync/Client/ClientLogic.cs‎

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,4 @@
1-
using Org.BouncyCastle.Math.EC.Multiplier;
2-
using System;
3-
using System.Collections.Generic;
4-
using System.Diagnostics;
5-
using System.Security.RightsManagement;
6-
using System.Text;
7-
using System.Windows;
8-
using System.Windows.Input;
1+
using System;
92

103
namespace ControlSync.Client
114
{

‎ControlSync/Client/ClientPeer.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,7 +108,7 @@ private static RTCPeerConnection CreatePeerConnection()
108108
peerConnection.OnAudioFormatsNegotiated += (sdpFormat) => AudioEncoder.SetAudioSinkFormat(sdpFormat.First());
109109

110110
peerConnection.OnVideoFrameReceived += VideoEncoder.GotVideoFrame;
111-
111+
112112

113113
VideoEncoder.OnVideoSinkDecodedSampleFaster += (RawImage img) =>
114114
{
@@ -132,7 +132,7 @@ private static RTCPeerConnection CreatePeerConnection()
132132
var base64ICECandidate = Convert.ToBase64String(Encoding.UTF8.GetBytes(jCandidate));
133133

134134
ClientSend.ICECandidate(base64ICECandidate, 1);
135-
135+
136136
};
137137

138138

‎ControlSync/Client/ClientSend.cs‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,4 @@
1-
using System;
2-
using System.Collections.Generic;
3-
using System.Text;
4-
5-
namespace ControlSync.Client
1+
namespace ControlSync.Client
62
{
73
public class ClientSend
84
{
@@ -27,16 +23,16 @@ public static void WelcomeReceived()
2723
ClientPg.instance.Dispatcher.Invoke(() => _packet.Write(ClientPg.instance.uidTB.Text));
2824

2925
SendTCPData(_packet);
30-
26+
3127
}
3228

3329
public static void ButtonState(int xButtons)
3430
{
3531
using Packet _packet = new Packet((int)ClientPackets.ButtonState);
3632

37-
_packet.Write(xButtons);
33+
_packet.Write(xButtons);
3834
SendUDPData(_packet);
39-
35+
4036
}
4137
public static void AnalogState(short[] inputs)
4238
{

‎ControlSync/Client/ControllerInput.cs‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11
using ScpDriverInterface;
2-
using System;
3-
using System.Collections.Generic;
4-
using System.Diagnostics;
5-
using System.Security.Cryptography;
6-
using System.Text;
72
using System.Windows;
83
using System.Windows.Input;
9-
using System.Windows.Media.Animation;
104

115
namespace ControlSync.Client
126
{
@@ -38,7 +32,7 @@ public static void SendInputToServer()
3832
}
3933
else
4034
if (button.XBtnControl != null)
41-
buttons &= ~(X360Buttons)button.XBtnControl;
35+
buttons &= ~(X360Buttons)button.XBtnControl;
4236
});
4337
}
4438

‎ControlSync/Client/HostPeer.cs‎

Lines changed: 11 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,14 @@
1-
using System;
2-
using System.Threading;
3-
using System.Threading.Tasks;
1+
using Newtonsoft.Json;
42
using SIPSorcery.Net;
53
using SIPSorceryMedia.Abstractions;
6-
using SIPSorcery.Media;
7-
using System.Linq;
8-
using System.Collections.Generic;
9-
using System.Text;
10-
using Newtonsoft.Json;
114
using SIPSorceryMedia.External;
125
using SIPSorceryMedia.FFmpeg;
136
using SIPSorceryMedia.OpusCodec;
14-
using SIPSorceryMedia.SDL2;
7+
using System;
8+
using System.Collections.Generic;
159
using System.IO;
10+
using System.Linq;
11+
using System.Text;
1612

1713
namespace ControlSync.Client
1814
{
@@ -22,7 +18,7 @@ public static class HostPeer
2218
private const string STUN_URL2 = "stun:stun1.l.google.com:19302";
2319

2420
public static RTCPeerConnectionState ConnectionState => peerConnection != null ? peerConnection.connectionState : RTCPeerConnectionState.disconnected;
25-
21+
2622
public static FFmpegVideoEndPoint1 VideoEncoder { get; private set; }
2723
public static WasAPIAudioSource AudioEncoder { get; private set; }
2824

@@ -36,7 +32,7 @@ public static async void StartPeerConnection()
3632
VideoEncoder = new FFmpegVideoEndPoint1();
3733

3834
AudioEncoder = new WasAPIAudioSource(new OpusAudioEncoder());
39-
35+
4036
FFmpegInit.Initialise(FfmpegLogLevelEnum.AV_LOG_DEBUG, ffmpegPath);
4137

4238
peerConnection = CreatePeerConnection();
@@ -57,7 +53,7 @@ public static void HandleAnswer(string base64Answer)
5753
string remoteAnswer = Encoding.UTF8.GetString(Convert.FromBase64String(base64Answer));
5854

5955
RTCSessionDescriptionInit answerInit = JsonConvert.DeserializeObject<RTCSessionDescriptionInit>(remoteAnswer);
60-
56+
6157
peerConnection.setRemoteDescription(answerInit);
6258

6359
ClientPg.Log("Received Answer");
@@ -76,7 +72,7 @@ public static void AddICECandidate(string base64ICECandidate)
7672
}
7773
public static void CloseConnection()
7874
{
79-
if (peerConnection == null)
75+
if (peerConnection == null)
8076
return;
8177

8278
peerConnection.close();
@@ -119,15 +115,15 @@ private static RTCPeerConnection CreatePeerConnection()
119115
{
120116
var jCandidate = candidate.toJSON();
121117
var base64ICECandidate = Convert.ToBase64String(Encoding.UTF8.GetBytes(jCandidate));
122-
118+
123119
for (int i = 2; i <= Manager.players.Count; i++)
124120
{
125121
var player = Manager.players[i];
126122
ClientSend.ICECandidate(base64ICECandidate, player.Id);
127123
}
128124
};
129125

130-
126+
131127
// Add a handler for connection state change events.
132128
// This can be used to monitor the status of the WebRTC session.
133129
pc.onconnectionstatechange += (state) =>

0 commit comments

Comments
 (0)