Skip to content

Commit 4a53203

Browse files
arkangel-devarkangel-dev
committed
Implemented actual settings read write
1 parent 091b221 commit 4a53203

29 files changed

+39
-40
lines changed

‎SyncPlayWPF/.vs/SyncPlayWPF/v16/.suo‎

-50 KB
Binary file not shown.

‎SyncPlayWPF/SyncPlayWPF/Common/Settings.cs‎

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -176,6 +176,13 @@ public static void ReadConfigurationFromView(Pages.SettingsPage Page) {
176176
System.IO.File.WriteAllText("SyncPlayConfig.xml", doc.ToString());
177177
}
178178

179-
179+
public static void WriteConfigurationToFile(XDocument doc) {
180+
System.IO.File.WriteAllText("SyncPlayConfig.xml", doc.ToString());
181+
}
182+
public static void WriteConfigurationToFile() {
183+
System.IO.File.WriteAllText("SyncPlayConfig.xml", Common.Shared.CurrentConfig.ToString());
184+
}
185+
186+
180187
}
181188
}

‎SyncPlayWPF/SyncPlayWPF/MainWindow.xaml.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ public MainWindow() {
3737
private void MainWindow_Loaded(object sender, RoutedEventArgs e) {
3838
MiddleTransition.ShowPage(new Pages.ApplicationPages.NotificationLayer());
3939
Common.Shared.MasterWindow = this;
40+
Common.Settings.DefineSharedSettings();
4041
}
4142

4243
private void Current_DispatcherUnhandledException(object sender, System.Windows.Threading.DispatcherUnhandledExceptionEventArgs e) {

‎SyncPlayWPF/SyncPlayWPF/Pages/NewSessionPage.xaml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,10 +61,10 @@
6161
<RowDefinition Height="auto"/>
6262
<RowDefinition Height="auto"/>
6363
</Grid.RowDefinitions>
64-
<custom:PromptingLabel Text="syncplay.pl:8995" Grid.Row="0" x:Name="ServerAddressField" PromptingText="Server Address" FocusedUnderlineBrush="{StaticResource DarkMode_ContrastedGradient}"/>
65-
<custom:PromptingLabel Text="Sammy" Grid.Row="1" x:Name="UsernameField" PromptingText="Username" FocusedUnderlineBrush="{StaticResource DarkMode_ContrastedGradient}"/>
64+
<custom:PromptingLabel Grid.Row="0" x:Name="ServerAddressField" PromptingText="Server Address" FocusedUnderlineBrush="{StaticResource DarkMode_ContrastedGradient}"/>
65+
<custom:PromptingLabel Grid.Row="1" x:Name="UsernameField" PromptingText="Username" FocusedUnderlineBrush="{StaticResource DarkMode_ContrastedGradient}"/>
6666
<custom:PromptingPasswordBox Grid.Row="2" x:Name="PasswordField" PromptingText="Password" FocusedUnderlineBrush="{StaticResource DarkMode_ContrastedGradient}"/>
67-
<custom:PromptingLabel Text="ck" Grid.Row="3" x:Name="RoomNameField" PromptingText="Room Name" FocusedUnderlineBrush="{StaticResource DarkMode_ContrastedGradient}"/>
67+
<custom:PromptingLabel Grid.Row="3" x:Name="RoomNameField" PromptingText="Room Name" FocusedUnderlineBrush="{StaticResource DarkMode_ContrastedGradient}"/>
6868

6969
</Grid>
7070

‎SyncPlayWPF/SyncPlayWPF/Pages/NewSessionPage.xaml.cs‎

Lines changed: 15 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,14 @@ namespace SyncPlayWPF.Pages {
2121
public partial class NewSessionPage : UserControl {
2222
public NewSessionPage() {
2323
InitializeComponent();
24+
25+
this.Loaded += PageLoaded;
26+
}
27+
28+
private void PageLoaded(object sender, RoutedEventArgs e) {
29+
ServerAddressField.Text = Common.Shared.CurrentConfig.Element("Config").Element("Basics").Element("Address").Value;
30+
UsernameField.Text = Common.Shared.CurrentConfig.Element("Config").Element("Basics").Element("Username").Value;
31+
RoomNameField.Text = Common.Shared.CurrentConfig.Element("Config").Element("Basics").Element("RoomName").Value;
2432
}
2533

2634
Pages.ApplicationPages.LoadingScreen LoadingPage = null;
@@ -33,12 +41,6 @@ private void JoinRoom_Clicked(object sender, RoutedEventArgs e) {
3341
var password = PasswordField.ActualPassword;
3442
var roomName = RoomNameField.Text;
3543

36-
Console.WriteLine(
37-
$"Server : {serverIp}:{serverPort}\n" +
38-
$"Username : {username}\n" +
39-
$"Password : {password}\n" +
40-
$"Room Name : {roomName}");
41-
4244
Common.Shared.Wrapper = new SyncPlayWrapper(
4345
serverIp,
4446
serverPort,
@@ -62,7 +64,6 @@ private void SyncPlayClient_OnDisconnect(SyncPlayClient sender, SyncPlay.SPEvent
6264
LoadingPage = null;
6365
Common.Shared.MasterOverrideTransition.UnloadCurrentPage();
6466
Common.Shared.MasterOverrideTransition.ShowPage(new ApplicationPages.Blank());
65-
GC.Collect();
6667
Common.Shared.Wrapper.SyncPlayClient.OnConnect -= SyncPlayClient_OnConnect;
6768
Common.Shared.Wrapper.SyncPlayClient.OnDisconnect -= SyncPlayClient_OnDisconnect;
6869
});
@@ -79,12 +80,19 @@ private void SyncPlayClient_OnConnect(SyncPlayClient sender, SyncPlay.SPEventArg
7980
Common.Shared.MasterOverrideTransition.UnloadCurrentPage();
8081
Common.Shared.MasterOverrideTransition.ShowPage(new ApplicationPages.Blank());
8182
Common.Shared.WindowPageTransition.ShowPage(new Pages.SessionLandingPage());
83+
84+
Common.Shared.CurrentConfig.Element("Config").Element("Basics").Element("Address").Value = ServerAddressField.Text;
85+
Common.Shared.CurrentConfig.Element("Config").Element("Basics").Element("Username").Value = UsernameField.Text;
86+
Common.Shared.CurrentConfig.Element("Config").Element("Basics").Element("RoomName").Value = RoomNameField.Text;
87+
Common.Settings.WriteConfigurationToFile();
8288
});
8389
}
8490

8591
private void ShowMoreSettings_Clicked(object sender, RoutedEventArgs e) {
8692
Common.Shared.PreviousScreen = this;
8793
Common.Shared.WindowPageTransition.ShowPage(new Pages.SettingsPage());
94+
95+
8896
}
8997
}
9098
}

‎SyncPlayWPF/SyncPlayWPF/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -51,5 +51,5 @@
5151
// You can specify all the values or you can default the Build and Revision Numbers
5252
// by using the '*' as shown below:
5353
// [assembly: AssemblyVersion("1.0.*")]
54-
[assembly: AssemblyVersion("2021.249.46.0")]
55-
[assembly: AssemblyFileVersion("2021.249.46.0")]
54+
[assembly: AssemblyVersion("2021.249.50.0")]
55+
[assembly: AssemblyFileVersion("2021.249.50.0")]

‎SyncPlayWPF/SyncPlayWPF/SyncPlay/MediaPlayers/MPVPlayer/Connector.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ public void SetPosition(float f) {
5050

5151
public void StartPlayerInstance() {
5252
StartMPVINstance();
53-
Thread.Sleep(3000);
53+
//Thread.Sleep(3000);
5454
ConnectToMPVInstance();
5555
var readThread = new Thread(() => {
5656
ReadData();

‎SyncPlayWPF/SyncPlayWPF/SyncPlay/Misc/Packets.cs‎

Lines changed: 3 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -51,10 +51,10 @@ public static string CraftIdentificationMessage(String username, String password
5151
)
5252
)
5353
);
54-
5554
var sresult = result.ToString(Newtonsoft.Json.Formatting.None) + "\r\n";
5655
return sresult;
5756
}
57+
5858
public static string CraftTLS() {
5959
var result = new JObject(
6060
new JProperty("TLS",
@@ -66,6 +66,7 @@ public static string CraftTLS() {
6666
var sresult = result.ToString(Newtonsoft.Json.Formatting.None) + "\r\n";
6767
return sresult;
6868
}
69+
6970
public static string CraftPingMessage(
7071
double clientRtt,
7172
double clientLatencyCalculation,
@@ -75,11 +76,7 @@ public static string CraftPingMessage(
7576
bool clientIgnoreOnFly = false,
7677
bool doSeek = false,
7778
bool? playerPaused = null
78-
79-
8079
) {
81-
82-
8380
var result = new JObject(
8481
new JProperty("State",
8582
new JObject(
@@ -94,28 +91,22 @@ public static string CraftPingMessage(
9491
)
9592
);
9693
if (clientIgnoreOnFly || serverIgnoreOnFly) {
97-
9894
var Container = new JObject();
9995
if (serverIgnoreOnFly) Container.Add(new JProperty("server", 1));
10096
if (clientIgnoreOnFly) Container.Add(new JProperty("client", 1));
101-
10297
((JObject)result["State"]).Add(new JProperty("ignoringOnTheFly", Container));
10398
}
104-
105-
10699
if (playerPosition != -1 && playerPaused != null) {
107100
var container = new JObject();
108101
container.Add(new JProperty("doSeek", doSeek));
109102
container.Add(new JProperty("position", playerPosition));
110103
container.Add(new JProperty("paused", (bool)playerPaused));
111-
112104
((JObject)result["State"]).Add(new JProperty("playstate", container));
113105
}
114-
115-
116106
var sresult = result.ToString(Newtonsoft.Json.Formatting.None) + "\r\n";
117107
return sresult;
118108
}
109+
119110
public static string CraftSetClientReadiness(bool isReady, bool manuallyInitiated) {
120111
var result = new JObject(
121112
new JProperty("Set",
@@ -142,18 +133,12 @@ public static string CraftOutgoingChatMessage(string message) {
142133
return sresult;
143134
}
144135

145-
146-
147136
public static string CraftSendList() {
148137
var result = new JObject(
149138
new JProperty("List", null)
150139
);
151140
var sresult = result.ToString(Newtonsoft.Json.Formatting.None) + "\r\n";
152141
return sresult;
153142
}
154-
155-
156-
157-
158143
}
159144
}

‎SyncPlayWPF/SyncPlayWPF/bin/Release/SyncPlayConfig.xml‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<Config>
22
<!--Basics and Stuff-->
33
<Basics>
4-
<Address></Address>
5-
<Username></Username>
4+
<Address>syncplay.pl:8995</Address>
5+
<Username>Sam</Username>
66
<Password></Password>
7-
<RoomName></RoomName>
7+
<RoomName>ck</RoomName>
88
<PathToMediaPlayer></PathToMediaPlayer>
99
<PathToVideo></PathToVideo>
1010
<AdditionalArguments></AdditionalArguments>

‎SyncPlayWPF/SyncPlayWPF/bin/Release/SyncPlayWPF.exe‎

512 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)