Skip to content

Commit ea3f52e

Browse files
committed
Protocol v6
Server now sends updates after commiting changes from a client
1 parent a3bae52 commit ea3f52e

File tree

2 files changed

+44
-11
lines changed

2 files changed

+44
-11
lines changed

Installer/Installer.vdproj

Lines changed: 41 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -148,12 +148,6 @@
148148
"Entry"
149149
{
150150
"MsmKey" = "8:_UNDEFINED"
151-
"OwnerKey" = "8:_A3E086BF23EB282D5F32F349F53F3F11"
152-
"MsmSig" = "8:_UNDEFINED"
153-
}
154-
"Entry"
155-
{
156-
"MsmKey" = "8:_UNDEFINED"
157151
"OwnerKey" = "8:_96D278E201924D8F8D019951CA3956C1"
158152
"MsmSig" = "8:_UNDEFINED"
159153
}
@@ -217,6 +211,12 @@
217211
"OwnerKey" = "8:_09F77F1FC64638E59489517C875E43EB"
218212
"MsmSig" = "8:_UNDEFINED"
219213
}
214+
"Entry"
215+
{
216+
"MsmKey" = "8:_UNDEFINED"
217+
"OwnerKey" = "8:_A3E086BF23EB282D5F32F349F53F3F11"
218+
"MsmSig" = "8:_UNDEFINED"
219+
}
220220
}
221221
"Configurations"
222222
{
@@ -235,6 +235,22 @@
235235
"PrivateKeyFile" = "8:"
236236
"TimeStampServer" = "8:"
237237
"InstallerBootstrapper" = "3:2"
238+
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
239+
{
240+
"Enabled" = "11:TRUE"
241+
"PromptEnabled" = "11:TRUE"
242+
"PrerequisitesLocation" = "2:1"
243+
"Url" = "8:"
244+
"ComponentsUrl" = "8:"
245+
"Items"
246+
{
247+
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"
248+
{
249+
"Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"
250+
"ProductCode" = "8:.NETFramework,Version=v4.6.1"
251+
}
252+
}
253+
}
238254
}
239255
"Release"
240256
{
@@ -251,6 +267,22 @@
251267
"PrivateKeyFile" = "8:"
252268
"TimeStampServer" = "8:"
253269
"InstallerBootstrapper" = "3:2"
270+
"BootstrapperCfg:{63ACBE69-63AA-4F98-B2B6-99F9E24495F2}"
271+
{
272+
"Enabled" = "11:TRUE"
273+
"PromptEnabled" = "11:TRUE"
274+
"PrerequisitesLocation" = "2:1"
275+
"Url" = "8:"
276+
"ComponentsUrl" = "8:"
277+
"Items"
278+
{
279+
"{EDC2488A-8267-493A-A98E-7D9C3B36CDF3}:.NETFramework,Version=v4.6.1"
280+
{
281+
"Name" = "8:Microsoft .NET Framework 4.6.1 (x86 and x64)"
282+
"ProductCode" = "8:.NETFramework,Version=v4.6.1"
283+
}
284+
}
285+
}
254286
}
255287
}
256288
"Deployable"
@@ -697,15 +729,15 @@
697729
{
698730
"Name" = "8:Microsoft Visual Studio"
699731
"ProductName" = "8:PcVolumeControl"
700-
"ProductCode" = "8:{A2D4ECB4-5F14-44D1-8C11-85759F7E71F5}"
701-
"PackageCode" = "8:{5204957E-C3AC-4894-9B92-F6601B3386C6}"
732+
"ProductCode" = "8:{E687DB59-16AE-489D-812B-83B37120A10D}"
733+
"PackageCode" = "8:{847EF095-CECB-4293-9BC9-3DF05C71BF0B}"
702734
"UpgradeCode" = "8:{C2B40E46-86B1-4406-9587-5159C50DBA6A}"
703735
"AspNetVersion" = "8:4.0.30319.0"
704736
"RestartWWWService" = "11:FALSE"
705737
"RemovePreviousVersions" = "11:TRUE"
706738
"DetectNewerInstalledVersion" = "11:TRUE"
707739
"InstallAllUsers" = "11:FALSE"
708-
"ProductVersion" = "8:1.0.0"
740+
"ProductVersion" = "8:1.0.1"
709741
"Manufacturer" = "8:Dark Rock Studios"
710742
"ARPHELPTELEPHONE" = "8:False"
711743
"ARPHELPLINK" = "8:https://github.com/PcVolumeControl"

VolumeControl/MainWindow.xaml.cs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ namespace VolumeControl
1717
{
1818
public partial class MainWindow : Window, ClientListener
1919
{
20-
public static int VERSION = 5;
20+
public static int VERSION = 6;
2121
private static Object m_lock = new Object();
2222

2323
private CoreAudioController m_coreAudioController;
@@ -358,6 +358,8 @@ public void onClientMessage(string message, TcpClient tcpClient)
358358
if(VERSION == pcAudio.version)
359359
{
360360
updateState(pcAudio);
361+
// Update all clients to the new state
362+
dispatchAudioState();
361363
}
362364
else
363365
{
@@ -391,7 +393,6 @@ public void onClientConnect()
391393

392394
public void updateAndDispatchAudioState()
393395
{
394-
Console.WriteLine("updateAndDispatchAudioState()");
395396
updateState(null);
396397

397398
if (m_audioState != null)

0 commit comments

Comments
 (0)