From ac53f70488ca668d67a8d522b526c902c7cc2760 Mon Sep 17 00:00:00 2001 From: lordmulder Date: Sun, 30 Jan 2011 22:19:53 +0100 Subject: [PATCH] Added playlist extensions to combobox in "file open" dialog. --- etc/Translation/Blank.ts | 4 ++++ etc/Translation/LameXP_DE.ts | 4 ++++ etc/Translation/LameXP_ES.ts | 4 ++++ etc/Translation/LameXP_FR.ts | 4 ++++ etc/Translation/LameXP_IT.ts | 4 ++++ res/localization/LameXP_DE.qm | Bin 49924 -> 50009 bytes src/Registry_Decoder.cpp | 7 ++++++- 7 files changed, 26 insertions(+), 1 deletion(-) diff --git a/etc/Translation/Blank.ts b/etc/Translation/Blank.ts index 92c475a6..e37edd2f 100644 --- a/etc/Translation/Blank.ts +++ b/etc/Translation/Blank.ts @@ -217,6 +217,10 @@ All supported types + + Playlists + + All files diff --git a/etc/Translation/LameXP_DE.ts b/etc/Translation/LameXP_DE.ts index 976aaead..f0c2c0f9 100644 --- a/etc/Translation/LameXP_DE.ts +++ b/etc/Translation/LameXP_DE.ts @@ -221,6 +221,10 @@ All files Alle Dateien + + Playlists + Wiedergabelisten + DropBox diff --git a/etc/Translation/LameXP_ES.ts b/etc/Translation/LameXP_ES.ts index 8db357a0..4347c696 100644 --- a/etc/Translation/LameXP_ES.ts +++ b/etc/Translation/LameXP_ES.ts @@ -222,6 +222,10 @@ All files Todos los archivos + + Playlists + + DropBox diff --git a/etc/Translation/LameXP_FR.ts b/etc/Translation/LameXP_FR.ts index b4730b6f..c1dffd1d 100644 --- a/etc/Translation/LameXP_FR.ts +++ b/etc/Translation/LameXP_FR.ts @@ -222,6 +222,10 @@ All files Tous les fichiers + + Playlists + + DropBox diff --git a/etc/Translation/LameXP_IT.ts b/etc/Translation/LameXP_IT.ts index 89767bcf..2a76e082 100644 --- a/etc/Translation/LameXP_IT.ts +++ b/etc/Translation/LameXP_IT.ts @@ -221,6 +221,10 @@ All files Tutti i files + + Playlists + + DropBox diff --git a/res/localization/LameXP_DE.qm b/res/localization/LameXP_DE.qm index 0424a77dffdf4fc701a33ee71a3daa27910459f2..685baeb5d0e5ce9a709765450861bc926d841291 100644 GIT binary patch delta 3091 zcmXX|d0dTY8@|qYw{za}o^y;C6h#v%q_KzWQ&aX(DN>TAh8UD>bfWByO64m;cG|3C z8Ce@l!MD_R16 zHIRJhCuljORQ^BwI;7)KK(jnZzn%f&eIdPG0NApkVGcjW7~a4=*%4TufKI+)Kqp7| zuF3+|0AIQt0T#K#@3;$4FaZ8-c(7}G_;<+$QtUt4wTD02LQf2wkO*YQWALekOsErr z%YOtSQW1PM7ufYXLXI=QiS`IJwS*1L?|t}zmG2Nbu_G`&A7h+u^I#FiB!3TNbwkvy z4#3iNNN5%ZjC8`xCY^ze$o&s{hSCJu>F{>!I9R0=Sf|oq*|b8psx3JcOX~L4Uz<)OOS3{ z;4VPdNf$A!G2paXmtIE)>u&4v-)sV+(sb21zXLv_b-!IFG6TzXHP?uwbDr*+=_K&U zL*4UkKLCXjbJNhOkPy1|I+#wFk^x~I{qlIw}pO+ zR0rrs>z5fBQ0P{DexDeiL%M!PDtWTvn7-Jt32U3E-yiABb3636TYd#J|JN>?rLXfR zN1`t3-%e$~!!iWJt*5}ISAxU5cfgLmf~PGo3}|py@Z97<3!&q}%|KgG@D^W?m=OHz zJOQ^nVPvI_q`WVTvP?TCL|L$%QW;S?lJ%za+)}w?p z@gWl(Dr~Ar1Cp)^g>M)@UW#BVD)R+aH4%y{KL<*>2nSz(Lbfjv$}27agFh3_SCt@GmnbWdxt?LQ69hqzM3amp7;SBFNpP?u4d`}62EZu0tVTMUv%#d z6c>tt^S%Z8)P1yt*ThKo%-XkjE9EXN z0MgQ=^^f&rb)uB-+Y*>iC~Z5x5m-D>Dp*co+U_Eq=v>L#8l|$y2Piz>N>!IKfzkg+ z)n0ShzL%xniu(Yq-J~09iNH30skZ-Aa%P59SNw|oKWDuxWbOeP*2>oEb-?Cxva^+t z4ecSjiV?tqS8|5}Dp`*hxqp2Ime5olu#$qbxK#FYBtlDe%l<`&fXtn8$QqW?|Ajnm z4+C8qAV-WNayygd`Na&dSdsG!J%IE|x$qn6$2c$fc>h}Vzujp0w9_p@njoKTM<^q| zmMe!b!?w5Ns%K>VssQ=ggE(NJoBT%vN!ZO@el@lQFlmmWdjCLD4pHpXUL_ohh2iZT?A%O=}lC_hUpRU5AR+f#Bk8yU?MF6e3jHY_oIS4_M1Z{xN(B-hY%2JlW6tgy;@-GYqiF?32R-c-bmlX3?%iA-vTPxCG~OMA(AOk{j)8hOYe|b zY-nU#V(M`85vTZbQx7w*lUADgw>`z-Jk{iz%J62iGDVqKfHo6MQI{`rgqclqL*3}b z(UfA*SosLkDve?6Nic1^!TkkErY%KxsjFV56ZLnH2%@PhyP8cMYr3GZ(Dn|dN(T?h zT$$-`n{%2zrlM_=KpIe zwK?UFC|iP)mei&NBfhCEDSAXXTB2q2Are6)TFx{wz+%*L8;oYJ1ZdlGS971NZI3Pi zyfU<+=iN#1JnhsK;@x&6trzV|tvuhtrY_fRMX@Kn<1IhQ%UMy@#xk@k_s=1zU z-E8mtl(LmE$n1GGj{5i3?3GT4JO5!0&#B@CpPD1q{zx^E%+ptpNh_L~vqv}r?b@63 z6f(e?X5Lhv7l-|1KJw{o&e9ZIFMR3v@9G(el>k$$(fNtP3dS^SAQ>eDV8lML1a+1rPd)4_`0v9?oI{w zPq92SvtZvwT3+^Qz;r_`FSB`Wd6d>FeCct;qN&#a>w zO=px1twABz$(S`gtq~je0XMDDlifKFyscm5)&oAvw8jLVVMjPwXJ?S2p+VNUi{Aj| zC~JNT;t+JvT5@g(J8h5k;7l@MqQA9l*?dyC)_Q7V3%1QlK4Wj8`{) AoB#j- delta 3104 zcmXX|d0b8T8-DJ+=iGDGb4_Inr3jU!l%mEOHD!b>Axe~{eq=4%jN7zPXi-s?MAj71 zjBV@f;tq{sb0e&73eh>g3x2Bl%FNA6bz<(t~ zU*-w!2XO`epPUWxL?qB|J;Yzm0`uNNe3uBAbFE>Ve4I7xfm4zVu+b6jexZQdCHSq* z1=d#J3&*2CN#KwcLNJDmcg-^aMB zAA#`x7N0mKK;O|y$G4+2Fx9WiMDr%L>ML}eGlY3Mr3(U zAZ;Y#+rd+8J<(Q?yKI0CqJh`tNW8^7kvg6jkh0rwAKc z4k+9e;UiiBw!;)zkC>n^Us3eFn4Jt#)aL&I_!<z*rBZ!nJ(#ezo+R%!0M0E)|0ZN6z__OhIn}~ zZ>TW#o3DWZ8=B&-EMa<^Kwv_JS(p=-4SZiOB$?g-y*mg?R}rcncZIZaB9ST!`Tj=$ z_ccv1)mPYBx|9V^61Ghy`PSD7yF#f7rxKx5V&QAUg|bSrKF(P<((sZE#0sa{ll@D7 z5Kce72+Ub5oE^#hv+{*Y(WsbWGWHs;z| zg{Fz>@Gv5`$3y*X84D~utS;Ks9mq;i@0v~j2z{bH;nP6Y5SkupIEnLj^6lLHgX6d9yD_lP{ZR0{woH;zvxOqeV*b z*)Qqo;6e_pkoL+P#qulC!8b9$LKms3hZC^IQ>r&V;A{gLq?^Z+ zX{|}p-OPW1L4Qm4LpQOIThimhRK<`M(hEHkYvVQQ8%#82y2kn*M`ki;IyPr#D;8)x zgDp8SOHH4)CxH&XX}kvnGH;Y-P|-13?KMr{zQ372P%}o+d~Ay~nIBF8TTg28a`ys@muL!Z3v{ejnq6UebifKt)piAkGqs7HGO)>8yRwXN!w&8CMI_a5AMMT;tXLDOJrWSbQSH}Ozvqj+ zR%x%sWB@@kwRJH;yl$_3XiKENF={^ywV|&_I`Q2lAO<@3cj0uvL|tEX9o6fyTMwVQ~jweGB%4ehnmRksNM zT1V-wJZK;ylXmOs>|1ljDY{!(#Xz5fx_kbKlv$eY*?P*#)m8VZE1}E0s~5M_0O|>P zZ9Yk;wrh%Z-uj-$o&wW$>b;FDKwPEw>3SL%-9hiSf(6gLu8-7nB+f1Mk=L$pnHlwq zLmatnFX@wI1NHA|rC)7eW&0fUn{V+ziJN|F>3z=TiTtA>W(!;~_?}FH=`$dE5lsnKO)zGf+5utu*u$e@1uDNIE{O%5o>9E1W z!UAY>*5JS5A$NtPAz*?l^*{KgA;?6MISn%ejm-d7-EN8%R}5o6lBDwx!?-1*nYi9C z_ZDB2?EYU&F)XTj${lHINN~2}PRKJXE9Lc4Z$tI~A`u*J$e%+_$XY{z)p)8#G;A+e z%f=2Fc0}za(t{19|CqgKiNg)2uX6-lCB{CCLkv|#GWA_$xD!cv>e39)WfrpWjp21l zbAAsx8a1`Nj>tAz+rJ>2|24XtkEIiq8~bDt;$9n#lk+cgnN=CXH*i#&4jSiXkXtK% zG3Jf3VgB33^%6N@$}|?6E%@Tl#m1v87ILlXjAv|4^20O5cxm(R^z01d!&o1F>G&C+ znfQVpZpME-Xeb@e$hN8B^a%&q(Y^}{v6P+7-MPH0ika*~tTkUZkq3 zX*X_ip+yBb zeOTU_985|rl^fbDp_u-XAKj~FdG_+3MpxkL7V?{ZR_tGv-{kS!@>V9}(Gu>&g{Jl~ z3ETv0P4R=kvaxRVjCsXhQmSbM~%oM(fH*nh&HN%Ok;<@Rof@btF zUsLqBv;1bQF)hp{XG3(R#Y^7<#z<3<9dQX>X4-urkYbE99h_gt53LWT%JgsPYq_S= zo9#HL-%Z!{(@z7mrt2!1dHhYcj_`T?ZqtK#XP~m0Bv8k|j H?w|jER #include +static const char *g_playlistExt = "*.m3u *.m3u8 *.pls *.asx *.wpl"; + #define PROBE_DECODER(DEC) if(DEC::isDecoderAvailable() && DEC::isFormatSupported(containerType, containerProfile, formatType, formatProfile, formatVersion)) { return new DEC(); } #define GET_FILETYPES(DEC) (DEC::isDecoderAvailable() ? DEC::supportedTypes() : QStringList()) @@ -83,6 +85,7 @@ QStringList DecoderRegistry::getSupportedTypes(void) types << GET_FILETYPES(ADPCMDecoder); QStringList extensions; + extensions << QString(g_playlistExt).split(" ", QString::SkipEmptyParts); QRegExp regExp("\\((.+)\\)", Qt::CaseInsensitive); for(int i = 0; i < types.count(); i++) @@ -92,7 +95,7 @@ QStringList DecoderRegistry::getSupportedTypes(void) extensions << regExp.cap(1).split(" ", QString::SkipEmptyParts); } } - + if(!extensions.empty()) { extensions.removeDuplicates(); @@ -100,6 +103,8 @@ QStringList DecoderRegistry::getSupportedTypes(void) types.prepend(QString("%1 (%2)").arg(tr("All supported types"), extensions.join(" "))); } + types << QString("%1 (%2)").arg(tr("Playlists"), g_playlistExt); types << QString("%1 (*.*)").arg(tr("All files")); + return types; }