Skip to content

Commit

Permalink
Merge pull request #137 from fxsound2/dev
Browse files Browse the repository at this point in the history 
version 1.1.24.0 changes
  • Loading branch information
@bvijay74
bvijay74 authored Jul 8, 2024
2 parents e9bd4c3 + 872df79 commit a162071
Show file tree
Hide file tree
Showing 8 changed files with 33 additions and 38 deletions.
28 changes: 13 additions & 15 deletions Installer/fxsound.aip
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,11 @@
<ROW Property="MSIFASTINSTALL" MultiBuildValue="DefaultBuild:2"/>
<ROW Property="Manufacturer" Value="FxSound LLC"/>
<ROW Property="MsiLogging" MultiBuildValue="DefaultBuild:vp"/>
<ROW Property="ProductCode" Value="1033:{ECAF712E-B39B-4FF8-B4FB-48B2E2FC88BD} " Type="16"/>
<ROW Property="ProductCode" Value="1033:{E38B16E4-60BC-4327-B5EC-ADB16370C9CC} " Type="16"/>
<ROW Property="ProductLanguage" Value="1033"/>
<ROW Property="ProductName" Value="FxSound"/>
<ROW Property="ProductName_32" Value="[|ProductName]"/>
<ROW Property="ProductVersion" Value="1.1.22.0" Options="16"/>
<ROW Property="ProductVersion" Value="1.1.24.0" Options="16"/>
<ROW Property="REBOOT" MultiBuildValue="DefaultBuild:Suppress"/>
<ROW Property="RUNAPPLICATION" Value="1" Type="4"/>
<ROW Property="SecureCustomProperties" Value="OLDPRODUCTS;AI_NEWERPRODUCTFOUND;AI_SETUPEXEPATH;SETUPEXEDIR"/>
Expand Down Expand Up @@ -76,11 +76,10 @@
<ROW Component="Default.fac" ComponentId="{F5A2B0DB-CB99-4992-B717-1F1AE09C0996}" Directory_="Factsoft_Dir" Attributes="0" KeyPath="Default.fac" Type="0"/>
<ROW Component="DfxInstall.dll" ComponentId="{4B4A298D-1A3A-448C-AF9A-692D7EAFC327}" Directory_="Apps_Dir" Attributes="0" KeyPath="DfxInstall.dll"/>
<ROW Component="DfxSetupDrv.exe" ComponentId="{E6F40D13-6200-4931-A7A2-6142F7821778}" Directory_="Apps_Dir" Attributes="0" KeyPath="DfxSetupDrv.exe"/>
<ROW Component="Fonts" ComponentId="{0A343273-3DDC-4B4A-B36C-610FD174FD0A}" Directory_="APPDIR" Attributes="0"/>
<ROW Component="Fonts" ComponentId="{A2EF6825-EECB-4179-8F5E-78090FB01E63}" Directory_="APPDIR" Attributes="0" Type="0"/>
<ROW Component="FxSound.exe" ComponentId="{82E872A6-8D59-4785-92C3-8BBFF79EB0E4}" Directory_="APPDIR" Attributes="256" Condition="VersionNT64" KeyPath="FxSound.exe"/>
<ROW Component="FxSound.exe_2" ComponentId="{0ABA4B50-FBDF-43EE-9C5B-A5F296F063CB}" Directory_="x86_Dir" Attributes="0" Condition="NOT VersionNT64" KeyPath="FxSound.exe_2"/>
<ROW Component="FxSound.settings" ComponentId="{F8459A73-F385-4ED6-809A-50204A74B04F}" Directory_="FxSound_Dir" Attributes="0" KeyPath="FxSound.settings" Type="0"/>
<ROW Component="NotoSansThaiMedium.ttf" ComponentId="{A2EF6825-EECB-4179-8F5E-78090FB01E63}" Directory_="APPDIR" Attributes="0" Type="0"/>
<ROW Component="Path" ComponentId="{19CFBC28-C762-407F-9344-86A957870300}" Directory_="APPDIR" Attributes="260" Condition="VersionNT64" KeyPath="Path"/>
<ROW Component="Path_32" ComponentId="{9BF41759-B09E-4CA3-B63B-7A8FAD49A847}" Directory_="APPDIR" Attributes="4" Condition="NOT VersionNT64" KeyPath="Path_1"/>
<ROW Component="ProductInformation" ComponentId="{8CD532CB-F65E-4D43-B32A-4D0DA210189B}" Directory_="APPDIR" Attributes="260" Condition="VersionNT64" KeyPath="Version"/>
Expand Down Expand Up @@ -157,15 +156,15 @@
<ROW File="NotoSansSCBold.otf" Component_="Fonts" FileName="NOTOSA~4.OTF|NotoSansSC-Bold.otf" Attributes="0" SourcePath="Resources\Fonts\NotoSansSC-Bold.otf" SelfReg="false"/>
<ROW File="NotoSansSCMedium.otf" Component_="Fonts" FileName="NOTOSA~5.OTF|NotoSansSC-Medium.otf" Attributes="0" SourcePath="Resources\Fonts\NotoSansSC-Medium.otf" SelfReg="false"/>
<ROW File="NotoSansSCRegular.otf" Component_="Fonts" FileName="NOTOSA~6.OTF|NotoSansSC-Regular.otf" Attributes="0" SourcePath="Resources\Fonts\NotoSansSC-Regular.otf" SelfReg="false"/>
<ROW File="NotoSansThaiMedium.ttf" Component_="NotoSansThaiMedium.ttf" FileName="NOTOSA~1.TTF|NotoSansThai-Medium.ttf" Attributes="0" SourcePath="Resources\Fonts\NotoSansThai-Medium.ttf" SelfReg="false"/>
<ROW File="NotoSansThaiRegular.ttf" Component_="NotoSansThaiMedium.ttf" FileName="NOTOSA~2.TTF|NotoSansThai-Regular.ttf" Attributes="0" SourcePath="Resources\Fonts\NotoSansThai-Regular.ttf" SelfReg="false"/>
<ROW File="NotoSansThaiMedium.ttf" Component_="Fonts" FileName="NOTOSA~1.TTF|NotoSansThai-Medium.ttf" Attributes="0" SourcePath="Resources\Fonts\NotoSansThai-Medium.ttf" SelfReg="false"/>
<ROW File="NotoSansThaiRegular.ttf" Component_="Fonts" FileName="NOTOSA~2.TTF|NotoSansThai-Regular.ttf" Attributes="0" SourcePath="Resources\Fonts\NotoSansThai-Regular.ttf" SelfReg="false"/>
<ROW File="Default.fac" Component_="Default.fac" FileName="Default.fac" Version="65535.65535.65535.65535" Attributes="0" SourcePath="Resources\Factsoft\Default.fac" SelfReg="false"/>
<ROW File="NotoSansJPBold.ttf" Component_="NotoSansThaiMedium.ttf" FileName="NOTOSA~6.TTF|NotoSansJP-Bold.ttf" Attributes="0" SourcePath="Resources\Fonts\NotoSansJP-Bold.ttf" SelfReg="false"/>
<ROW File="NotoSansJPMedium.ttf" Component_="NotoSansThaiMedium.ttf" FileName="NOTOSA~7.TTF|NotoSansJP-Medium.ttf" Attributes="0" SourcePath="Resources\Fonts\NotoSansJP-Medium.ttf" SelfReg="false"/>
<ROW File="NotoSansJPRegular.ttf" Component_="NotoSansThaiMedium.ttf" FileName="NOTOSA~8.TTF|NotoSansJP-Regular.ttf" Attributes="0" SourcePath="Resources\Fonts\NotoSansJP-Regular.ttf" SelfReg="false"/>
<ROW File="IBMPlexSansArabicBold.ttf" Component_="NotoSansThaiMedium.ttf" FileName="IBMPLE~1.TTF|IBMPlexSansArabic-Bold.ttf" Attributes="0" SourcePath="Resources\Fonts\IBMPlexSansArabic-Bold.ttf" SelfReg="false"/>
<ROW File="IBMPlexSansArabicMedium.ttf" Component_="NotoSansThaiMedium.ttf" FileName="IBMPLE~2.TTF|IBMPlexSansArabic-Medium.ttf" Attributes="0" SourcePath="Resources\Fonts\IBMPlexSansArabic-Medium.ttf" SelfReg="false"/>
<ROW File="IBMPlexSansArabicRegular.ttf" Component_="NotoSansThaiMedium.ttf" FileName="IBMPLE~3.TTF|IBMPlexSansArabic-Regular.ttf" Attributes="0" SourcePath="Resources\Fonts\IBMPlexSansArabic-Regular.ttf" SelfReg="false"/>
<ROW File="NotoSansJPBold.ttf" Component_="Fonts" FileName="NOTOSA~6.TTF|NotoSansJP-Bold.ttf" Attributes="0" SourcePath="Resources\Fonts\NotoSansJP-Bold.ttf" SelfReg="false"/>
<ROW File="NotoSansJPMedium.ttf" Component_="Fonts" FileName="NOTOSA~7.TTF|NotoSansJP-Medium.ttf" Attributes="0" SourcePath="Resources\Fonts\NotoSansJP-Medium.ttf" SelfReg="false"/>
<ROW File="NotoSansJPRegular.ttf" Component_="Fonts" FileName="NOTOSA~8.TTF|NotoSansJP-Regular.ttf" Attributes="0" SourcePath="Resources\Fonts\NotoSansJP-Regular.ttf" SelfReg="false"/>
<ROW File="IBMPlexSansArabicBold.ttf" Component_="Fonts" FileName="IBMPLE~1.TTF|IBMPlexSansArabic-Bold.ttf" Attributes="0" SourcePath="Resources\Fonts\IBMPlexSansArabic-Bold.ttf" SelfReg="false"/>
<ROW File="IBMPlexSansArabicMedium.ttf" Component_="Fonts" FileName="IBMPLE~2.TTF|IBMPlexSansArabic-Medium.ttf" Attributes="0" SourcePath="Resources\Fonts\IBMPlexSansArabic-Medium.ttf" SelfReg="false"/>
<ROW File="IBMPlexSansArabicRegular.ttf" Component_="Fonts" FileName="IBMPLE~3.TTF|IBMPlexSansArabic-Regular.ttf" Attributes="0" SourcePath="Resources\Fonts\IBMPlexSansArabic-Regular.ttf" SelfReg="false"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.BootstrOptComponent">
<ROW BootstrOptKey="GlobalOptions" GeneralOptions="b" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites" Options="2"/>
Expand All @@ -178,7 +177,7 @@
<ROW Path="&lt;AI_DICTS&gt;ui_en.ail"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.DigCertStoreComponent">
<ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" SignDelay="500" UseSha256="1" Thumbprint="913a9cb96d6560245dec2055995cef6441ea4b9f Subject: FxSound, LLC&#10;Issuer: DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1&#10;Valid from 05/09/2023 to 05/09/2024&#10;User\MY" Subject="CN=&quot;FxSound, LLC&quot;, O=&quot;FxSound, LLC&quot;, L=Mill Valley, S=California, C=US, SERIALNUMBER=201721910237, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.2=California, OID.1.3.6.1.4.1.311.60.2.1.3=US"/>
<ROW TimeStampUrl="http://timestamp.digicert.com" SignerDescription="[|ProductName]" SignOptions="7" SignTool="0" SignDelay="500" UseSha256="1" Thumbprint="4bfe2feb31d00b184e85a59e1f2b77b7f3443852 Subject: FxSound, LLC&#10;Issuer: DigiCert Trusted G4 Code Signing RSA4096 SHA384 2021 CA1&#10;Valid from 07/05/2024 to 05/08/2025&#10;User\MY" Subject="CN=&quot;FxSound, LLC&quot;, O=&quot;FxSound, LLC&quot;, L=Mill Valley, S=California, C=US, SERIALNUMBER=201721910237, OID.2.5.4.15=Private Organization, OID.1.3.6.1.4.1.311.60.2.1.2=California, OID.1.3.6.1.4.1.311.60.2.1.3=US"/>
</COMPONENT>
<COMPONENT cid="caphyon.advinst.msicomp.DynamicPropertyComponent">
<ROW Property="ProductVersion" Type="2" SourcePath="FxSound.exe"/>
Expand Down Expand Up @@ -328,8 +327,7 @@
<ROW Feature_="AIOtherFiles" Component_="fxvad.inf"/>
<ROW Feature_="AIOtherFiles" Component_="fxvad.inf_1"/>
<ROW Feature_="AIOtherFiles" Component_="fac"/>
<ROW Feature_="AI64BitFiles" Component_="Fonts"/>
<ROW Feature_="AIOtherFiles" Component_="NotoSansThaiMedium.ttf"/>
<ROW Feature_="AIOtherFiles" Component_="Fonts"/>
<ROW Feature_="AIOtherFiles" Component_="Default.fac"/>
<ROW Feature_="AI32BitFiles" Component_="x86"/>
</COMPONENT>
Expand Down
2 changes: 1 addition & 1 deletion fxsound/FxSound.jucer
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>

