From 4878ce3c25ccce46dae6224d14c63c01bd34204b Mon Sep 17 00:00:00 2001 From: Johannes Schultz Date: Thu, 19 Sep 2024 14:10:38 +0000 Subject: [PATCH] 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 ........ git-svn-id: https://source.openmpt.org/svn/openmpt/branches/OpenMPT-1.31@21628 56274372-70c3-4bfc-bfc3-4c3a0b034d27 --- installer/filetypes-multi-arch-per-arch-retro.iss | 1 + installer/filetypes-multi-arch-per-arch.iss | 1 + installer/filetypes-multi-arch-retro.iss | 1 + installer/filetypes-multi-arch.iss | 1 + soundlib/Tables.cpp | 1 + 5 files changed, 5 insertions(+) diff --git a/installer/filetypes-multi-arch-per-arch-retro.iss b/installer/filetypes-multi-arch-per-arch-retro.iss index dbf399f76d7..5d64710c13b 100644 --- a/installer/filetypes-multi-arch-per-arch-retro.iss +++ b/installer/filetypes-multi-arch-per-arch-retro.iss @@ -59,6 +59,7 @@ Root: HKLM; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAsso 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} diff --git a/installer/filetypes-multi-arch-per-arch.iss b/installer/filetypes-multi-arch-per-arch.iss index 4509afb0d12..3fec6075bde 100644 --- a/installer/filetypes-multi-arch-per-arch.iss +++ b/installer/filetypes-multi-arch-per-arch.iss @@ -59,6 +59,7 @@ Root: HKA; Subkey: "SOFTWARE\Clients\Media\{#OpenMPTarch}\Capabilities\FileAssoc 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} diff --git a/installer/filetypes-multi-arch-retro.iss b/installer/filetypes-multi-arch-retro.iss index cae579f32ac..29a02d8bd9f 100644 --- a/installer/filetypes-multi-arch-retro.iss +++ b/installer/filetypes-multi-arch-retro.iss @@ -34,6 +34,7 @@ Root: HKLM; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; 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: "" diff --git a/installer/filetypes-multi-arch.iss b/installer/filetypes-multi-arch.iss index d4637b56662..bdcede27211 100644 --- a/installer/filetypes-multi-arch.iss +++ b/installer/filetypes-multi-arch.iss @@ -34,6 +34,7 @@ Root: HKA; Subkey: "SOFTWARE\Classes\Applications\OpenMPT.exe\SupportedTypes"; V 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: "" diff --git a/soundlib/Tables.cpp b/soundlib/Tables.cpp index d1d1d470c3d..d8110f4e678 100644 --- a/soundlib/Tables.cpp +++ b/soundlib/Tables.cpp @@ -72,6 +72,7 @@ static constexpr ModFormatInfo modFormatInfo[] = { 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