WavPackに対応

Mr-Ojii · Dec 31, 2021 · fc21a1d · fc21a1d
1 parent 265b8ac
commit fc21a1d
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 7 deletions.
diff --git a/LoopMusicPlayer-Core b/LoopMusicPlayer-Core
diff --git a/LoopMusicPlayer/MainWindow.cs b/LoopMusicPlayer/MainWindow.cs
@@ -77,7 +77,7 @@ public MainWindow() : this(new Builder("MainWindow.glade")) { }
         private MainWindow(Builder builder) : base(builder.GetRawOwnedObject("MainWindow"))
         {
             this.Icon = new Gdk.Pixbuf(Assembly.GetExecutingAssembly().GetManifestResourceStream("LoopMusicPlayer.icon.ico"));
-            Bass.Init(Flags: DeviceInitFlags.Frequency);
+            Player.Init(AppContext.BaseDirectory);
 
             Bass.Configure(Configuration.UpdatePeriod, 1);
             Bass.Configure(Configuration.PlaybackBufferLength, 50);
@@ -393,8 +393,8 @@ private bool onframetick(Widget widget, Gdk.FrameClock frame_clock)
                 {
                     this.player.Dispose();
                     this.player = null;
-                    Bass.Free();
-                    Bass.Init();
+                    Player.Free();
+                    Player.Init(AppContext.BaseDirectory);
 
                     this._labeltitle.Text = "Device Disconnected";
                     this._labelpath.Text = "";
@@ -503,9 +503,7 @@ private void DrawingArea_OnDraw(object o, DrawnArgs args)
         private void Window_DeleteEvent(object sender, DeleteEventArgs a)
         {
             this.player?.Dispose();
-            Bass.Pause();
-            Bass.Stop();
-            Bass.Free();
+            Player.Free();
             Application.Quit();
         }
 

diff --git a/bin/net6.0/dll/linux-x64/libbassdsd.so b/bin/net6.0/dll/linux-x64/libbassdsd.so
diff --git a/bin/net6.0/dll/linux-x64/libbasswv.so b/bin/net6.0/dll/linux-x64/libbasswv.so
diff --git a/bin/net6.0/dll/linux-x86/libbassdsd.so b/bin/net6.0/dll/linux-x86/libbassdsd.so
diff --git a/bin/net6.0/dll/linux-x86/libbasswv.so b/bin/net6.0/dll/linux-x86/libbasswv.so
diff --git a/bin/net6.0/dll/osx-x64/libbassdsd.dylib b/bin/net6.0/dll/osx-x64/libbassdsd.dylib
diff --git a/bin/net6.0/dll/osx-x64/libbasswv.dylib b/bin/net6.0/dll/osx-x64/libbasswv.dylib
diff --git a/bin/net6.0/dll/win-x64/bassdsd.dll b/bin/net6.0/dll/win-x64/bassdsd.dll
diff --git a/bin/net6.0/dll/win-x64/basswv.dll b/bin/net6.0/dll/win-x64/basswv.dll
diff --git a/bin/net6.0/dll/win-x86/bassdsd.dll b/bin/net6.0/dll/win-x86/bassdsd.dll
diff --git a/bin/net6.0/dll/win-x86/basswv.dll b/bin/net6.0/dll/win-x86/basswv.dll
diff --git a/bin/net6.0/licenses/BassDsd.txt b/bin/net6.0/licenses/BassDsd.txt
@@ -0,0 +1,15 @@
+Licence
+=======
+BASSDSD is free to use with BASS.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, BASSDSD IS PROVIDED
+"AS IS", WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND/OR FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS SHALL NOT BE HELD
+LIABLE FOR ANY DAMAGE THAT MAY RESULT FROM THE USE OF BASSDSD. YOU USE
+BASSDSD ENTIRELY AT YOUR OWN RISK.
+
+Usage of BASSDSD indicates that you agree to the above conditions.
+
+All trademarks and other registered names contained in the BASSDSD
+package are the property of their respective owners.
diff --git a/bin/net6.0/licenses/BassWv.txt b/bin/net6.0/licenses/BassWv.txt
@@ -0,0 +1,15 @@
+Licence
+=======
+BASSWV is free to use with BASS.
+
+TO THE MAXIMUM EXTENT PERMITTED BY APPLICABLE LAW, BASSWV IS PROVIDED
+"AS IS", WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE IMPLIED WARRANTIES OF MERCHANTABILITY
+AND/OR FITNESS FOR A PARTICULAR PURPOSE. THE AUTHORS SHALL NOT BE HELD
+LIABLE FOR ANY DAMAGE THAT MAY RESULT FROM THE USE OF BASSWV. YOU USE
+BASSWV ENTIRELY AT YOUR OWN RISK.
+
+Usage of BASSWV indicates that you agree to the above conditions.
+
+All trademarks and other registered names contained in the BASSWV
+package are the property of their respective owners.
+2 −0		src/LoopMusicPlayer-Core.csproj
+9 −1		src/MusicFileReader/MusicFileReaderStreaming.cs
+25 −0		src/Player.cs