From: <sv...@op...> - 2024-09-19 14:10:51
|
Author: sagamusix Date: Thu Sep 19 16:10:38 2024 New Revision: 21628 URL: https://source.openmpt.org/browse/openmpt/?op=revision&rev=21628 Log: Merged revision(s) 21574 from trunk/OpenMPT: [Mod] Add FST to list of recognized file extensions. AMP uses this extension for multichannel MODs. Patch partially by cs127, https://github.com/OpenMPT/openmpt/pull/22 ........ Modified: branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch-retro.iss branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch.iss branches/OpenMPT-1.31/installer/filetypes-multi-arch-retro.iss branches/OpenMPT-1.31/installer/filetypes-multi-arch.iss branches/OpenMPT-1.31/soundlib/Tables.cpp Modified: branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch-retro.iss ============================================================================== --- branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch-retro.iss Thu Sep 19 16:01:47 2024 (r21627) +++ branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch-retro.iss Thu Sep 19 16:10:38 2024 (r21628) @@ -59,6 +59,7 @@ Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".dtm"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".far"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fmt"; ValueData: {#OpenMPTFile}; Components: {#Component} +Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fst"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gdm"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gtk"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gt2"; ValueData: {#OpenMPTFile}; Components: {#Component} Modified: branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch.iss ============================================================================== --- branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch.iss Thu Sep 19 16:01:47 2024 (r21627) +++ branches/OpenMPT-1.31/installer/filetypes-multi-arch-per-arch.iss Thu Sep 19 16:10:38 2024 (r21628) @@ -59,6 +59,7 @@ Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".dtm"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".far"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fmt"; ValueData: {#OpenMPTFile}; Components: {#Component} +Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".fst"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gdm"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gtk"; ValueData: {#OpenMPTFile}; Components: {#Component} Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssociations"; ValueType: string; ValueName: ".gt2"; ValueData: {#OpenMPTFile}; Components: {#Component} Modified: branches/OpenMPT-1.31/installer/filetypes-multi-arch-retro.iss ============================================================================== --- branches/OpenMPT-1.31/installer/filetypes-multi-arch-retro.iss Thu Sep 19 16:01:47 2024 (r21627) +++ branches/OpenMPT-1.31/installer/filetypes-multi-arch-retro.iss Thu Sep 19 16:10:38 2024 (r21628) @@ -34,6 +34,7 @@ Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".dtm"; ValueData: "" Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".far"; ValueData: "" Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fmt"; ValueData: "" +Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fst"; ValueData: "" Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gdm"; ValueData: "" Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gtk"; ValueData: "" Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gt2"; ValueData: "" Modified: branches/OpenMPT-1.31/installer/filetypes-multi-arch.iss ============================================================================== --- branches/OpenMPT-1.31/installer/filetypes-multi-arch.iss Thu Sep 19 16:01:47 2024 (r21627) +++ branches/OpenMPT-1.31/installer/filetypes-multi-arch.iss Thu Sep 19 16:10:38 2024 (r21628) @@ -34,6 +34,7 @@ Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".dtm"; ValueData: "" Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".far"; ValueData: "" Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fmt"; ValueData: "" +Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".fst"; ValueData: "" Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gdm"; ValueData: "" Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gtk"; ValueData: "" Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; ValueType: string; ValueName: ".gt2"; ValueData: "" Modified: branches/OpenMPT-1.31/soundlib/Tables.cpp ============================================================================== --- branches/OpenMPT-1.31/soundlib/Tables.cpp Thu Sep 19 16:01:47 2024 (r21627) +++ branches/OpenMPT-1.31/soundlib/Tables.cpp Thu Sep 19 16:10:38 2024 (r21628) @@ -72,6 +72,7 @@ { UL_("Digital Tracker"), "dtm" }, { UL_("Farandole Composer"), "far" }, { UL_("FM Tracker"), "fmt" }, + { UL_("ProTracker"), "fst" }, { UL_("Imago Orpheus"), "imf" }, { UL_("Ice Tracker"), "ice" }, #ifdef MPT_EXTERNAL_SAMPLES |