Skip to content

Commit 7784d1d

Browse files
WavesonicsWavesonics
committed
Protocol v7 and new release
1 parent 14a9a3c commit 7784d1d

6 files changed

Lines changed: 108 additions & 14 deletions

File tree

‎Installer/Installer.vdproj‎

Lines changed: 96 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,12 @@
2121
}
2222
"Entry"
2323
{
24+
"MsmKey" = "8:_1C859033BB5280039EBC4BE19D3AA5CA"
25+
"OwnerKey" = "8:_96D278E201924D8F8D019951CA3956C1"
26+
"MsmSig" = "8:_UNDEFINED"
27+
}
28+
"Entry"
29+
{
2430
"MsmKey" = "8:_1F74B0599190E145B7F7B7B20B8672DD"
2531
"OwnerKey" = "8:_96D278E201924D8F8D019951CA3956C1"
2632
"MsmSig" = "8:_UNDEFINED"
@@ -93,6 +99,12 @@
9399
}
94100
"Entry"
95101
{
102+
"MsmKey" = "8:_9A82C0B7965D1ACDB804E0657D2A59BF"
103+
"OwnerKey" = "8:_96D278E201924D8F8D019951CA3956C1"
104+
"MsmSig" = "8:_UNDEFINED"
105+
}
106+
"Entry"
107+
{
96108
"MsmKey" = "8:_A2EDB9640B6B5FC2DD6F80B35114528C"
97109
"OwnerKey" = "8:_96D278E201924D8F8D019951CA3956C1"
98110
"MsmSig" = "8:_UNDEFINED"
@@ -111,6 +123,12 @@
111123
}
112124
"Entry"
113125
{
126+
"MsmKey" = "8:_A3E086BF23EB282D5F32F349F53F3F11"
127+
"OwnerKey" = "8:_9A82C0B7965D1ACDB804E0657D2A59BF"
128+
"MsmSig" = "8:_UNDEFINED"
129+
}
130+
"Entry"
131+
{
114132
"MsmKey" = "8:_A6C18AEBE897F0FFE5C23E19619E1643"
115133
"OwnerKey" = "8:_96D278E201924D8F8D019951CA3956C1"
116134
"MsmSig" = "8:_UNDEFINED"
@@ -184,12 +202,24 @@
184202
"Entry"
185203
{
186204
"MsmKey" = "8:_UNDEFINED"
205+
"OwnerKey" = "8:_9A82C0B7965D1ACDB804E0657D2A59BF"
206+
"MsmSig" = "8:_UNDEFINED"
207+
}
208+
"Entry"
209+
{
210+
"MsmKey" = "8:_UNDEFINED"
187211
"OwnerKey" = "8:_5AFD219F0421D73BEE5CAFD15A1D5122"
188212
"MsmSig" = "8:_UNDEFINED"
189213
}
190214
"Entry"
191215
{
192216
"MsmKey" = "8:_UNDEFINED"
217+
"OwnerKey" = "8:_1C859033BB5280039EBC4BE19D3AA5CA"
218+
"MsmSig" = "8:_UNDEFINED"
219+
}
220+
"Entry"
221+
{
222+
"MsmKey" = "8:_UNDEFINED"
193223
"OwnerKey" = "8:_A6C18AEBE897F0FFE5C23E19619E1643"
194224
"MsmSig" = "8:_UNDEFINED"
195225
}
@@ -343,6 +373,37 @@
343373
"IsDependency" = "11:TRUE"
344374
"IsolateTo" = "8:"
345375
}
376+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1C859033BB5280039EBC4BE19D3AA5CA"
377+
{
378+
"AssemblyRegister" = "3:1"
379+
"AssemblyIsInGAC" = "11:FALSE"
380+
"AssemblyAsmDisplayName" = "8:Hardcodet.Wpf.TaskbarNotification, Version=1.0.5.0, Culture=neutral, processorArchitecture=MSIL"
381+
"ScatterAssemblies"
382+
{
383+
"_1C859033BB5280039EBC4BE19D3AA5CA"
384+
{
385+
"Name" = "8:Hardcodet.Wpf.TaskbarNotification.dll"
386+
"Attributes" = "3:512"
387+
}
388+
}
389+
"SourcePath" = "8:Hardcodet.Wpf.TaskbarNotification.dll"
390+
"TargetName" = "8:"
391+
"Tag" = "8:"
392+
"Folder" = "8:_01770CE3905B4B09AB8A1EA22D21FBA8"
393+
"Condition" = "8:"
394+
"Transitive" = "11:FALSE"
395+
"Vital" = "11:TRUE"
396+
"ReadOnly" = "11:FALSE"
397+
"Hidden" = "11:FALSE"
398+
"System" = "11:FALSE"
399+
"Permanent" = "11:FALSE"
400+
"SharedLegacy" = "11:FALSE"
401+
"PackageAs" = "3:1"
402+
"Register" = "3:1"
403+
"Exclude" = "11:FALSE"
404+
"IsDependency" = "11:TRUE"
405+
"IsolateTo" = "8:"
406+
}
346407
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_1F74B0599190E145B7F7B7B20B8672DD"
347408
{
348409
"AssemblyRegister" = "3:1"
@@ -518,6 +579,37 @@
518579
"IsDependency" = "11:TRUE"
519580
"IsolateTo" = "8:"
520581
}
582+
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_9A82C0B7965D1ACDB804E0657D2A59BF"
583+
{
584+
"AssemblyRegister" = "3:1"
585+
"AssemblyIsInGAC" = "11:FALSE"
586+
"AssemblyAsmDisplayName" = "8:Octokit, Version=0.28.0.0, Culture=neutral, processorArchitecture=MSIL"
587+
"ScatterAssemblies"
588+
{
589+
"_9A82C0B7965D1ACDB804E0657D2A59BF"
590+
{
591+
"Name" = "8:Octokit.dll"
592+
"Attributes" = "3:512"
593+
}
594+
}
595+
"SourcePath" = "8:Octokit.dll"
596+
"TargetName" = "8:"
597+
"Tag" = "8:"
598+
"Folder" = "8:_01770CE3905B4B09AB8A1EA22D21FBA8"
599+
"Condition" = "8:"
600+
"Transitive" = "11:FALSE"
601+
"Vital" = "11:TRUE"
602+
"ReadOnly" = "11:FALSE"
603+
"Hidden" = "11:FALSE"
604+
"System" = "11:FALSE"
605+
"Permanent" = "11:FALSE"
606+
"SharedLegacy" = "11:FALSE"
607+
"PackageAs" = "3:1"
608+
"Register" = "3:1"
609+
"Exclude" = "11:FALSE"
610+
"IsDependency" = "11:TRUE"
611+
"IsolateTo" = "8:"
612+
}
521613
"{9F6F8455-1EF1-4B85-886A-4223BCC8E7F7}:_A2EDB9640B6B5FC2DD6F80B35114528C"
522614
{
523615
"AssemblyRegister" = "3:1"
@@ -729,15 +821,15 @@
729821
{
730822
"Name" = "8:Microsoft Visual Studio"
731823
"ProductName" = "8:PcVolumeControl"
732-
"ProductCode" = "8:{7F4352D8-7375-4CDF-B627-8F7AD43C8BBE}"
733-
"PackageCode" = "8:{C45DB8C7-AF4A-47B7-BE22-245424FBDD0A}"
824+
"ProductCode" = "8:{D0800FCB-CCFA-4C03-A1CD-3A0329390134}"
825+
"PackageCode" = "8:{927DBF0E-0F8B-45BA-994E-1839BCA313CB}"
734826
"UpgradeCode" = "8:{C2B40E46-86B1-4406-9587-5159C50DBA6A}"
735827
"AspNetVersion" = "8:4.0.30319.0"
736828
"RestartWWWService" = "11:FALSE"
737829
"RemovePreviousVersions" = "11:TRUE"
738830
"DetectNewerInstalledVersion" = "11:TRUE"
739831
"InstallAllUsers" = "11:FALSE"
740-
"ProductVersion" = "8:1.0.3"
832+
"ProductVersion" = "8:7.0"
741833
"Manufacturer" = "8:Dark Rock Studios"
742834
"ARPHELPTELEPHONE" = "8:False"
743835
"ARPHELPLINK" = "8:https://github.com/PcVolumeControl"
@@ -1279,7 +1371,7 @@
12791371
{
12801372
"{5259A561-127C-4D43-A0A1-72F10C7B3BF8}:_96D278E201924D8F8D019951CA3956C1"
12811373
{
1282-
"SourcePath" = "8:..\\VolumeControl\\obj\\Debug\\PcVolumeControl.exe"
1374+
"SourcePath" = "8:..\\VolumeControl\\obj\\Release\\PcVolumeControl.exe"
12831375
"TargetName" = "8:"
12841376
"Tag" = "8:"
12851377
"Folder" = "8:_01770CE3905B4B09AB8A1EA22D21FBA8"

‎VolumeControl/App.xaml.cs‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,8 +23,8 @@ namespace VolumeControl
2323
/// </summary>
2424
public partial class App : Application, ClientListener
2525
{
26-
public static string APP_VERSION = "v7";
27-
public static int PROTOCOL_VERSION = 6;
26+
public static string APPLICATION_VERSION = "v7";
27+
public static int PROTOCOL_VERSION = 7;
2828

2929
private static Object m_lock = new Object();
3030
private static Mutex s_mutex = null;
@@ -342,7 +342,7 @@ public void onClientMessage(string message, TcpClient tcpClient)
342342
Console.WriteLine("client message: " + message);
343343
var pcAudio = JsonConvert.DeserializeObject<PcAudio>(message, m_jsonsettings);
344344

345-
if (PROTOCOL_VERSION == pcAudio.version)
345+
if (PROTOCOL_VERSION == pcAudio.protocolVersion)
346346
{
347347
updateState(pcAudio);
348348
}
@@ -370,7 +370,8 @@ private bool updateState(PcAudio audioUpdate)
370370
try
371371
{
372372
PcAudio audioState = new PcAudio();
373-
audioState.version = PROTOCOL_VERSION;
373+
audioState.protocolVersion = PROTOCOL_VERSION;
374+
audioState.applicationVersion = APPLICATION_VERSION;
374375

375376
cleanUpSessionKeepers();
376377

‎VolumeControl/AudioData.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ namespace VolumeControl
44
{
55
class PcAudio
66
{
7-
public int version;
7+
public int protocolVersion;
8+
public string applicationVersion;
89
public Dictionary<string,string> deviceIds = new Dictionary<string,string>();
910
public AudioDevice defaultDevice;
1011
}

‎VolumeControl/MainWindow.xaml.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public MainWindow()
2222
InitializeComponent();
2323

2424
version_view_protocol.Content = "protocol v" + App.PROTOCOL_VERSION;
25-
version_view_app.Content = "application v" + App.APP_VERSION;
25+
version_view_app.Content = "application " + App.APPLICATION_VERSION;
2626

2727
string ipAddress = App.GetLocalIPAddress();
2828
server_ip.Content = ipAddress;

‎VolumeControl/PcVolumeControl.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
<Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
66
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
77
<ProjectGuid>{C4184892-C6A9-41DD-89FD-9677A806C900}</ProjectGuid>
8-
<OutputType>Exe</OutputType>
8+
<OutputType>WinExe</OutputType>
99
<AppDesignerFolder>Properties</AppDesignerFolder>
1010
<RootNamespace>VolumeControl</RootNamespace>
1111
<AssemblyName>PcVolumeControl</AssemblyName>
@@ -29,7 +29,7 @@
2929
<ProductName>PcVolumeControl</ProductName>
3030
<PublisherName>Dark Rock Studios</PublisherName>
3131
<ApplicationRevision>0</ApplicationRevision>
32-
<ApplicationVersion>1.0.0.%2a</ApplicationVersion>
32+
<ApplicationVersion>7.0.0.%2a</ApplicationVersion>
3333
<UseApplicationTrust>false</UseApplicationTrust>
3434
<BootstrapperEnabled>true</BootstrapperEnabled>
3535
</PropertyGroup>

‎VolumeControl/PcVolumeControlUtils.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ public static async void checkVersion()
2828
{
2929
var latest = await getLatestVersion();
3030

31-
if (!latest.Name.Equals(App.APP_VERSION, StringComparison.Ordinal))
31+
if (!latest.Name.Equals(App.APPLICATION_VERSION, StringComparison.Ordinal))
3232
{
33-
MessageBox.Show("New version avalible:\nLatest: " + latest.Name + "\nCurrent: " + App.APP_VERSION + "\n\nPlease download the latest version.", "PcVolumeControl", MessageBoxButton.OK, MessageBoxImage.Information);
33+
MessageBox.Show("New version avalible:\nLatest: " + latest.Name + "\nCurrent: " + App.APPLICATION_VERSION + "\n\nPlease download the latest version.", "PcVolumeControl", MessageBoxButton.OK, MessageBoxImage.Information);
3434
}
3535
}
3636
catch (Octokit.RateLimitExceededException e)

0 commit comments

Comments
 (0)