export sound channel count matched to sound flags. fix bigfile_extens…

…ions const
widberg · Oct 10, 2023 · f910397 · f910397
1 parent 2aaf08d
commit f910397
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 15 deletions.
diff --git a/bff-gui/src-tauri/src/sound.rs b/bff-gui/src-tauri/src/sound.rs
@@ -11,7 +11,10 @@ impl Export for Box<Sound> {
         match **self {
             Sound::SoundV1_291_03_06PC(ref sound) => {
                 let spec = hound::WavSpec {
-                    channels: 1,
+                    channels: match sound.body.flags.stereo().value() {
+                        1 => 2,
+                        _ => 1,
+                    },
                     sample_rate: sound.body.sample_rate,
                     bits_per_sample: 16,
                     sample_format: hound::SampleFormat::Int,
@@ -30,7 +33,10 @@ impl Export for Box<Sound> {
             }
             Sound::SoundV1_381_67_09PC(ref sound) => {
                 let spec = hound::WavSpec {
-                    channels: 1,
+                    channels: match sound.link_header.flags.stereo().value() {
+                        1 => 2,
+                        _ => 1,
+                    },
                     sample_rate: sound.link_header.sample_rate,
                     bits_per_sample: 16,
                     sample_format: hound::SampleFormat::Int,

diff --git a/bff-gui/src/constants/constants.ts b/bff-gui/src/constants/constants.ts
@@ -1,4 +1,3 @@
-import { invoke } from "@tauri-apps/api";
 import {
   MeshBasicMaterial,
   MeshNormalMaterial,
@@ -20,5 +19,3 @@ export const EXTENSION_DESCRIPTIONS: Map<string, string> = new Map([
 export const DEFAULT_MAT = new MeshStandardMaterial();
 export const NORMAL_MAT = new MeshNormalMaterial();
 export const WIREFRAME_MAT = new MeshBasicMaterial({ wireframe: true });
-
-export const BIGFILE_EXTENSIONS: string[] = await invoke("get_extensions");
diff --git a/bff-gui/src/functions/bigfile.ts b/bff-gui/src/functions/bigfile.ts
@@ -1,18 +1,19 @@
 import { message, open } from "@tauri-apps/api/dialog";
-import { BIGFILE_EXTENSIONS } from "../constants/constants";
 import { invoke } from "@tauri-apps/api";
 import { BigFileData, ResourcePreview } from "../types/types";
 
 export async function selectBigfile(
-  setPreviewObject: React.Dispatch<React.SetStateAction<ResourcePreview | null>>,
+  setPreviewObject: React.Dispatch<
+    React.SetStateAction<ResourcePreview | null>
+  >,
   setBigfile: React.Dispatch<React.SetStateAction<BigFileData>>
 ) {
   open({
     multiple: false,
     filters: [
       {
         name: "BigFile",
-        extensions: BIGFILE_EXTENSIONS,
+        extensions: await invoke("get_extensions"),
       },
     ],
   }).then((path) => {
@@ -23,7 +24,9 @@ export async function selectBigfile(
 
 export async function openBigfile(
   path: string,
-  setPreviewObject: React.Dispatch<React.SetStateAction<ResourcePreview | null>>,
+  setPreviewObject: React.Dispatch<
+    React.SetStateAction<ResourcePreview | null>
+  >,
   setBigfile: React.Dispatch<React.SetStateAction<BigFileData>>
 ) {
   setPreviewObject(null);

diff --git a/bff/src/class/sound/v1_291_03_06_pc.rs b/bff/src/class/sound/v1_291_03_06_pc.rs
@@ -6,10 +6,10 @@ use crate::class::trivial_class::TrivialClass;
 
 #[bitsize(16)]
 #[derive(DebugBits, BinRead, SerializeBits, BinWrite, DeserializeBits)]
-struct SoundFlags {
+pub struct SoundFlags {
     paused: u1,
     looping: u1,
-    stereo: u1,
+    pub stereo: u1,
     padding: u13,
 }
 
@@ -18,7 +18,7 @@ struct SoundFlags {
 pub struct SoundBodyV1_291_03_06PC {
     pub sample_rate: u32,
     data_size: u32,
-    flags: SoundFlags,
+    pub flags: SoundFlags,
     #[br(count = data_size / 2)]
     #[serde(skip_serializing)]
     pub data: Vec<i16>,

diff --git a/bff/src/class/sound/v1_381_67_09_pc.rs b/bff/src/class/sound/v1_381_67_09_pc.rs
@@ -7,10 +7,10 @@ use crate::names::Name;
 
 #[bitsize(16)]
 #[derive(BinRead, DebugBits, SerializeBits, BinWrite, DeserializeBits)]
-struct SoundFlags {
+pub struct SoundFlags {
     paused: u1,
     looping: u1,
-    stereo: u1,
+    pub stereo: u1,
     padding: u13,
 }
 
@@ -19,7 +19,7 @@ pub struct LinkHeader {
     link_name: Name,
     pub sample_rate: u32,
     sound_data_size: u32,
-    flags: SoundFlags,
+    pub flags: SoundFlags,
 }
 
 #[derive(BinRead, Debug, Serialize, BinWrite, Deserialize)]