From 74ac69ed1acbcaf066e197973452aba7b0108cef Mon Sep 17 00:00:00 2001 From: Paul Giblock Date: Sun, 21 Sep 2008 00:19:48 +0000 Subject: [PATCH] Fix reference sharing in SF2 player git-svn-id: https://lmms.svn.sf.net/svnroot/lmms/trunk/lmms@1653 0778d3d1-df1d-0410-868b-ea421aaaa00d --- CMakeLists.txt | 2 +- ChangeLog | 13 +++++++++++++ plugins/sf2_player/sf2_player.cpp | 11 ++++++----- plugins/vibed/logo.png | Bin 5146 -> 4320 bytes 4 files changed, 20 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index eb8ce83bf..528f0154f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -197,7 +197,7 @@ IF(WANT_PULSEAUDIO) SET(STATUS_PULSEAUDIO "OK") ELSE(PULSEAUDIO_FOUND) SET(STATUS_PULSEAUDIO "not found, please install libpulse-dev (or similiar) " - "if your require Portaudio support") + "if your require PulseAudio support") ENDIF(PULSEAUDIO_FOUND) ENDIF(WANT_PULSEAUDIO) IF(NOT LMMS_HAVE_PULSEAUDIO) diff --git a/ChangeLog b/ChangeLog index 5408a80ba..eb1c945a0 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,16 @@ +2008-09-16 Paul Giblock + + * plugins/sf2_player/sf2_player.cpp: + Fix bug introduced in the last edit. Reference sharing was not working + at all because the check was performed with a different filename than + the insert + + * plugins/vibed/logo.png: + Add fabi's improved vibed logo + + * CMakeLists.txt: + Fix copy-and-paste error in a message + 2008-09-20 Tobias Doerffel * src/core/config_mgr.cpp: diff --git a/plugins/sf2_player/sf2_player.cpp b/plugins/sf2_player/sf2_player.cpp index 34db23800..9acf6824f 100644 --- a/plugins/sf2_player/sf2_player.cpp +++ b/plugins/sf2_player/sf2_player.cpp @@ -323,6 +323,7 @@ void sf2Instrument::openFile( const QString & _sf2File ) // Used for loading file char * sf2Ascii = qstrdup( qPrintable( sampleBuffer::tryToMakeAbsolute( _sf2File ) ) ); + QString relativePath = sampleBuffer::tryToMakeRelative( _sf2File ); // free reference to soundfont if one is selected freeFont(); @@ -331,12 +332,12 @@ void sf2Instrument::openFile( const QString & _sf2File ) s_fontsMutex.lock(); // Increment Reference - if( s_fonts.contains( _sf2File ) ) + if( s_fonts.contains( relativePath ) ) { QTextStream cout( stdout, QIODevice::WriteOnly ); - cout << "Using existing reference to " << _sf2File << endl; + cout << "Using existing reference to " << relativePath << endl; - m_font = s_fonts[ _sf2File ]; + m_font = s_fonts[ relativePath ]; m_font->refCount++; @@ -352,7 +353,7 @@ void sf2Instrument::openFile( const QString & _sf2File ) { // Grab this sf from the top of the stack and add to list m_font = new sf2Font( fluid_synth_get_sfont( m_synth, 0 ) ); - s_fonts.insert( sampleBuffer::tryToMakeRelative( _sf2File ), m_font ); + s_fonts.insert( relativePath, m_font ); } else { @@ -369,7 +370,7 @@ void sf2Instrument::openFile( const QString & _sf2File ) // someone resolves a missing file //m_patchNum.setValue( 0 ); //m_bankNum.setValue( 0 ); - m_filename = sampleBuffer::tryToMakeRelative( _sf2File ); + m_filename = relativePath; emit fileChanged(); } diff --git a/plugins/vibed/logo.png b/plugins/vibed/logo.png index e2b39135c12df79dcab854e660f95b208b5eb417..6b935574bbf598b76570decd26bbf17ce8cc0b2d 100644 GIT binary patch literal 4320 zcmV<65FhV}P)Px#24YJ`L;(K){{a7>y{D4^000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iOS| z6Dcw4Diost01#kFL_t(&-tAghj9kZcJ-4df+RJp$-kKS1W6CBe%cLaB1`HS!AlOD= z=OYFL*;KBLFl#JuLD2c*E!sI@3)CI*Z(V}J4IfA-ax?2%_US5c=p+6>G<*E?E3ZV z%=djij^jvL-k)hZ_PNhLmHwi3korIIrFgd;SbODnp15#f`jXFxEF=QPY^_#97=~$@ zrWye1^}0yYG%Oa2IcaS_LolwaJG5StPwf5T??=1MyK(6i^_hpCO5Zs@J?04}17=LC z)iO#cv%0#@Mg0q(lljhnzClIDTEM0Dfrgvm>3m2!TS{DbGyyyl68CRK)et~K}O6uXpJn( zNGav+zV@pE4t&MZs-d?-WXt>42#oK=i z0Bq_9*&h*MkkdN(oLm%eQOb#6us`k_AL<*P80i~Km*2G=N%Rb_IKqf{1nAgt=C@j@ z&zKR6F|M^X03d|mM8sQJ<_jMB&bgQg5e9_{+YLava^9Ywdtz{IrTVG))#^iQ8?EYA zQ_Dmet&Ah%;GDx6fWHv{0<=~JTz=wDGyrXYBmuTkhsB!2^|d<2)(DVI0B$>R-5zmy z50X|h7e#&u>q5?%aL#aRE%SY!06=Ta0C3^B2kSy1c(A#(S;!CW-$g$bCQH4O)3rwy zS8I>d8WJjVu#UlPTb2Mc=l%*n(EeujxmTcSE4Sxx?NE(%$c#avGUNyLB3Zk#W4+wa z$7t^6jiPgin8$nozGh7H_4N^Bj5Ee~Utb?-#)Nau182Uqi09{T6r;iYboYF%TNjZZ z+>cac$h3iR7OoT19i!G(F#Fsq+a6G`>Kfg8b=EM#FqBu?q z^K(T41q9|hXFYC=kWvb*HPc!%DW%}X2mn4O9vEYT#fA9-i$`|=SiO7#EE@VfQJw_(*a0Ez)H0M_{W=@%f^=esYo&cPT9r8E+mAzhu>Nx6t=X}y*Q5P(?V z825}}!dlCsC}L3*F>5U|h6zg~ED$ix{gusD9z56qKyJNQ`Uuk&$(68EJzw)!;Vm_@H-eCOqey3qkN1k?=flA%xgI2ZRvq z?}+=Hkq@|VEAe+8jLyI#cSk;Un}M#hS-bM8@B7yPq}^%MB}r1Hl{cP;QE7LfVXZ@^ zEz(RQ9vFw*xVH1qF>yeQ`HZm;V7_zCV~hzR;zYz*NB`Pdk2nj6F~4bJe~128FC#a& zA5t1RVvBQAllf)jw-o|Ajy{ z3qbC665B8gH%0Zr_jdDv%nVWuG?u1!04Ply!|JW&BI6=3jzaFZpAq@n63U2t?znHk zBF06qytLF;8b7vUo@8wnNoJukyHo$pI~wEw6s*1mxzzZ6COf z4>AL(447%{SU4K}B)fRw-2vw)7Q{o#CO5dnUPZy*yoA*c`A9v4x9ZU1*F66yO8!jWGeN3qc4CT<+RJbpT$zCj+U?8!k7nA8BTg z83%h;`r*x+Cjs07pm(i>wquQ=sNrp$`yQM%+di<)K^qI1Sp@wb!`kfYJJR2VDi#P7 zan3_xJTOE;SnFA9Jwqgj@qn0!7_o3e6$?A^|CLiDN_!zQ3vJwO|Fxsal(%*I#W;?e zcc;M}waC7G`_dTI^DMn}rPl`zDl<@4ptf*shm5?T!`wKVW5SCVQ7DA)jbVW?ED%EY zj3^YI2#v8hfB47_12BO?|p*q)<1I^ zX=Xd+!}hwJEZ2JP)m$#Ob^Q2odtU%kQ&X;7F1MoExtHLww3`L3EmCce>)(s4w$MYR zC{6Oq7cUP26f?#mvJ{}>0kRY@#v*{?*_kVYqVE9j)&F%D4^DRUZ((g$&1lkkR6F}J z5jCf#rrdo20C1zDqe(I5S4FaP{*Dg-Z5*WP_~7ary}QT+<~D6VG0G8mum#8XHSt=J^-m)NB>>BpUj^Ld~fdIhaXnEl>xif?k1`E0>UF z1l38OwySIpnwMWJm&^6tgSeD6&MMB?`e=OvK}Qy-_SoJjU*>e+U+-YHyCQcNk#V=6pfVy-_NaTK9@`R{&E} zQ||G{AJ3vFTJqERx3=Rn7Ra+Hgg2VVn&p^ zc;Wm|aqO`k={1(#MRDvXl5YKXhM&xx%H?t^k3RaS-cA4S$AGI;DyCAY)Z)hZ@4{Kr z&dco@MM?)=+Kc52ulCmIxe+$|-rN8Y#oXgD=dAt1cnqTW%JszoiiTKk|N9y!zo%XQ z>$ZHHbAZ!Xp>_Vd`Fy@!sZ`9aW$^n+2mmG~CX$k$oD*v83W#8B+Xpf;Xi1B#wy@)# z4m-@|=kr7a~Uxc|jsZVZYZC ze6oS4yr(UnthfFTldC`O>+9PLg1~$z08>*_u2QMEk&%&lSzdUFOj2$42kpZql?Ku1 zr?7hYXT6~JK1oYUOJyN=o(o>&oEL@Q`Gv*#a(UlpsJDIm8N$&=k#q_;Yb_iBOxIQi z%Bd@V|@ox0s88;evKBu1b*cY0@KI{oWGB2nPN zD{$@=h%%#h26wcLAAQo&xBv*UQk-!*yxY;ePEy^)=5u?~FFq0GYN(WQK+Wh z4(;P#;;)@JSz+8SG47XMJ8`m7{MggHTb-)5fTjczrIBd^Yc1f6>1+JzJEc--y;7;@ z>FMeB)&GMquzj;Vc<^9jFl_uhkPDZbH89pdDvd^(p|Iyk)aK82&FbU)0xwIMm88r{ z7jH!+usaE8>-sNI-1j*&5)G-^k58O)@LD%642I3OCnqPHU2Wt00uT@K7NkREHak1J zoL@Qp-Sv3?VPg!bOrx1iy?kJYu{So4a ze+$iO11i%n#=zRl7V2+*zdT%CnV6W!jvP7So_Xe(`$~x4?}C#jPvY?5!vH|lYSqcD z8;vFgk7mJeg_rT%Fxq=sj@bg2RW0|9P@QbW4`32_a&N8*R(=e7$LqDqZ1gTWe znL^ZKo)cX8>EEJs_^a5eXJ{oERAyj} zL1FXF{~XA_BK&>f}Dg|RQ@N{8uxOw8a@$vDciHV79JNWx$p9l6pw-=5dKMnv? zDwXuc`nqgZmx5;Qk2 zsf1DrR!Q5x{K7v?4DeTv9Xqz>`@R8SI>A2>0Pz7NwB06IrIa2S8Cl)fxcGx??bXTJ z@NaxYDo*tlhXtWfeiHCByLR?JwIc>L@_F9M1ZrCn%|t@V3`R-YxB7z@2i&!n$HqRn zs+7_XnmRue1Klh{QG_^-ZJMSnb?co~V{9o6Cnv2V(#Am<2dOz^Fv?Of!fJ^_y`|7f z6_m=Lm9)i`@4wVvfBjnr4jg!Qa&od!DwQ+<`=HYKFbwptP%IYBfddD&q?D)i&7XY3 zLa@frm%d;L(AFX48jLs`2+mp3m=S^iluMqVt#sTzo zg4zOb6Tl?^D*#&C{l+c_=KmUid(FWC!~lXWhIQwqMACUD_mP6`9{&x`bb520x`Ial O0000|*63a_MEGMKK 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 IM6N<$f>M3qE&u=k