Split common and GUI code into separate projects

RedBookPlayer.Common/Discs/CompactDisc.cs

@@ -9,7 +9,7 @@ using Aaru.Helpers;
 using ReactiveUI;
 using static Aaru.Decoders.CD.FullTOC;
 
-namespace RedBookPlayer.Discs
+namespace RedBookPlayer.Common.Discs
 {
     public class CompactDisc : OpticalDisc, IReactiveObject
     {

RedBookPlayer.Common/Discs/OpticalDisc.cs

@@ -2,7 +2,7 @@ using Aaru.CommonTypes.Enums;
 using Aaru.CommonTypes.Interfaces;
 using ReactiveUI;
 
-namespace RedBookPlayer.Discs
+namespace RedBookPlayer.Common.Discs
 {
     public abstract class OpticalDisc : ReactiveObject
     {

RedBookPlayer.Common/Discs/OpticalDiscFactory.cs

@@ -4,7 +4,7 @@ using Aaru.CommonTypes.Metadata;
 using Aaru.DiscImages;
 using Aaru.Filters;
 
-namespace RedBookPlayer.Discs
+namespace RedBookPlayer.Common.Discs
 {
     public static class OpticalDiscFactory
     {

RedBookPlayer.Common/Hardware/DeEmphasisFilter.cs

@@ -1,7 +1,7 @@
 using System;
 using NWaves.Filters.BiQuad;
 
-namespace RedBookPlayer.Hardware
+namespace RedBookPlayer.Common.Hardware
 {
     /// <summary>
     /// Filter for applying de-emphasis to audio

RedBookPlayer.Common/Hardware/Player.cs

@@ -2,9 +2,9 @@ using System;
 using System.ComponentModel;
 using Aaru.CommonTypes.Enums;
 using ReactiveUI;
-using RedBookPlayer.Discs;
+using RedBookPlayer.Common.Discs;
 
-namespace RedBookPlayer.Hardware
+namespace RedBookPlayer.Common.Hardware
 {
     public class Player : ReactiveObject
     {

RedBookPlayer.Common/Hardware/PlayerSource.cs

@@ -2,7 +2,7 @@ using System;
 using CSCore;
 using WaveFormat = CSCore.WaveFormat;
 
-namespace RedBookPlayer.Hardware
+namespace RedBookPlayer.Common.Hardware
 {
     public class PlayerSource : IWaveSource
     {

RedBookPlayer.Common/Hardware/SoundOutput.cs

@@ -5,9 +5,9 @@ using CSCore.SoundOut;
 using NWaves.Audio;
 using NWaves.Filters.BiQuad;
 using ReactiveUI;
-using RedBookPlayer.Discs;
+using RedBookPlayer.Common.Discs;
 
-namespace RedBookPlayer.Hardware
+namespace RedBookPlayer.Common.Hardware
 {
     public class SoundOutput : ReactiveObject
     {

RedBookPlayer.Common/RedBookPlayer.Common.csproj

@@ -0,0 +1,19 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netcoreapp3.1</TargetFramework>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+
+  <ItemGroup>
+    <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" />
+    <PackageReference Include="NWaves" Version="0.9.4" />
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Aaru\Aaru.Images\Aaru.Images.csproj" />
+    <ProjectReference Include="..\Aaru\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
+    <ProjectReference Include="..\Aaru\Aaru.Decoders\Aaru.Decoders.csproj" />
+    <ProjectReference Include="..\cscore\CSCore\CSCore.csproj" />
+  </ItemGroup>
+
+</Project>

RedBookPlayer.GUI/PlayerViewModel.cs

@@ -1,6 +1,6 @@
 using System.ComponentModel;
 using ReactiveUI;
-using RedBookPlayer.Hardware;
+using RedBookPlayer.Common.Hardware;
 
 namespace RedBookPlayer.GUI
 {

RedBookPlayer.GUI/Program.cs

@@ -5,7 +5,7 @@ using System.Runtime.InteropServices;
 using Avalonia;
 using Avalonia.Logging.Serilog;
 
-namespace RedBookPlayer
+namespace RedBookPlayer.GUI
 {
     internal class Program
     {

RedBookPlayer.GUI/RedBookPlayer.GUI.csproj

@@ -2,8 +2,8 @@
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
     <TargetFramework>netcoreapp3.1</TargetFramework>
-    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
     <RuntimeIdentifiers>win-x64;linux-x64</RuntimeIdentifiers>
+    <RuntimeIdentifier>linux-x64</RuntimeIdentifier>
     <DebugType>embedded</DebugType>
   </PropertyGroup>
   <PropertyGroup Condition="'$(RuntimeIdentifier)|$(Configuration)' == 'win-x64|Debug'">
@@ -21,17 +21,9 @@
     <PackageReference Include="Avalonia" Version="0.9.12" />
     <PackageReference Include="Avalonia.Desktop" Version="0.9.12" />
     <PackageReference Include="Avalonia.ReactiveUI" Version="0.9.12" />
-    <PackageReference Include="NWaves" Version="0.9.4" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.3" />
-    <PackageReference Include="Avalonia.Skia.Linux.Natives" Version="1.68.0.2" ExcludeAssets="all" />
-    <PackageReference Include="SkiaSharp" Version="1.68.3" />
-    <PackageReference Include="OpenTK.NetStandard" Version="1.0.5.12" />
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\Aaru\Aaru.Images\Aaru.Images.csproj" />
+    <ProjectReference Include="..\RedBookPlayer.Common\RedBookPlayer.Common.csproj" />
-    <ProjectReference Include="..\Aaru\Aaru.CommonTypes\Aaru.CommonTypes.csproj" />
-    <ProjectReference Include="..\Aaru\Aaru.Decoders\Aaru.Decoders.csproj" />
-    <ProjectReference Include="..\cscore\CSCore\CSCore.csproj" />
   </ItemGroup>
   <ItemGroup>
     <AvaloniaResource Include="Assets\*" />

RedBookPlayer.GUI/Settings.cs

@@ -4,7 +4,7 @@ using System.Text.Json;
 using Avalonia.Input;
 using RedBookPlayer.GUI;
 
-namespace RedBookPlayer
+namespace RedBookPlayer.GUI
 {
     public class Settings
     {

RedBookPlayer.GUI/nuget.config

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <packageSources>
+    <add key="AvaloniaCI" value="https://www.myget.org/F/avalonia-ci/api/v2" />
+  </packageSources>
+</configuration>

RedBookPlayer.sln

@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 16
 VisualStudioVersion = 16.0.31321.278
 MinimumVisualStudioVersion = 15.0.26124.0
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedBookPlayer", "RedBookPlayer\RedBookPlayer.csproj", "{94944959-0352-4ABF-9C5C-19FF33747ECE}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "RedBookPlayer.GUI", "RedBookPlayer.GUI\RedBookPlayer.GUI.csproj", "{94944959-0352-4ABF-9C5C-19FF33747ECE}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "cscore", "cscore", "{9A371299-4C59-4E46-9C3B-4FE024017491}"
 EndProject
@@ -40,6 +40,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "RedBookPlayer.Common", "RedBookPlayer.Common\RedBookPlayer.Common.csproj", "{462A3B8E-A5D4-4539-8469-1647B47AB2A8}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -194,6 +196,18 @@ Global
 		{ED8E11B7-786F-4EFF-9E4C-B937B7A2DE89}.Release|x64.Build.0 = Release|Any CPU
 		{ED8E11B7-786F-4EFF-9E4C-B937B7A2DE89}.Release|x86.ActiveCfg = Release|Any CPU
 		{ED8E11B7-786F-4EFF-9E4C-B937B7A2DE89}.Release|x86.Build.0 = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|x64.ActiveCfg = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|x64.Build.0 = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Debug|x86.Build.0 = Debug|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|Any CPU.Build.0 = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|x64.ActiveCfg = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|x64.Build.0 = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|x86.ActiveCfg = Release|Any CPU
+		{462A3B8E-A5D4-4539-8469-1647B47AB2A8}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE