up

Coloryr · Jul 23, 2024 · 7911b0e · 7911b0e
1 parent 09c53f9
commit 7911b0e
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 8 deletions.
diff --git a/src/ColorMC.Gui/ColorMC.Gui.csproj b/src/ColorMC.Gui/ColorMC.Gui.csproj
@@ -32,7 +32,7 @@
     <None Remove=".gitignore" />
     <None Remove="icon.ico" />
     <None Remove="macicon.ico" />
-    <None Remove="Player\sfd.temp" />
+    <None Remove="MusicPlayer\sfd.temp" />
     <None Remove="Resource\Icon\add.svg" />
     <None Remove="Resource\Icon\add1.svg" />
     <None Remove="Resource\Icon\AddMenu\item1.svg" />
@@ -303,7 +303,7 @@
     <EmbeddedResource Include="Resource\Pic\5.png" />
     <EmbeddedResource Include="Resource\Pic\pic1.png" />
     <EmbeddedResource Include="macicon.ico" />
-    <EmbeddedResource Include="Player\Decoder\Mp3\sfd.temp" />
+    <EmbeddedResource Include="MusicPlayer\Decoder\Mp3\sfd.temp" />
     <EmbeddedResource Include="Resource\Language\gui_zh-cn.json" />
     <EmbeddedResource Include="Resource\Language\gui_en-us.json" />
     <EmbeddedResource Include="Resource\Pic\game.png" />

diff --git a/src/ColorMC.Gui/MusicPlayer/Decoder/Mp3/JavaLayerUtils.cs b/src/ColorMC.Gui/MusicPlayer/Decoder/Mp3/JavaLayerUtils.cs
@@ -6,9 +6,9 @@ namespace ColorMC.Gui.Player.Decoder.Mp3;
 
 public static class JavaLayerUtils
 {
-    public static float[] DeserializeArrayResource(string name)
+    public static float[] DeserializeArrayResource()
     {
-        string local = $"ColorMC.Gui.Player.Decoder.Mp3.{name}";
+        string local = $"ColorMC.Gui.MusicPlayer.Decoder.Mp3.sfd.temp";
 
         var assm = Assembly.GetExecutingAssembly();
         using var istr = assm.GetManifestResourceStream(local)!;

diff --git a/src/ColorMC.Gui/MusicPlayer/Decoder/Mp3/SynthesisFilter.cs b/src/ColorMC.Gui/MusicPlayer/Decoder/Mp3/SynthesisFilter.cs
@@ -87,7 +87,7 @@ public SynthesisFilter(int channelnumber, float factor)
      */
     private static float[] Load()
     {
-        return JavaLayerUtils.DeserializeArrayResource("sfd.temp");
+        return JavaLayerUtils.DeserializeArrayResource();
     }
 
     /**

diff --git a/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml b/src/ColorMC.Gui/UI/Controls/Add/AddControl.axaml
@@ -11,9 +11,6 @@
     d:DesignWidth="800"
     x:DataType="model:AddControlModel"
     mc:Ignorable="d">
-    <UserControl.Resources>
-        <setting:WidthToVisibilityConverter x:Key="WidthToVisibilityConverter" />
-    </UserControl.Resources>
     <Panel>
         <ScrollViewer Name="ScrollViewer1" VerticalScrollBarVisibility="Visible">
             <DockPanel Margin="10">
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,7 @@ public SynthesisFilter(int channelnumber, float factor) @@
          */
         private static float[] Load()
         {
-            return JavaLayerUtils.DeserializeArrayResource("sfd.temp");
+            return JavaLayerUtils.DeserializeArrayResource();
         }
         /**
@@ Expand Down @@