mirrors/FRESHMusicPlayer
1
0
Fork 0
mirror of https://github.com/Royce551/FRESHMusicPlayer.git synced 2025-01-22 10:51:52 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "Ported FMP 8 to .NET Core"

Browse source
This commit is contained in:
Squid Grill 2020-08-17 22:11:00 -05:00 committed by GitHub
parent 77037a44bb
commit 5e4a568356
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 228 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln
View file

@ -3,24 +3,18 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 16 # Visual Studio Version 16
VisualStudioVersion = 16.0.29613.14 VisualStudioVersion = 16.0.29613.14
MinimumVisualStudioVersion = 10.0.40219.1 MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FRESHMusicPlayer-WPF-UI-Test", "FRESHMusicPlayer-WPF-UI-Test\FRESHMusicPlayer-WPF-UI-Test.csproj", "{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}" Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRESHMusicPlayer-WPF-UI-Test", "FRESHMusicPlayer-WPF-UI-Test\FRESHMusicPlayer-WPF-UI-Test.csproj", "{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}"
EndProject EndProject
Global Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU Debug|Any CPU = Debug|Any CPU
Debug|x86 = Debug|x86
Release|Any CPU = Release|Any CPU Release|Any CPU = Release|Any CPU
Release|x86 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(ProjectConfigurationPlatforms) = postSolution GlobalSection(ProjectConfigurationPlatforms) = postSolution
{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU {7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Debug|Any CPU.Build.0 = Debug|Any CPU {7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Debug|x86.ActiveCfg = Debug|x86
{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Debug|x86.Build.0 = Debug|x86
{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Release|Any CPU.ActiveCfg = Release|Any CPU {7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Release|Any CPU.Build.0 = Release|Any CPU {7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Release|Any CPU.Build.0 = Release|Any CPU
{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Release|x86.ActiveCfg = Release|x86
{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Release|x86.Build.0 = Release|x86
EndGlobalSection EndGlobalSection
GlobalSection(SolutionProperties) = preSolution GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE HideSolutionNode = FALSE

BIN
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll
View file

Binary file not shown.

240
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj
View file

@ -1,12 +1,40 @@
<Project Sdk="Microsoft.NET.Sdk.WindowsDesktop"> <?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
<PropertyGroup> <PropertyGroup>
<TargetFramework>netcoreapp3.1</TargetFramework> <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
<Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
<ProjectGuid>{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}</ProjectGuid>
<OutputType>WinExe</OutputType> <OutputType>WinExe</OutputType>
<RootNamespace>FRESHMusicPlayer_WPF_UI_Test</RootNamespace> <RootNamespace>FRESHMusicPlayer_WPF_UI_Test</RootNamespace>
<GenerateAssemblyInfo>false</GenerateAssemblyInfo> <AssemblyName>FRESHMusicPlayer-WPF-UI-Test</AssemblyName>
<UseWindowsForms>true</UseWindowsForms> <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
<UseWPF>true</UseWPF> <FileAlignment>512</FileAlignment>
<Platforms>AnyCPU;x86</Platforms> <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
<WarningLevel>4</WarningLevel>
<AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
<Deterministic>true</Deterministic>
<NuGetPackageImportStamp>
</NuGetPackageImportStamp>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugSymbols>true</DebugSymbols>
<DebugType>full</DebugType>
<Optimize>false</Optimize>
<OutputPath>bin\Debug\</OutputPath>
<DefineConstants>DEBUG;TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup>
<PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
<PlatformTarget>AnyCPU</PlatformTarget>
<DebugType>pdbonly</DebugType>
<Optimize>true</Optimize>
<OutputPath>bin\Release\</OutputPath>
<DefineConstants>TRACE</DefineConstants>
<ErrorReport>prompt</ErrorReport>
<WarningLevel>4</WarningLevel>
</PropertyGroup> </PropertyGroup>
<PropertyGroup> <PropertyGroup>
<ApplicationManifest>app.manifest</ApplicationManifest> <ApplicationManifest>app.manifest</ApplicationManifest>
@ -16,17 +44,201 @@
<SpecificVersion>False</SpecificVersion> <SpecificVersion>False</SpecificVersion>
<HintPath>Dependencies\FRESHMusicPlayer.Core.dll</HintPath> <HintPath>Dependencies\FRESHMusicPlayer.Core.dll</HintPath>
</Reference> </Reference>
<Reference Include="System" />
<Reference Include="System.Data" />
<Reference Include="System.Drawing" />
<Reference Include="System.Windows.Forms" />
<Reference Include="System.Xml" />
<Reference Include="Microsoft.CSharp" />
<Reference Include="System.Core" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
<Reference Include="System.Net.Http" />
<Reference Include="System.Xaml">
<RequiredTargetFramework>4.0</RequiredTargetFramework>
</Reference>
<Reference Include="WindowsBase" />
<Reference Include="PresentationCore" />
<Reference Include="PresentationFramework" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Folder Include="Utilities\" /> <ApplicationDefinition Include="App.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</ApplicationDefinition>
<Compile Include="Forms\TagEditor.xaml.cs">
<DependentUpon>TagEditor.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\ImportPage.xaml.cs">
<DependentUpon>ImportPage.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\QueueManagement\QueueEntry.xaml.cs">
<DependentUpon>QueueEntry.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\QueueManagement\QueueManagementPage.xaml.cs">
<DependentUpon>QueueManagementPage.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\Settings\SettingsPage.xaml.cs">
<DependentUpon>SettingsPage.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\TrackInfoPage.xaml.cs">
<DependentUpon>TrackInfoPage.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.pt.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.pt.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Resources.vi.Designer.cs">
<DependentUpon>Resources.vi.resx</DependentUpon>
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
</Compile>
<Compile Include="Resources\SkinResourceDictionary.cs" />
<Compile Include="Utilities\WindowsInteropUtils.cs" />
<Page Include="Forms\TagEditor.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Handlers\Notifications\NotificationBox.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="MainWindow.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Compile Include="App.xaml.cs">
<DependentUpon>App.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Compile Include="Handlers\Notifications\NotificationBox.xaml.cs">
<DependentUpon>NotificationBox.xaml</DependentUpon>
</Compile>
<Compile Include="Handlers\Notifications\NotificationHandler.cs" />
<Compile Include="Handlers\Notifications\NotificationInfo.cs" />
<Compile Include="MainWindow.xaml.cs">
<DependentUpon>MainWindow.xaml</DependentUpon>
<SubType>Code</SubType>
</Compile>
<Page Include="Pages\ImportPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Pages\Library\LibraryPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Pages\Library\SongEntry.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Pages\NotificationPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Pages\QueueManagement\QueueEntry.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Pages\QueueManagement\QueueManagementPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Pages\Settings\SettingsPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Pages\TestPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Pages\TrackInfoPage.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Resources\DarkTheme.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Resources\Icons.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Resources\LightTheme.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Resources\Styles.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="DiscordRichPresence" Version="1.0.150" /> <Compile Include="Pages\Library\LibraryPage.xaml.cs">
<PackageReference Include="Microsoft.CSharp" Version="4.7.0" /> <DependentUpon>LibraryPage.xaml</DependentUpon>
<PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" /> </Compile>
<PackageReference Include="NAudio" Version="1.10.0" /> <Compile Include="Pages\Library\SongEntry.xaml.cs">
<PackageReference Include="Newtonsoft.Json" Version="12.0.3" /> <DependentUpon>SongEntry.xaml</DependentUpon>
<PackageReference Include="System.Data.DataSetExtensions" Version="4.5.0" /> </Compile>
<PackageReference Include="z440.atl.core" Version="3.7.0" /> <Compile Include="Pages\NotificationPage.xaml.cs">
<DependentUpon>NotificationPage.xaml</DependentUpon>
</Compile>
<Compile Include="Pages\TestPage.xaml.cs">
<DependentUpon>TestPage.xaml</DependentUpon>
</Compile>
<Compile Include="Properties\AssemblyInfo.cs">
<SubType>Code</SubType>
</Compile>
<Compile Include="Properties\Resources.Designer.cs">
<AutoGen>True</AutoGen>
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
<Compile Include="Properties\Settings.Designer.cs">
<AutoGen>True</AutoGen>
<DependentUpon>Settings.settings</DependentUpon>
<DesignTimeSharedInput>True</DesignTimeSharedInput>
</Compile>
<EmbeddedResource Include="Properties\Resources.de.resx" />
<EmbeddedResource Include="Properties\Resources.pt.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.pt.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.vi.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.vi.Designer.cs</LastGenOutput>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>PublicResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
<None Include="app.manifest" />
<None Include="Properties\Settings.settings">
<Generator>SettingsSingleFileGenerator</Generator>
<LastGenOutput>Settings.Designer.cs</LastGenOutput>
</None>
</ItemGroup> </ItemGroup>
<ItemGroup>
<None Include="App.config" />
</ItemGroup>
<ItemGroup>
<Content Include="Dependencies\FRESHMusicPlayer.Core.dll" />
</ItemGroup>
<ItemGroup />
<ItemGroup>
<PackageReference Include="DiscordRichPresence">
<Version>1.0.150</Version>
</PackageReference>
<PackageReference Include="Microsoft.Windows.SDK.Contracts">
<Version>10.0.19041.1</Version>
</PackageReference>
<PackageReference Include="NAudio">
<Version>1.9.0</Version>
</PackageReference>
<PackageReference Include="z440.atl.core">
<Version>3.1.0</Version>
</PackageReference>
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project> </Project>

3
FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs
View file

@ -19,7 +19,6 @@ using Windows.Media;
using System.Runtime.InteropServices.WindowsRuntime; using System.Runtime.InteropServices.WindowsRuntime;
using System.Windows.Interop; using System.Windows.Interop;
using Windows.Storage.Streams; using Windows.Storage.Streams;
using System.IO;
namespace FRESHMusicPlayer namespace FRESHMusicPlayer
{ {
@ -260,7 +259,7 @@ namespace FRESHMusicPlayer
} }
else else
{ {
CoverArtBox.Source = BitmapFrame.Create(new MemoryStream(track.EmbeddedPictures[0].PictureData), BitmapCreateOptions.None, BitmapCacheOption.OnLoad); CoverArtBox.Source = BitmapFrame.Create(new System.IO.MemoryStream(track.EmbeddedPictures[0].PictureData), BitmapCreateOptions.None, BitmapCacheOption.OnLoad);
SetCoverArtVisibility(true); SetCoverArtVisibility(true);
} }