<JUCERPROJECT id="F3FTdD" name="FxSound" projectType="guiapp" version="1.1.23.0"
<JUCERPROJECT id="F3FTdD" name="FxSound" projectType="guiapp" version="1.1.24.0"
displaySplashScreen="1" jucerFormatVersion="1" companyName="FxSound LLC"
companyWebsite="https://www.fxsound.com" companyCopyright="2024 FxSound&#8482;"
defines="UNICODE" postExportShellCommandWin="type %%1%%\Project\status_icons.rc &gt;&gt; %%1%%\Project\resources.rc">
Expand Down
16 changes: 8 additions & 8 deletions fxsound/JuceLibraryCode/BinaryData.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7871,13 +7871,13 @@ static const unsigned char temp_binary_data_55[] =
157,229,173,152,230,150,176,233,162,132,232,174,190,227,128,129,232,166,134,231,155,150,230,151,167,233,162,132,232,174,190,230,136,150,233,135,141,231,189,174,230,130,168,231,154,132,232,174,190,231,189,174,227,128,130,34,13,10,34,83,101,116,116,105,
110,103,115,32,102,105,108,101,32,110,111,116,32,102,111,117,110,100,33,34,32,61,32,34,230,156,170,230,137,190,229,136,176,232,174,190,231,189,174,230,150,135,228,187,182,239,188,129,34,13,10,34,70,120,83,111,117,110,100,32,105,115,32,110,111,119,32,
111,112,101,110,45,115,111,117,114,99,101,34,32,61,32,34,70,120,83,111,117,110,100,32,231,142,176,229,183,178,229,188,128,230,186,144,34,13,10,34,80,114,101,115,115,32,67,116,114,108,32,43,32,65,108,116,47,83,104,105,102,116,32,43,32,48,45,57,47,65,45,
90,32,116,111,32,99,104,97,110,103,101,32,116,104,101,32,104,111,116,107,101,121,34,32,61,32,226,128,156,230,140,137,32,67,116,114,108,32,43,32,65,108,116,47,83,104,105,102,116,32,43,32,48,45,57,47,65,45,90,32,230,155,180,230,148,185,231,131,173,233,
148,174,226,128,157,13,10,34,70,120,83,111,117,110,100,32,100,111,101,115,32,110,111,116,32,115,117,112,112,111,114,116,32,109,111,110,111,32,100,101,118,105,99,101,115,44,32,115,111,32,70,120,83,111,117,110,100,32,112,114,111,99,101,115,115,105,110,
103,32,104,97,100,32,98,101,101,110,32,100,105,115,97,98,108,101,100,32,102,111,114,32,116,104,105,115,32,100,101,118,105,99,101,46,34,32,61,32,226,128,156,70,120,83,111,117,110,100,32,228,184,141,230,148,175,230,140,129,229,141,149,229,163,176,233,129,
147,232,174,190,229,164,135,239,188,140,229,155,160,230,173,164,229,183,178,231,166,129,231,148,168,230,173,164,232,174,190,229,164,135,231,154,132,32,70,120,83,111,117,110,100,32,229,164,132,231,144,134,227,128,130,226,128,157,13,10,34,77,105,110,105,
109,105,122,101,32,66,117,116,116,111,110,34,32,61,32,226,128,156,230,156,128,229,176,143,229,140,150,230,140,137,233,146,174,226,128,157,13,10,34,79,117,116,112,117,116,32,100,101,118,105,99,101,34,32,61,32,226,128,156,232,190,147,229,135,186,232,174,
190,229,164,135,226,128,157,13,10,34,83,101,108,101,99,116,32,112,114,101,102,101,114,114,101,100,32,111,117,116,112,117,116,34,32,61,32,226,128,156,233,128,137,230,139,169,233,166,150,233,128,137,232,190,147,229,135,186,226,128,157,13,10,34,80,114,101,
102,101,114,114,101,100,32,111,117,116,112,117,116,58,34,32,61,32,226,128,156,233,166,150,233,128,137,232,190,147,229,135,186,239,188,154,226,128,157,13,10,34,78,111,110,101,34,32,61,32,226,128,156,230,151,160,226,128,157,13,10,0,0 };
90,32,116,111,32,99,104,97,110,103,101,32,116,104,101,32,104,111,116,107,101,121,34,32,61,32,34,230,140,137,32,67,116,114,108,32,43,32,65,108,116,47,83,104,105,102,116,32,43,32,48,45,57,47,65,45,90,32,230,155,180,230,148,185,231,131,173,233,148,174,34,
13,10,34,70,120,83,111,117,110,100,32,100,111,101,115,32,110,111,116,32,115,117,112,112,111,114,116,32,109,111,110,111,32,100,101,118,105,99,101,115,44,32,115,111,32,70,120,83,111,117,110,100,32,112,114,111,99,101,115,115,105,110,103,32,104,97,100,32,
98,101,101,110,32,100,105,115,97,98,108,101,100,32,102,111,114,32,116,104,105,115,32,100,101,118,105,99,101,46,34,32,61,32,34,70,120,83,111,117,110,100,32,228,184,141,230,148,175,230,140,129,229,141,149,229,163,176,233,129,147,232,174,190,229,164,135,
239,188,140,229,155,160,230,173,164,229,183,178,231,166,129,231,148,168,230,173,164,232,174,190,229,164,135,231,154,132,32,70,120,83,111,117,110,100,32,229,164,132,231,144,134,227,128,130,34,13,10,34,77,105,110,105,109,105,122,101,32,66,117,116,116,111,
110,34,32,61,32,34,230,156,128,229,176,143,229,140,150,230,140,137,233,146,174,34,13,10,34,79,117,116,112,117,116,32,100,101,118,105,99,101,34,32,61,32,34,232,190,147,229,135,186,232,174,190,229,164,135,34,13,10,34,83,101,108,101,99,116,32,112,114,101,
102,101,114,114,101,100,32,111,117,116,112,117,116,34,32,61,32,34,233,128,137,230,139,169,233,166,150,233,128,137,232,190,147,229,135,186,34,13,10,34,80,114,101,102,101,114,114,101,100,32,111,117,116,112,117,116,58,34,32,61,32,34,233,166,150,233,128,
137,232,190,147,229,135,186,239,188,154,34,13,10,34,78,111,110,101,34,32,61,32,34,230,151,160,34,13,10,0,0 };

