From 8626b8283f7a415fe83a3ee5d5b2af6efd29d1ab Mon Sep 17 00:00:00 2001 From: Frank Skare Date: Thu, 1 Aug 2019 11:47:01 +0200 Subject: [PATCH] improved error handling --- Changelog.md | 15 +++++---------- .../ScriptingExtension/ScriptingExtension.cs | 4 ++-- img/Avatar.png | Bin 0 -> 10810 bytes mpv.net/Misc/App.cs | 5 ----- mpv.net/Misc/Command.cs | 2 +- mpv.net/Misc/Extension.cs | 2 +- mpv.net/Properties/AssemblyInfo.cs | 4 ++-- mpv.net/Resources/inputConf.txt | 1 + mpv.net/WinForms/MainForm.cs | 5 ++++- mpv.net/mpv/mp.cs | 11 ++++------- 10 files changed, 20 insertions(+), 29 deletions(-) create mode 100644 img/Avatar.png diff --git a/Changelog.md b/Changelog.md index 7a797ba..ef7cb70 100644 --- a/Changelog.md +++ b/Changelog.md @@ -1,13 +1,12 @@ -### +### 5.1 -- 'Tools > Execute mpv command' was removed, - [mpv-repl](https://github.com/rossy/mpv-repl) is currently the best choice +- 'Tools > Execute mpv command' was replaced with [mpv-repl](https://github.com/rossy/mpv-repl) - many [wiki pages](https://github.com/stax76/mpv.net/wiki) were improved - the logo/icon had a very small cosmetic change - the help in the context menu was improved, for quick access consider the command palette (F1 key) - config options specific to mpv.net are now available from the command line -- the input editor no longer as known limitations, 'alt gr' and ctrl+alt are working now +- the input editor no longer has known limitations, 'alt gr' and ctrl+alt are working now - the help in the input editor was simplified and the filter logic was improved - fixed issue in file associations causing mpv.net not to appear in OS default apps - 'Tools > Manage File Associations' was replaced by 'Tools > OS Setup', @@ -25,18 +24,14 @@ - it's now enforced that mpv properties on the command line and in the mpv.conf config file are lowercase, if not a error is shown - gpu-api vulkan was not working if media files were opened via - command line (that included Explorer), Vulkan unlike d3d11 and opengl - requires a window being visible, this is now satisfied with a - workaround, it's only possible showing a window with default size - first as defines by autofit. Vulkan has few issues, usually the auto option - which uses d3d11 is better! Using Vulkan the mpv.net setting + command line (that included Explorer) - new setting minimum-aspect-ratio added, minimum aspect ratio for the window, this was previously hard coded to 1.3 - new setting auto-load-folder added, for single files automatically load the entire directory into the playlist, previously this was forced, now it can be disabled - new setting themed-menu added, follow theme color in context menu, - default: no, UI related settings have now a separate UI tab in the config editor + default: no. UI related settings have now a separate UI tab in the config editor ### 5.0 diff --git a/extensions/ScriptingExtension/ScriptingExtension.cs b/extensions/ScriptingExtension/ScriptingExtension.cs index b4d38d4..8cc0845 100644 --- a/extensions/ScriptingExtension/ScriptingExtension.cs +++ b/extensions/ScriptingExtension/ScriptingExtension.cs @@ -29,8 +29,8 @@ namespace ScriptingExtension // the file name of extensions must end with 'Exten scriptFiles.AddRange(Directory.GetFiles(mp.ConfigFolder + "scripts", "*.cs")); if (Directory.Exists(PathHelp.StartupPath + "scripts")) - foreach (string file in Directory.GetFiles(PathHelp.StartupPath + "scripts", "*.cs")) - App.UnknownModule(file); + foreach (string path in Directory.GetFiles(PathHelp.StartupPath + "scripts", "*.cs")) + scriptFiles.AddRange(Directory.GetFiles(PathHelp.StartupPath + "scripts", "*.cs")); if (scriptFiles.Count == 0) return; CSScriptLibrary.CSScript.EvaluatorConfig.Engine = EvaluatorEngine.CodeDom; diff --git a/img/Avatar.png b/img/Avatar.png new file mode 100644 index 0000000000000000000000000000000000000000..7b26fef0bcc95b71501f34d37ed3b6ff0c9c1b06 GIT binary patch literal 10810 zcmdUVc{r5s+xN&fLel0dL$;C{yQU(H5ZTq3$evW1tV6PlrCnr;hGhRXlVl5FvS$yG zDJjO1oiZb0?A~+w{oeO|j^llg=Xw5pIu1u>?)$!6_jR4;`T3lm&lP^w>#;xAFB5oDz zVj(X6H7tgRJVoccwd)}fp|ph{fY6siH`Ggb<7Q$ltyf9|B7Jq*Gly9$&w^MPdyZ7?t z%ZCq*tNRj5BE~jPy`7WS{#NMR%%@l>5hYlDb0%wG_p9?lHO5IoMiQHH@u39{TraJQ zubzn!Bk6mtuPn$~yog+>GFtC8lHY55{XE(Ad)@v0>NlS>p_G-Cv$frV zrl_8)=6dvdy4x7@#t=8@*;nem@_R}=XjXf5aYh7v?QHoC{Bra)=dOSBynTFWl>t6) zgL_xU5*Ma{=7P2=sQ#t7}Z zT*utL&c4dATdK$TX<(-sWC_gH8N1gPZ{uz&OEJ2gU9#zCv&{Bq-!kbBX7v|T&b9gt z1}8p!stQ{){vr8{p5FUa(Zaxm>)CI1?b>y&D$o~?Ui_#lU^tf1iCHyyRl9E&>zM18 zC#?iEpYh6>(mpcBmUwkP#v#*Zk;r2xNlB-Mhr7io;IlK7N3 zt(>Ls#h>D#Yrk3^AMhD(KjO(N@`QMCwdLV>DUdcDbxlpB5SWv1zv{#O(Z0DNAPdHXND8+ zQ_J`W0%84uKk`t&Jl~G}Jyo9plYNlbgISq;4!iMdxDmVceJ-`Y?rjln(UnFH$KA5P zed&CvtUFfyJF~aKkC~|(25aCkuLfcMK2b3pZI+}FP=tGTRF*-~k3t$=kulc4aB3U8 z0HtYZtSvDSgM(=>E11=g-^R~5JU@&cZfdMLI+PvDr zba%WFXTFI-V^fonpvK7XK+@RL22J|;Or85NS{oOh#jgGSWZoPjo~SRf(mwIBS@?X8 zC8_C%aiRhVb+D;%y`;y1_~BTOfwPF!%@$7D^{#&!A1PKJHZ{b-Yl z*a6@BCL6a%9f?*aZ?QXexh2+1KLg1~w|IFr(|fGda0F#_)w?NrzwCJflSpF4gwNCW zw=wKRYH2aR-+6=o^ui*`%FCrAR1qmWq)dY6U=ZIP*2l9|feSj-wMt*-3-%8&g3NHZC-ZH}a@NvUuF=Cn zNdfwH-*h=!uq~WH{1ZO(C?dSJT)^(ek5sF)pgF^AxyD7Fj}~LCq;w)f4S#3X+ylGC z@aX93`3`joAw|~jxX5w0Sk(6MrmFq(YNDrir25YEo_{3~C9dUwa#syi?bkEc_;n9w z#S`E&~C<2GK3wpkyJz+R9 zol{`8epbx8p8o`7!x7xiC#=ra=KF=7MJf(wUS@Kh-*?t zF}gk9Zf@Uy5?5U}yH~;P0_L9@6E>RZJbFn@6vzt$WN4M=BN+uPaDV$p@6pEkYI9@b z`{r)jYs6bx5VLceC0$wO;%^Djv7OTy@aNu7l-}uzSBp5`rkq4QVF{HD-UgDl8HDx_vATz?!`d5 zthv_u8=RBZ6%qc)TtDUj#fVhoC7602M|bo+e>ij%ncqqHc^j}bkK!FM7RJAm_4oF6 z;{>@Qg0W4vIk~61bA&`hWUG#QkGAaUML5>?E2j$M1rMLCoy$=vMtjgzv*mQ?wo1XB z4Vo%lRKmzszP}BgM}2(3Btcm;pm6(!P1nA|c4!4@5r!LJE(fFZ9HsMk25#aVUf5`cZL4B0D0>HrAP;#$$WcqoWQoLRocuiUxwaZDVxq3CO|g zmRU1_6Br2|6Z^Sj%G z%XbBZgu@P%)ZmFvM>?3Pv)xvXhF6a42TPb^7!(*ZlXX z>Sa*o)qGyy5@^bdL8{SIFHgWR+k~G_-`=g*SRLFnqTFt2Y0(InGuWe%{2*O2 z2P(6wquHU9^!G_eU7~T8pOhJj)WVX>P|C@?4@xTZUL5lpI+Z;n6t-i3oRL8L#9wv2 zy0KfF2JN$>385Qn%aXbe3`R0`CUo|lAQXIe`nb))+q(!CXkcRU1m%AwTC{LYDnsep zn`?E;SH3K|>t#(%Ry)>&&{PlKqi+6i+(Ze+l7KB4Qo@vawtOvA(h$9Aw`5a%)igV$ z2>9HmEOTS$WBW%Oc)tIM2(XmgSJc)~wGBvo7 z+<62`HfTxYbr~&e7K?8^QmWwHjb@NIxpx?hWn|p6@So1kf~~#9!AZUobM099=1kcj znYX(-c-2lg;Y!`y)T&ZJnZWJ5V(Lm$mF&ElcIy65|LE~$=fY}hWDgzqk`^WUVs^x# zFsQ9bsk^|@5hc4<-Uf%tdPzKM8}@dkX+1;xF4_C+P}cFV(8>LgSgO}|D36Xv{+E{@ zqqdjNY(ED)42jy)@URNGS^Y0&H@@5@>fk%A!+~m4dT$Zmd#N3zZBRzsaB< zIq(0|?Bzvk)g8s2toj?NnBYJlakQ_xKd3zcD+ATPZp z3hnwuj@ztDp1V!~tim{xVqe-pWP=4c4obJ7E9=Be{ z`^88ws`710uA_dGl$WErp|-&UkC=Xio#)x~$`SFPYNN8)l^3NxCC17(8FWb+Uv$4G zEH17nSebh^Q>Xp`zirXw_mGD2p0xLM_xUJAbdGO*)5x=)^Kk;0W%9WG8)4ySB)I+te4&_D>^~(0I*QIpg2dk@a zW`yxc5rOvpilWynV5X#L-aqhaS>eWWh`LeXFN7V8vKR=MNR7l~ zBdJjQjF85H3U;b936p(go;Azk$rM63^2UXVENI87V3VbyxEz2z7rS)6`U}^Qu2tZ0 zHAFEPcx(-sFcNhlLD8`q>i?XF;!{<^@PQZ&sVLu$RP{tn;!QmL=6HM3A6E5y=&nEq zFiqr{m)E*~EDH#-raNne6Xks(qoWi2R1e2jrH?v(J%xFfj-$7!)18-(8lV_sy7kh> zXXaF))-V4R_|m?jlwKrZ`V4J|xo08Tccz~+UhTVR-Oi%Ow`QwnLO@l<54FD4wEcW=m*+F2wMKL7qdm5Fg$q8(ku<&#!`h$SSn94 z?bJ8ei$n!^)7q4p^499-yal6C)Ut(piIHgcUfe76Pg}y{Cr=J`r#~cKaP57AFBPL? z^j*!DbW0qc-QBJmw!^w4Sx=&J7wcI|kYCf5NDam_Nt6R46 z8jNiV<1R`ICmvIJ+^U`E9)Eez#H>6^P^CQVJ_O#Ii|@AJ-Hu*q-J6X*TjtUK^5tRt zmZ91BHxZ`h$u12?A?rPO6Yclm2M+~I?RW%pX<=jrzfyK?GN6QIjQco*EMLhM&D^Mk zM&v-$0gXM70)BLe66`m*{>w59C(`%&Fm;~`vGL{_Tv9KWQy`TL$F@zR$Ni?!*RR;N zs*aTZ$TyZp9(Q|cbHOZUVf$?Q($W$%RYuM=&>b36Zr6@r?p@Jv@(vlfrr1~|+oxo2 z7mXimSpS%*ODW&`oOt0Mpxsvat3@%g$q6px%kSg-=!7tIQV~;?7O5IqGfAQP`K?q# zbz#;7qK_nrsNgc%FExh0~pb0 z>+ReK)^G^4oY(-zarLV^S=+wk6jV>Q29C+5Y6Pe#D3~GnFRRpg_LrC7qW5VAzQIM$ zJN&D(Gokg5$DR6$b9?Kpa$4W+t%Aw{0nOjBxJ2G%gTB~cfCj8uN4yU!Oh7!Lwe2Qz zK>j?}zWxKJDsIlaI`_N@8f8k)U6>V{{ySDzqVXE5KZ~(y!!YCI6P^i8gtSPa)p6ZY zyYW3NUP8>N_7t^wkPWOW{R@Bh8W}@IJiex;_CzHvEjv>n%t4znjOZO`c ztw3SwD|8M+BSG(o!i9P*UFwCfG#uMq(6mlAj3>{%aH@Y`NKzgavqGwRU7Vs(!nO-b zRV}6rc5CiQ{4k-x?uFFqzOySwHFWWm~6*Llkk0-GQ~bUTuFWDHvNAzDMS`2mQj<;E9gZs(rtO@Fkdu zVI5+a48wQnkiROUq}M|IFo(xT`{aNLgtH~*GKd%(kI#sOM@5m!0+Sx~aoJ4`5Sga( z3Szo5+xJJ47rp2eMXW06EkPH~(31~fFqlJ!^v8%dZrlLjjBAG|HFPs1Af3f7+%+33 zIcVfd$iiDPNE>Mdg$|O>RfUo7R4Wh=q)1t!S|N6?Om?v_r2y|ddk)2~>DnuRLmN%U)UAT7?3xcds6SiFOg@9Yvk~L> zvMYtYk}G%N^{I^*;%9#gk0?FByRa|yy(O+=3Gc2>W6Z0k9(2h}R%s?ZZ>qrtG=pA7 zX^mLXd(1nF$s6}c8C_|7BNU*{5bSgp7GHYY(4e_?I{mZH(;cqf*Z>S8%RF6yB=lEF zq6|Sm%ewqVwqyFkj)wQ~G7Cvczk}!k&}gC*XTPNGxhT&$;nNf;e1OEIATxUI zct@)2dBnc{dKa{H%;dpfP*Xaat5jS%M6-Y2oct)6y+xN^@A5hQ`cS9+@?FcR(J(5j z)%w8!{m5995=^8SZ~=A(dM~YpD$6XUi`1<2(_4)i)jV9_tS((PTS))9$MW15 zcI$&K%{3P`#0j6u2`4tn5DGSfIuhh<$-EH0jx_g(`a__{nj0EE))&Bp6Z^%`_DAj= z4Sq;mij$mILk{FDA7sdwr^%7>byV9PP{S0bv{Z}ld4OJKKJ2jkt67{vqk$AFA$U<^ zz1hX7mr8Jc%?CnBI<;r{PPg8pzYPVq>$7HM2RkPwm$$CSFq%OUB8BJ>Ayn%Nf7?k!y&-@uv0Q`bSJ}!OHX4Ib=ACvYD?Yw$X(%~!wx*x&md*o2dnL0UEIlwV~PUuzy39=#{v?;R~{j%p{VF{8g&xBsk z>jM$elTgt2dwsI&Ic1Ai_UPy+#W>MuMCc@wW1@`O%~;7oxjc-y>=qn7z8btD z&miqwOnW0h5V))}k;K?JsR8p+Vk{(ess+rAK0a`U%p*n+7&JC8xKMmG3O#U!u5Oy% zY~h62qerj*t2(LE8WeIYHV$nw=R{Yuqn<^T5o{!5DSyB;=2OtM0vL@1BA4OVD=%n8 z^;t^qK(+84m_>OtRH@&%5G*b(o}Q8-XKL_}xUY_TUJbgbV30YlfEZ}ezZJHO+z!? z2jl|t6tn3*U<(Vuc6KQ^Ckckr4)f-!9mUPJXWi))73FPlNutAI<6kQS=0Sa@{6enx zjFRWv>9TBDq?M46O9jTWmx*!8dEd&ETUKM(r*yJ$2Zz`)(zPrq(C?3D#>`O7Pb8YSz((BO<h@s-$Svr%q(Tro#7Y#U)T<6HspO7bHCSXTyn6Zr_T=fY#Df z>*`En!ioD@bla4B^6h`*HA`V)h>hQuMfu8FB^gc`Ai<@p5_FJN0j{teT8#Z^o!=@0 zig8W{7*2-@+CkOs{UhuyCZq9jIE2nvICZd!$YM+2zqV~Q2Vc7Mk25jHreaF@Iq@mJ zBSp=nBjvHam6(l3=;O^12Z9@>xwjqHnf4%>YWj*5_Gc z=*+2pl^r!^oqX0BC*z-k>kyF_QzI9e_V+DNpB?N7>8%;mGG9zsm*zz^{xV}|=L|t~ zKs)RKjM%+@zdUJu_ntk_smMGpM{C{uuN^kH!|QxTmh~0#zg#vGP5Z;~iHRi~)y7rZKY~05hJ{R&SoP)xF+0T@ zN+R1*71t2^cbG8v#w*>j+hc1i#$$4q}k89M)A zc=)-R7bg!}7m?|QG+RD+e}q~(>Qh0suej-Laq%v61k3t;z~p@AtTUth1_I86Xk^ZH zc8!8db{mJdCA%cU0H^FD2()+vB5}@~E_?l!IIIdkLW1A1F}ONtc_4H%7_Q-=NReQ0 z@HDKDh}!hEzgfJU-?r3}g7&da^xybIWLC-WBZdSpkwgkikFBq9A%=RWR!?ahx84Ma zus}Qto+;@eb09{Rk26RdoLqYq9qf<@rR4Mx2Pa_+f;<;M*IJvcH`iQvf<|0aN^h>J z>)=IXKq&L=J*))E5*|^D0|=#neCRv<`7swF^73iAtcD9;t=Ef&VBlEwT6|oH$~JI& zfGsz{!;x3c(q->*@yGEZwmVzWtpMDER~KoBTZZis#4EEy@1%{M#KJgEc63=zuI;h# zgwrMZ2@m>GxJ(*cXuk-WKC@;Mqb`e3ipV55f{+R{(~uLvr36CJarfTW#aj?QPeoX~ zwpkoXVO@mKA9-b9pjsev?5SSbD8$EGUErQgXl-VL1A|VGVsKn*{7to5VKEg+6tJCb zBpJosxz_VwOD1q3f+DD!sr%JsmCCs@1cx{LAnahiq$Vk_r1MU<{5ad#(D3GZw-GXi z2+~wjl!%P!SF?0Xs;rd)UbGO_rRYi<1Q960`~dpMvSZgjUjuQSwp0f+k6bhe%i>Y9 zeiNS&1`M){$YRj$fwY!>ms?;UX#Ruc`Z-`|C>0ef^2|;azB}8(1zv?FVZgRuThD{^ zdl8@%?7>+ddnjkjeiV_~`ss=NQf9(RkWlQy|!5Ic{-1T$TGh(+35mlJ?gK{jJZx zzXPET{pS41$bSuN19-)Dmhs?Fa(?6`h{x{aS~3|&{Q0%dqhbb>!GuFf|GHZM2Zify zuQi+@V9#=!w&@gm_QOe3ts9fEI0nykm#yRMKsZWB*9r~Ewxe(@aWHbd#@mIn5vMrQ z!dJlnP+(I77C6S$tN|kJ@-%=wduEk4&;cOi`5FXKpiHnS7Fu{|G~S%;oJ1V}yEzXU zZ{{Fqh*2}pRj{{s2n#)So?}flnt|^toe2{UIUMyqMdR5Th(~Gae);Hp>^qcWXcIdo zH+zqWnlkj_Wy}*i#q(>sM!(F_T2qLOw^^<|`84XQ8&fo9<$N?+m`$m1hzt(sZCgpQ zF3?L<aDafFG0ajR`GzF1VX<45m3vu6AexVNrfcD8 z2dC`MLt27~ZS1r4&s8DT^cd)(SlgbeRYpZuR~OCh&wj@=1_OueZUYu)ntJlsf;HuLN_%XjBW^1tZUE0WS8zM^bRqN z76m-w_xD1oB8&j%3oKlNxt92mX#cfe%@jjuSsYLZujJ-oha=$EUsncmcX@sy>q|Zn zvYTw=+?l2cd(o#M%8I~nuF)vQj&J9A2m+_X2clP*)vF%wI@PvBIB`A2s_8c6nXaTX)&w7(jlVlAyr+!@~r&z0GHd& zk+Fx_xK2v`Th6}x1{^?u!J*rPZ$Z$<;;B}j5n9U1=a6OgqC+{WnSZ{m`s27wV?mAY zaxuz+N&+ISg`PxK@0MGfl|n4ox43CuW)&+9^Q$-8LS`YZOA}%0ugEwcB}FzeFHg28 z{|AgG)8ymQ5aD%1Li*cZBh9YfbK$hNJ}$7oht`glTS2uk&89=J+y@ji=0xPr^-Vfh zSKQ3QgngSXrU)SFm%VNjz?+VMPy}HIx{#eM-zjd4XumAPR5GUX+uuj9r(u&~w9c?v z!Q?-t_5&49dX5;{7aGm5@SURRp%6-Go^TPua}}VLAMx}<=X0VS|12yO6o`H8@JU)) z`u>sqh_iPdcHH>irS%LX-yx`h&uSyZwKmwsKvPYrM?WMOoDun$Z(qUo)JBe*S`J^u zLp-t%exRwJKWAI`QqQtQr#}YqAqzt2J8MugeYkUR+1Tq(6*mWKO5MImIleZA=Fhb2 z)J$*5*wuH%@ZtYfL`-^xc?qB=P+eFQ{kdiOx*nW}v3=`J0Ynr#pwG(o@A&)HdlTV) zS!k2QL3e}i_uU049y#X1VB%@9oe5X-CL4_ zLtNZGqR(oDLn^=3hIS%SoQ5YIrr@*=APR*8!TD6R+`LgG2%)chf{|sKyvSCWIT0Z) z9&}kC7N$lP$JwJM%@%oE8aTf+_1j+ zbD*jMBvTl+W+y9gpVGxzU{Am!#3dPu%|4}wpm1sp9khA2!osfsX=E+5CXGTFRUel) z*bsb@ZCNbMIsthQdboPyptN+=#>x*EOmQb`N<=g8H+cUr81n$*Xafwkc8}Wm5sJ|! zb92KSrlmTJISOU0lov=)Z5v?4Y>GT0RDw~g1VsT{3ZMdMdUTgO$f_)}R9KhFaB62S z=%$VVV}kHV^260zLBG4sz>7ZNLTEgs3hV{iG>aa_oFxzlY;cE19#92z;OXI!5m-D(_GQ+5lOA z>O)Fgi=+w&aRwpMPSL|$!J_r7T1Y@6GGvDbw!k`lEp<b%7 literal 0 HcmV?d00001 diff --git a/mpv.net/Misc/App.cs b/mpv.net/Misc/App.cs index 0623c4a..e785bf7 100644 --- a/mpv.net/Misc/App.cs +++ b/mpv.net/Misc/App.cs @@ -100,11 +100,6 @@ namespace mpvnet } } - public static void UnknownModule(string path) - { - Msg.ShowError("Failed to load script or extension", "Only scripts and extensions that ship with mpv.net are allowed in \\scripts or \\extensions.\n\nUser scripts or extensions have to use \\scripts or \\extensions.\n\nNever copy a new mpv.net version over a old mpv.net version.\n\nNever install a new mpv.net version on top of a old mpv.net version.\n\n" + path); - } - public static bool ProcessProperty(string name, string value) { switch (name) diff --git a/mpv.net/Misc/Command.cs b/mpv.net/Misc/Command.cs index 549360d..c803813 100644 --- a/mpv.net/Misc/Command.cs +++ b/mpv.net/Misc/Command.cs @@ -16,7 +16,7 @@ namespace mpvnet { switch (id) { - case "manage-file-associations": ManageFileAssociations(); break; + case "manage-file-associations": ManageFileAssociations(); break; // deprecated 2019 case "cycle-audio": CycleAudio(); break; case "load-audio": LoadAudio(); break; case "load-sub": LoadSubtitle(); break; diff --git a/mpv.net/Misc/Extension.cs b/mpv.net/Misc/Extension.cs index 4550e39..ad08a78 100644 --- a/mpv.net/Misc/Extension.cs +++ b/mpv.net/Misc/Extension.cs @@ -30,7 +30,7 @@ namespace mpvnet if (knownExtensions.Contains(Path.GetFileName(path))) catalog.Catalogs.Add(new DirectoryCatalog(path, "*Extension.dll")); else - App.UnknownModule(path); + Msg.ShowError("Failed to load extension", path + "\n\nOnly extensions that ship with mpv.net are allowed in \\extensions\n\nUser extensions have to use \\extensions\n\nNever copy or install a new mpv.net version over a old mpv.net version."); } } diff --git a/mpv.net/Properties/AssemblyInfo.cs b/mpv.net/Properties/AssemblyInfo.cs index aa80051..25c4b19 100644 --- a/mpv.net/Properties/AssemblyInfo.cs +++ b/mpv.net/Properties/AssemblyInfo.cs @@ -32,5 +32,5 @@ using System.Runtime.InteropServices; // You can specify all the values or you can default the Build and Revision Numbers // by using the '*' as shown below: // [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("5.0.0.0")] -[assembly: AssemblyFileVersion("5.0.0.0")] +[assembly: AssemblyVersion("5.1.0.0")] +[assembly: AssemblyFileVersion("5.1.0.0")] diff --git a/mpv.net/Resources/inputConf.txt b/mpv.net/Resources/inputConf.txt index e204c53..f34d777 100644 --- a/mpv.net/Resources/inputConf.txt +++ b/mpv.net/Resources/inputConf.txt @@ -150,6 +150,7 @@ F1 script-message mpv.net show-command-palette #menu: Tools > Show All Commands h script-message mpv.net show-history #menu: Tools > Show History + Ctrl+r script-message-to repl type "" #menu: Tools > Show REPL l ab-loop #menu: Tools > Set/clear A-B loop points L cycle-values loop-file "inf" "no" #menu: Tools > Toggle infinite file looping Ctrl+h cycle-values hwdec "auto" "no" #menu: Tools > Toggle Hardware Decoding diff --git a/mpv.net/WinForms/MainForm.cs b/mpv.net/WinForms/MainForm.cs index 2221bc2..cafef38 100644 --- a/mpv.net/WinForms/MainForm.cs +++ b/mpv.net/WinForms/MainForm.cs @@ -311,6 +311,9 @@ namespace mpvnet { if (WindowState != FormWindowState.Maximized || FormBorderStyle != FormBorderStyle.None) { + if (WindowState == FormWindowState.Maximized) + WindowState = FormWindowState.Minimized; + FormBorderStyle = FormBorderStyle.None; WindowState = FormWindowState.Maximized; } @@ -324,7 +327,7 @@ namespace mpvnet if (mp.Border) FormBorderStyle = FormBorderStyle.Sizable; else - FormBorderStyle = FormBorderStyle.None; + FormBorderStyle = FormBorderStyle.None; SetFormPosAndSize(); } diff --git a/mpv.net/mpv/mp.cs b/mpv.net/mpv/mp.cs index 4428407..36b166e 100644 --- a/mpv.net/mpv/mp.cs +++ b/mpv.net/mpv/mp.cs @@ -235,15 +235,12 @@ namespace mpvnet string[] startupScripts = Directory.GetFiles(PathHelp.StartupPath + "Scripts"); foreach (string path in startupScripts) - if (path.EndsWith(".lua") || path.EndsWith(".js")) - if (KnownScripts.Contains(Path.GetFileName(path))) - commandv("load-script", $"{path}"); - else - App.UnknownModule(path); + if ((path.EndsWith(".lua") || path.EndsWith(".js")) && KnownScripts.Contains(Path.GetFileName(path))) + commandv("load-script", $"{path}"); } } - public static string[] KnownScripts { get; } = { "osc-visibility.js", "show-playlist.js", "seek-show-position.py" }; + public static string[] KnownScripts { get; } = { "osc-visibility.js", "show-playlist.js", "seek-show-position.py", "repl.lua" }; public static void LoadScripts() { @@ -259,7 +256,7 @@ namespace mpvnet PowerShellScript.Init(path); } else - App.UnknownModule(path); + Msg.ShowError("Failed to load script", path + "\n\nOnly scripts that ship with mpv.net are allowed in \\scripts\n\nUser scripts have to use \\scripts\n\nNever copy or install a new mpv.net version over a old mpv.net version."); } }