Skip to content

Commit

Permalink
*fixed issue with text directive where it was not possible to embed q…
Browse files Browse the repository at this point in the history
…uotation marks. surrounding quotes are now optional, and quotes within the text may be specified using either " or \"

*updated copyright year 2024
*version 2.0.1.0
  • Loading branch information
bahstrike committed Feb 21, 2024
1 parent 75e1631 commit 6ae5faa
Show file tree
Hide file tree
Showing 10 changed files with 20 additions and 12 deletions.
6 changes: 3 additions & 3 deletions ACACommon/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ACAudio")]
[assembly: AssemblyCopyright("Copyright © Bad Ass Hackers 2022")]
[assembly: AssemblyCopyright("Copyright © Bad Ass Hackers 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyVersion("2.0.1.0")]
[assembly: AssemblyFileVersion("2.0.1.0")]
6 changes: 3 additions & 3 deletions ACAVCServer/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ACAudio")]
[assembly: AssemblyCopyright("Copyright © Bad Ass Hackers 2022")]
[assembly: AssemblyCopyright("Copyright © Bad Ass Hackers 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyVersion("2.0.1.0")]
[assembly: AssemblyFileVersion("2.0.1.0")]
10 changes: 9 additions & 1 deletion ACAudio/Config.cs
Original file line number Diff line number Diff line change
Expand Up @@ -677,7 +677,15 @@ private static void _Load(string filename)

case "text":
{
string txt = content.Replace("\"", "");
string txt = content;

// if there are a beginning and ending quote, remove them
if (txt.StartsWith("\"") && content.EndsWith("\""))
txt = txt.Substring(1, txt.Length - 2);


// if anyone embedded a \" then replace with "
txt = txt.Replace("\\\"", "\"");

#if DEBUG
Log($"adding text source: {txt}");
Expand Down
6 changes: 3 additions & 3 deletions ACAudio/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@
[assembly: AssemblyConfiguration("")]
[assembly: AssemblyCompany("")]
[assembly: AssemblyProduct("ACAudio")]
[assembly: AssemblyCopyright("Copyright © Bad Ass Hackers 2022")]
[assembly: AssemblyCopyright("Copyright © Bad Ass Hackers 2024")]
[assembly: AssemblyTrademark("")]
[assembly: AssemblyCulture("")]

Expand All @@ -32,5 +32,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("2.0.0.0")]
[assembly: AssemblyFileVersion("2.0.0.0")]
[assembly: AssemblyVersion("2.0.1.0")]
[assembly: AssemblyFileVersion("2.0.1.0")]
Binary file modified DEPLOY_ACAUDIO/ACACommon.dll
Binary file not shown.
Binary file modified DEPLOY_ACAUDIO/ACAudio.dll
Binary file not shown.
Binary file modified DEPLOY_ACAVCSERVER/ACACommon.dll
Binary file not shown.
Binary file modified DEPLOY_ACAVCSERVER/ACAVCServer.dll
Binary file not shown.
2 changes: 1 addition & 1 deletion Install_ACAVCServer.nsi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; Define your application name
!define APPNAME "ACAVCServer"
!define SOFTWARECOMPANY "Bad Ass Hackers"
!define VERSION "2.0.0.0"
!define VERSION "2.0.1.0"
!define APPGUID "{3a47b37f-c57b-4560-bc17-1bc2fa995388}"

!define ASSEMBLY "ACAVCServer.dll"
Expand Down
2 changes: 1 addition & 1 deletion Install_ACAudio.nsi
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
; Define your application name
!define APPNAME "ACAudio"
!define SOFTWARECOMPANY "Bad Ass Hackers"
!define VERSION "2.0.0.0"
!define VERSION "2.0.1.0"
!define APPGUID "{dccf58a6-a37a-4fea-adcc-488ce2d51883}"

!define ASSEMBLY "ACAudio.dll"
Expand Down

0 comments on commit 6ae5faa

Please sign in to comment.