const char* FxSound_zhCN_txt = (const char*) temp_binary_data_55;

Expand Down Expand Up @@ -7948,7 +7948,7 @@ const char* getNamedResource (const char* resourceNameUTF8, int& numBytes)
case 0xfa95c871: numBytes = 10691; return FxSound_tr_txt;
case 0x4464a26e: numBytes = 9890; return FxSound_txt;
case 0xfd80a626: numBytes = 11704; return FxSound_vi_txt;
case 0xd8a3b00c: numBytes = 9351; return FxSound_zhCN_txt;
case 0xd8a3b00c: numBytes = 9323; return FxSound_zhCN_txt;
default: break;
}

Expand Down
2 changes: 1 addition & 1 deletion fxsound/JuceLibraryCode/BinaryData.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ namespace BinaryData
const int FxSound_vi_txtSize = 11704;

extern const char* FxSound_zhCN_txt;
const int FxSound_zhCN_txtSize = 9351;
const int FxSound_zhCN_txtSize = 9323;

// Number of elements in the namedResourceList and originalFileNames arrays.
const int namedResourceListSize = 56;
Expand Down
4 changes: 2 additions & 2 deletions fxsound/JuceLibraryCode/JuceHeader.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ namespace ProjectInfo
{
const char* const projectName = "FxSound";
const char* const companyName = "FxSound LLC";
const char* const versionString = "1.1.23.0";
const int versionNumber = 0x1011700;
const char* const versionString = "1.1.24.0";
const int versionNumber = 0x1011800;
}
#endif
5 changes: 1 addition & 4 deletions fxsound/Project/FxSound.sln
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@

Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.6.33712.159
VisualStudioVersion = 17.10.35013.160
MinimumVisualStudioVersion = 10.0.40219.1
Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FxSound_App", "FxSound_App.vcxproj", "{7A8BC8D1-8FA6-3204-17E8-DA0BF486BB4E}"
EndProject
Expand Down Expand Up @@ -59,7 +59,4 @@ Global
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {BB73392D-E0FB-4DD8-B1C8-21ACD51D8CB6}
EndGlobalSection
EndGlobal
Loading

0 comments on commit a162071

Please sign in to comment.