From 65eb9e3d73bd7727e1d25bff02e153051f66ba0a Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Sun, 16 Aug 2020 11:41:34 -0700 Subject: [PATCH 1/8] Ported FMP to .NET Core --- .../FRESHMusicPlayer-WPF-UI-Test.csproj | 235 +----------------- .../packages.config | 7 - 2 files changed, 13 insertions(+), 229 deletions(-) delete mode 100644 FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/packages.config diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj index 3716d72..617ad06 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj @@ -1,236 +1,20 @@ - - - + - Debug - AnyCPU - {7C89A964-E4D9-46A5-A36F-A283D3B1F55E} + netcoreapp3.1 WinExe FRESHMusicPlayer_WPF_UI_Test - FRESHMusicPlayer-WPF-UI-Test - v4.7.2 - 512 - {60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC} - 4 - true - true - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 + false + true + true app.manifest - - ..\packages\z440.atl.core.3.1.0\lib\net45\ATL.dll - - - ..\packages\DiscordRichPresence.1.0.150\lib\net35\DiscordRPC.dll - False Dependencies\FRESHMusicPlayer.Core.dll - - ..\packages\NAudio.1.9.0\lib\net35\NAudio.dll - - - ..\packages\Newtonsoft.Json.12.0.2\lib\net45\Newtonsoft.Json.dll - - - - - - - - - - - - - 4.0 - - - - - - - - MSBuild:Compile - Designer - - - TagEditor.xaml - - - ImportPage.xaml - - - QueueEntry.xaml - - - QueueManagementPage.xaml - - - SettingsPage.xaml - - - TrackInfoPage.xaml - - - True - True - Resources.pt.resx - - - Resources.vi.resx - True - True - - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - MSBuild:Compile - Designer - - - App.xaml - Code - - - NotificationBox.xaml - - - - - MainWindow.xaml - Code - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - Designer - MSBuild:Compile - - - - - LibraryPage.xaml - - - SongEntry.xaml - - - NotificationPage.xaml - - - TestPage.xaml - - - Code - - - True - True - Resources.resx - - - True - Settings.settings - True - - - - PublicResXFileCodeGenerator - Resources.pt.Designer.cs - - - PublicResXFileCodeGenerator - Resources.vi.Designer.cs - - - PublicResXFileCodeGenerator - Resources.Designer.cs - - - - - SettingsSingleFileGenerator - Settings.Designer.cs - - - - @@ -238,5 +22,12 @@ - + + + + + + + + \ No newline at end of file diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/packages.config b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/packages.config deleted file mode 100644 index 1763db6..0000000 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/packages.config +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file From b2ff04a64500f26cb099b7ef7e6680a3c7f8ca68 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Sun, 16 Aug 2020 11:44:16 -0700 Subject: [PATCH 2/8] Updated FMP Core --- .../Dependencies/FRESHMusicPlayer.Core.dll | Bin 17920 -> 18944 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll index dd6b49af74c431a3618c8063b3ee5b7da8ea1309..27a99a2d1138b2b04d3b54d9e6590e88af8491f4 100644 GIT binary patch literal 18944 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 ahYu>peLm&tRsR-i1`mKgT>sxi;C}&?(bLHQ literal 17920 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 Date: Sun, 16 Aug 2020 12:13:31 -0700 Subject: [PATCH 3/8] Fixes --- .../FRESHMusicPlayer-WPF-UI-Test.csproj | 1 + 1 file changed, 1 insertion(+) diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj index 617ad06..771fe0f 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj @@ -25,6 +25,7 @@ + From c4a6042671232974f9845d066a41377ac91bd1f0 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Sun, 16 Aug 2020 15:54:22 -0700 Subject: [PATCH 4/8] Updated FMP Core --- .../Dependencies/FRESHMusicPlayer.Core.dll | Bin 18944 -> 18944 bytes 1 file changed, 0 insertions(+), 0 deletions(-) diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll index 27a99a2d1138b2b04d3b54d9e6590e88af8491f4..962b6dcdd18a7f3f004a5a9032575fc43e4a9890 100644 GIT binary patch delta 196 zcmZpe!q_l{aY6@6<#M~`jXeVDtV|3H42+u>s+)@lTnTQF;y&!`vO%-rZuy3-=Qh8v z&S7CS(lgLAoE+)k&ayh)<^JR)4gmtPDiY0q>a3k+Z0X^Jf zyuqr6UlV@V|IXbiuyOMt$74+VObkp6j6f@)^ycX-j)07Ejv(NlCYTx|A zI){bTP|rxuU~;5`JBvd|!Gy_690CNaCf-Uf2&r&i{GsarUrh|tWERJH3Q)oJ$526_ zYJu=g%FFJ$TkA`t)Vpmy Date: Sun, 16 Aug 2020 15:58:45 -0700 Subject: [PATCH 5/8] FMP Core submodule --- .gitmodules | 3 +++ FRESHMusicPlayer-Core | 1 + 2 files changed, 4 insertions(+) create mode 100644 .gitmodules create mode 160000 FRESHMusicPlayer-Core diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..8540f50 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "FRESHMusicPlayer-Core"] + path = FRESHMusicPlayer-Core + url = https://github.com/Royce551/FRESHMusicPlayer-Core diff --git a/FRESHMusicPlayer-Core b/FRESHMusicPlayer-Core new file mode 160000 index 0000000..87bafc1 --- /dev/null +++ b/FRESHMusicPlayer-Core @@ -0,0 +1 @@ +Subproject commit 87bafc159aa4d0674f15c5b8b0d63683d5b15fda From d8bc68d0972251811811cd01c903dfde957692f5 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Sun, 16 Aug 2020 16:12:13 -0700 Subject: [PATCH 6/8] Removed FMP Core dll and added FMP Core to the projects --- .../FRESHMusicPlayer-WPF-UI-Test.sln | 8 +++++++- .../Dependencies/FRESHMusicPlayer.Core.dll | Bin 18944 -> 0 bytes .../FRESHMusicPlayer-WPF-UI-Test.csproj | 6 +++--- 3 files changed, 10 insertions(+), 4 deletions(-) delete mode 100644 FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln index 6d8e83b..428ef3c 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln @@ -3,7 +3,9 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 16 VisualStudioVersion = 16.0.29613.14 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "FRESHMusicPlayer-WPF-UI-Test", "FRESHMusicPlayer-WPF-UI-Test\FRESHMusicPlayer-WPF-UI-Test.csproj", "{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FRESHMusicPlayer-WPF-UI-Test", "FRESHMusicPlayer-WPF-UI-Test\FRESHMusicPlayer-WPF-UI-Test.csproj", "{7C89A964-E4D9-46A5-A36F-A283D3B1F55E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FRESHMusicPlayer.Core", "..\FRESHMusicPlayer-Core\FRESHMusicPlayer.Player\FRESHMusicPlayer.Player\FRESHMusicPlayer.Core.csproj", "{D5CB0A1E-4450-47EC-B710-280C5D8613E1}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution @@ -15,6 +17,10 @@ Global {7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Debug|Any CPU.Build.0 = Debug|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 + {D5CB0A1E-4450-47EC-B710-280C5D8613E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {D5CB0A1E-4450-47EC-B710-280C5D8613E1}.Debug|Any CPU.Build.0 = Debug|Any CPU + {D5CB0A1E-4450-47EC-B710-280C5D8613E1}.Release|Any CPU.ActiveCfg = Release|Any CPU + {D5CB0A1E-4450-47EC-B710-280C5D8613E1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll deleted file mode 100644 index 962b6dcdd18a7f3f004a5a9032575fc43e4a9890..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 18944 zcmeHv3v^uNb?!cA-XqOuBw3chuaTc)*&551G1%B3S@J`~FD%*SVaFP2j^x3kIr5p2 zY=P~L0%1WypfuDgfuyx>LsHt3i@R_G4I~CG+%ye0cm-BSN~kF*D@mIc5?XF9x#oU* z|Nqg9EF02$*J{`5%@MQDe*OF3|NdY5{O6c0H~lVoh{%iI2OkhUfjeKV0zVuSA&$=e z%P2h_da>aNWAlp*-TO27_>f}{IH|#SUn-Zg3-Mkn?hNPRnOwYMTUUJ0PFu-HBs@=> z-oBn_v*Dr9uUvDxTiZFB6R$9uiPnMRSKO&RxX1A;;ztw{+*E!ugZ-E53?TS?d8p@; ztjhnD?wVv4u4nfVZDXWJ^fm|L!s`T4C3s)>I8pb7vJa!o5CjYaS!oCYM#yCd0!G+n2m(fh%Mb(%1Wnlxgld~Tv%nb$-P+1)I2U`BN5&D-ZH|5_{E_%`WnET=NmCBXZ_hIGGFKA!Y z#QM;p>1ZEwQ6E$$x9`GoQs1S@T|*`Z&hN475C&>2(Nl$9sl;}@P!dBPix?u+C<)X4 z`t#=0^G4Xe#9X|>OkggfGnUkvrYe}Y0*pj00D;5$({4Sd*Bc%u zCN;nx403KG!s%C4hf&)csU`?a+-%%MYDRgoiOb-nonm<-O>g$mQ;0d{MKyVvVr31P zdfv0xn2LB!(;-rh+Lxnv0+YgRdxaUOzd^MQb3cLE!ERIrmsEgSDyA1tBeUL(mju9- zsChBJ$+KW_<&a%LJd1bjB|L>xf1y*4z_fZO`lsnOUB2dSO5{T?L|K*S698EQs&6#h0f!?MET zMiVS6e2dY93KV{;(S{x{c$~92J+5?z%EY-^4I;aNqi#+)igI2IF)V;GPq3Qdej6_q zle-l2$CUL@+r=WO$7_wUDnTL6{Voc5*zx6rKs9qgcqnb`w4;2^@~u#bA28= zN_f7{hEka3J8RJ-Z(=bBdx>!JXjFKbEXFSouuyL!Z zTSY&yLU^y62t)DOqiCwvbhg3RQ8XT1eKe?UnEzfgk2N!V6yw8dCRR#0iQ7(iEqz>% zc9{v3@aKmBWVGm>u~mo3CSTr5syoc{egxc~zY<1m3mA_F8DyLgVCh!dtRP@iy9|wJ zXQnrM=^gljExww>*Ra5fsg>lhuY&Db@8ab(-oz?KePr6a><7<#YyH*!B^CZ^pW15{ zhXO7dtiPd>P+~PoG(G=%RgL%jRK#eynh>w~ZQcPQi&s&o{>I2L>{s4U{SEfjY(LI&r&IO4+J!-en! z7Xr1Fi>bPj$B==Az@%w(?QX(0%=p)7_74@F%wy3D7umzcTkDJ1_q;Uw^29Y@I@hDS zWk?kf4=?W#9{M86qa&;781tNAS0!;RN~m3DrIICD!C7#Dn)6u{IL5WygL;ib8*~!u z0BDlIc5o{w-+^0YFz^y~FEg2CpK_e0y*(c>%BoqwT zn?Mu2UJ+ap2x>1%K5U@c8$ZkkNn3vFgZ=LxhZ`r2hfZ|lf{A^hhd{;u(->GywOiB} z;Jxo-s8`m-3vKco!j86V(ps3_-v^3aA)@fPu6@F$4hvOOIj* z0tONh#SjDxWFv~95xrtWFtA%GhDNlpITQ9J?3_Gb@vMT4 zy8KzpRL?5R#j^^Qn90v77nZ{+7%p6@92}bOIwZ()Gm*i{VsA&O#?^}O*w;%BxUwA+ zWL*0Hz_MV@QslbOff8$QY`CBQ~nK*jl8VB5RdCRS5+1tqX} zHsCQPe*@TwTX^BqWt6X&CD3kMt-1D1OgG-*k~cG{o3%$o}-!fcp(jOa_azluF!Zdbv{ZGFk}JiEHn~4@oK|@H>p(I{Ywrh|9qQ{T_Z? zgn5|voQKdH{CFMkUv#2Us)FGsE8d0l9|b>L!L__5__Kgvdar7ARhV8D*zdd27p7f+ ze)?JX&2S%WmR5Ye@?DD3>d1MtA{=3BUy-^_Rn4vR(`S8Lix1Xn=x0^8hid5VN`_ZQ zZ-@U=0xW&N_!{t>l=`O-*E`Gi0%G0*&%^Y5l>L7SEq#-|iGkv$U--C|Z^RfzQM;f1 ztF--DY26=6jb9diz4-H!=u1&Q9U+GOp_igH^g@_@I0aAq^zHDwsKpoIT7HeP+=EXt zK#%fYjFv>^MAnZ}sj6RsicvEak*3@mWvYg*pfPm%%awIi>#3HmlyaM+byXRvqiaR> zW06gj@fD-<^k8&7)#Le&NA6c*OwGobViDBJ3Z~}LUOEZsXS|0H=edNb2iZfQST;bO zh8RUr=XyL<4WquNya!B!rh9C_y{R`^z(U&x3gzG>(swuzu9!At@O;ww9puVB0UwYre zI`V?1OkW+S?`rBf-+Rc>zptt9LKdWRnyLuBWQOP`LX8FMLa%~)N6We^j$<7EN>lw6 zK2QiHt~-Nwgx@eLD6FZ^h2H`-MN5v;v!=#CMd%Jqod6Z3r!@5#s499_Qx8@A z!o=L*r4Thd3aXk?ilW(}80N&maq8D*EsbgFijYB5=yx?W4Qu5T`mv^(5y2@`n9DZD z(Erb2_M8;zPUf=Too{7GLeHpb=w_(s_G!HuhQ>%p9qp2pL?$uNjQ|2=I zBTfBX=q#w0H1#az*JZSQp|bKCcGb)2>zX=?ku;OOtEg$aBTNN(%YdJ}O3b8;P(A2`{tDruuD6u)49uVp{B|;(3YDQWSsXR`L z$&2$69+7J*eV`(m%0RY+>NGV9*%F$isgFU{L<=-^6J$-aR8unp$0SrF6ZfxV1~^CQVI)teJW>H6OBOI-n_T?J~-1id(ykj%bR#UQTytioIS= zpHY<5-a^NPx?t^!sO*QJWxJ;g*YxU{x$p zV^|eS)c1|Go-4*Re-3IToe*E%3bE`;dR0>_yNV(>z2aW^8{bCHDyq}ePkmcJ%@XRZ z5ZAYw7Hf*@TTQDq#a>@c8#TpVUroC-#a^$Wv`}{<5;0msKTtA*Be9l#qN#TfiM8Zu zW?$YiI4*0cMyN5Gj-7HXEfh+PF!Wih3} z=XYb5hUKOHqwx2TfE&~x?L95gR&Ae%SI{XuQ7pml6i$q|@2UZPSlbzI01RV}@i{316W4~1s@eSCh#Pnff{y48t880Fa1~2{l*brJMjBLSJDg`G)4jQ zzTW{{Uugh(W5+3D+#mS^;Ag{6(pfqi`zGB__xPTJulM-AO+TRPd}jf_?>$Q=jjpO! zC}r@NJ!xdBUPD&OK8K9mkvDaQj4NX|;CS+f;l0KpvHy%Q7)~2!jm=d@j2{?J#KsKv{4Q`d#_k2|jy+(siRL@T zDc?iDPlUb%{+ie~fFBP%4{P^@UIb@X;Csedsr^RLztMO<`l?ZlSCOw9OK86lqfvv` zi&2BuiA5%_4~tA*7Z#bk9vqZXE5!4I#&bpznjF1@#-XZJkn*~4P-45vzon%oWM6U6#E{ruc6o%yg@^;FL;}V%;^z4r6F^Qf{$s)oD+hd)Q~yP2>y(R z@izp2LvREAhRA!F-ynE{;BA7p2|gzHnBXS`KPmV*AD1OR!??g!fjt6G_<4Mu3y4mT zVUNI~z!L(`2s|f{LSjc?tH2(CMS&*-o)LIXAcaL=V5`8Qz!L(`2s|f{DnwIYtH2(C zCn}kLM&LPt6cJ52gFUhSdp^ z34cD}`oN!oXvFZ0f`dcI0^s`qgLvP<5$XptAq#;Y01V>fAq@V0e!2uz0e%S31RVih z0cawgRlp;F$Stt@8o=;z1IpC`uLd;ne8^AdwSXp``Rak!0h&0Ly9{_epouJbI`CzH zCNkfdz*_)K#OG!} zlX{R<7}z6L0q@1CZ&Dw!OoP&ZCS~BeLAL;!bb#7`X8}#@Chfp;fF{{!$K~)fk8k0A zYAi6lMb6Poj8FqVzWxTon)}tgc9?(7N07of?lS2G!H_JCUpJfQE0{3QTcvA;sBph6 zMEe)QyM+|s>WJ2C&!$GV4Cga_*9`32w_UI!D_iz8)0$*o!FI0c-M4SqN+z#awQt|b zRg87!GKG#zzRz~jJGQs8hT?0DWtY%cMxE<(!-JNS>djg`%V<-fFto`^r7dSyDm!eo z+u5wuSIF2o$kvZoxx%JYE}gX;ke!<|`2yc_g_h;)3a!~(;76`N)@){`mD*auKmOP{pgoTh1!PG8GA$KVxsO$;bQEzY~d1;_F>1t z_}FD<(I1nmLVr0IVXw;+(AO6cTt93LUxeK@VrSA@@!jSnhTf zseC~V%l7?N-+{>rZQ0)8!O84hmXpW$nk*34w(H?HS$w0Fawcvqu9 zmlE>8&0oZxRY+yB7ZJ2)Gw7zt1=^ef=JOM zM5?ZKgxW34~jCu;##qY?XnMV)F1<3*Bo z4Ce}&L92Uo$Wn_TZL|tZZE);C&5^dMStpIrGf>(&KIueKqWUpHQGYIP_RF#PU+4PnirLFnystJE4DStT&-0moXFYj zWD3^iOirTL%Xf~3R4=n$>?v%+j`dxeWF6*-YB|Yv+kwYwe^BeUEU#D&br-9dNgYyTY8 zSbw-+<#@R%>AGfkWz%cXWFf{=e`a7hTFw9kj=t-rB z_AHiFg>s>Z`-GIffTg|f%=O!42@j2M+N0OG$^nVx1w@VKWzOjAHFV-bE*L zGM&v5#|~|?QiEcw6X~5;5Jbg_u;!+1C6`TB6com5R2PPd6xN{=v5UK{aOtwVaXj)C zvL4A^#fpp$H|%0-BBy=Z7OeZ0%m(7HZM6}b;as}JbyL3*rz}@2F|li4sHC?IA+P4S zRg!G5oxxP0M7KEuNSAVDoUPWO0&fESh2(X4JBP*5K^tsmlt-!_m~I2NT7@KM?9x2W zE2LF|$b1lfDYFo18OfbomRpFpoF3nsc(1e^Qr)SEZj3sOc5+{1K8<8VYsl)ulu)Az zHgn8$drR$)j%4``vICbcf3^^>c{|e;%KqXISE$hoM;#5xZbBTe@pSf zCqNFS8^DfCY9MFl3z@z=U1&6^lNd;_v3FU0b}pSqd(>Uec6V~i^MO5t$~m9OyY^kN zyX%b0)lP!70FO*ipH%nG01?c!{~a@e1XxT(7@pDdew$}^t7Nc{$f#$(|Q)}&f) z^YW~@!#X$&J(tBJvcu|64QDa7CP*el$gNtO7mw&8*zw&l1VM-{<=Xvf-9pe!07rc{Eink%_FrQC-h+Jfg*-Ug`MK?5zG zDkO8IEt?erOHob`HoVn7Bm+aIT2igp-OTAn=O9w&k6EL_=^9LBv*R3DR5oXNos=_L z{-BO^6bx1O_|C#|7Lt2brgTJ?BeB?U9t=nKmAe8 zE~TsRqQ6;waeSJ<-BCdJ^Qd?!{s!P+0o-9UB`IMT1a}7<90g_JQ1A)_Z0Sb^1>bP2 z+5vqolflrlWY{qWFPS9F{RoGRK@pdra&WjaI3%=aa>mKH*C~&P6>Ea;c^%Z8`@%BP0EO}-C7C**3}eW1nLdopYHhsUegSka4P5t zzy~s_i>D*CfiRdg)5iY>#jjc@`D-%%xM|GLw_0uwKJN2Gamj7Q3?Iv<`B76%@ssLy zH?&Or0})md{txgvxu*CdMd;fr^8*oaRX{LUS6%$P5sjL`sHssAgyJM*E%_DO8^>8T zLKqCPXF>4Eh*lT>J{IsHXkV-;o~)^ql6b{t!b!OGPE?$k0f-ue^~GqACBLdJ{_jxS zoKZ8zL{-2mC2J~ciVwq(Xg(Ybpq`pBA6jbQ^D3C-@KViKC=B0f#v%|_2VKPNoQ(8_ zhHmF%5SU8t{z@1?=s6&`1w^;_jOs27i{dj9s~PMk5?&1055rDsFGpK?1~W+*C%I{fpUlN#Dumcirk4#x@x z^a89;m*Wk}q})VKHOMClc;#Kubr44j@r_Of&qa8FM)i|Qs4R=9-k_TC$LIL7kHq84 zo0sF87yOIPdHwy?RaUA$-E?JtD%G^&isqK4RV^!5G%a7bqUEaP%TmjG`>w)Q-SBLA zaydTh#y`$kiSO=`Ti18v2t*FymguLYwIj=u%h0~)l<~6$WHp>cZ{;H-w65&>(}9k^ zC1cBW6TCmg?`?b(`*v$dft73V94p*@SKipc1tRgqd`twElZx9mGlFA7&s|(6V3gW`cD`E{`Q^lCYg#88^`Mr z{=X0x;j`W*{B9@`J%Gj3y&mxJmxH^I!R-TFk3^{p?_{^(&Fengw<1m2CaO<+|M@(p zlj^Otdh5w`U8@c8j>2=l{OSN(rv|^_4w+-_d~;|k)Jg-O5Iub$Nz7UsVL|A&;ji{QbhKRp8!;D%;i5SjZKPQ zj?~tS?WAOLVxG;mmLrknA1A$7ui*o?j3Zem7k03sAc-JgH{Cg%?DYv6~Hx0Xkuy4wRpd!!xPbRFEg z+zvOkOsU@ZziH2Q%ntr$fK&7|da@6(Dn;lw>7NNtNcggp`)H!Q3w!Fqe!5D^w4ufP h%r}TpnUx2Jk1EG~KI!UF{}yW+5A5Gw|KCO6{{RoC)@A?z diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj index 771fe0f..f87f3c7 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj @@ -16,9 +16,6 @@ Dependencies\FRESHMusicPlayer.Core.dll - - - @@ -31,4 +28,7 @@ + + + \ No newline at end of file From 3a42bf3352a32392fb92215f4a732f79b6c0da62 Mon Sep 17 00:00:00 2001 From: Andrew Lee Date: Sun, 16 Aug 2020 16:33:45 -0700 Subject: [PATCH 7/8] Reverted changes --- .gitmodules | 3 --- FRESHMusicPlayer-Core | 1 - .../FRESHMusicPlayer-WPF-UI-Test.sln | 6 ------ .../Dependencies/FRESHMusicPlayer.Core.dll | Bin 0 -> 17920 bytes .../FRESHMusicPlayer-WPF-UI-Test.csproj | 3 --- 5 files changed, 13 deletions(-) delete mode 100644 .gitmodules delete mode 160000 FRESHMusicPlayer-Core create mode 100644 FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll diff --git a/.gitmodules b/.gitmodules deleted file mode 100644 index 8540f50..0000000 --- a/.gitmodules +++ /dev/null @@ -1,3 +0,0 @@ -[submodule "FRESHMusicPlayer-Core"] - path = FRESHMusicPlayer-Core - url = https://github.com/Royce551/FRESHMusicPlayer-Core diff --git a/FRESHMusicPlayer-Core b/FRESHMusicPlayer-Core deleted file mode 160000 index 87bafc1..0000000 --- a/FRESHMusicPlayer-Core +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 87bafc159aa4d0674f15c5b8b0d63683d5b15fda diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln index 428ef3c..d5ed3dd 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln @@ -5,8 +5,6 @@ VisualStudioVersion = 16.0.29613.14 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}" EndProject -Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "FRESHMusicPlayer.Core", "..\FRESHMusicPlayer-Core\FRESHMusicPlayer.Player\FRESHMusicPlayer.Player\FRESHMusicPlayer.Core.csproj", "{D5CB0A1E-4450-47EC-B710-280C5D8613E1}" -EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -17,10 +15,6 @@ Global {7C89A964-E4D9-46A5-A36F-A283D3B1F55E}.Debug|Any CPU.Build.0 = Debug|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 - {D5CB0A1E-4450-47EC-B710-280C5D8613E1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU - {D5CB0A1E-4450-47EC-B710-280C5D8613E1}.Debug|Any CPU.Build.0 = Debug|Any CPU - {D5CB0A1E-4450-47EC-B710-280C5D8613E1}.Release|Any CPU.ActiveCfg = Release|Any CPU - {D5CB0A1E-4450-47EC-B710-280C5D8613E1}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/Dependencies/FRESHMusicPlayer.Core.dll new file mode 100644 index 0000000000000000000000000000000000000000..fd518c6b5bfecb092167c9cee1c79c316967a3a3 GIT binary patch literal 17920 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 Hg9!X@%tA`C literal 0 HcmV?d00001 diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj index f87f3c7..28e4ade 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj @@ -28,7 +28,4 @@ - - - \ No newline at end of file From 77d17021ae703ff77177e44c84f955073bd29150 Mon Sep 17 00:00:00 2001 From: Royce551 Date: Mon, 17 Aug 2020 20:31:45 -0500 Subject: [PATCH 8/8] stuff --- FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln | 6 ++++++ .../FRESHMusicPlayer-WPF-UI-Test.csproj | 1 + .../FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs | 3 ++- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln index d5ed3dd..5935b96 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test.sln @@ -8,13 +8,19 @@ EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU + Debug|x86 = Debug|x86 Release|Any CPU = Release|Any CPU + Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution {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|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.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 GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj index 28e4ade..66a56e4 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/FRESHMusicPlayer-WPF-UI-Test.csproj @@ -6,6 +6,7 @@ false true true + AnyCPU;x86 app.manifest diff --git a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs index c859b73..2329b94 100644 --- a/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs +++ b/FRESHMusicPlayer/FRESHMusicPlayer-WPF-UI-Test/MainWindow.xaml.cs @@ -19,6 +19,7 @@ using Windows.Media; using System.Runtime.InteropServices.WindowsRuntime; using System.Windows.Interop; using Windows.Storage.Streams; +using System.IO; namespace FRESHMusicPlayer { @@ -259,7 +260,7 @@ namespace FRESHMusicPlayer } else { - CoverArtBox.Source = BitmapFrame.Create(new System.IO.MemoryStream(track.EmbeddedPictures[0].PictureData), BitmapCreateOptions.None, BitmapCacheOption.OnLoad); + CoverArtBox.Source = BitmapFrame.Create(new MemoryStream(track.EmbeddedPictures[0].PictureData), BitmapCreateOptions.None, BitmapCacheOption.OnLoad); SetCoverArtVisibility(true); }