From ce53e8740d039e4edb4f259f9fb89e935faaccd2 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Felix=20Paul=20K=C3=BChne?= Date: Thu, 6 Oct 2005 16:00:01 +0000 Subject: [PATCH] * intf.m: -make sure that objects like o_open, o_wizard, etc. get released in any case -trigger the extended-panel to collapse completely before saving its position -save the prefs, if the extended-panel changed them previously (refs #382) * extended.m: minor cleanups to make the stuff above possible (more cleanup needed, will follow later on) * extended.nib & #.m: don't let the normvol-slider become zero, but use floats from 0.1 to 10.0 only --- .../English.lproj/Extended.nib/info.nib | 3 +- .../Extended.nib/keyedobjects.nib | Bin 20145 -> 20156 bytes modules/gui/macosx/extended.h | 4 + modules/gui/macosx/extended.m | 79 ++++++++++-------- modules/gui/macosx/intf.m | 40 ++++++--- 5 files changed, 80 insertions(+), 46 deletions(-) diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib b/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib index 6bc91190bd..ceb2178a2b 100644 --- a/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib +++ b/extras/MacOSX/Resources/English.lproj/Extended.nib/info.nib @@ -7,7 +7,7 @@ IBEditorPositions 13 - 506 668 390 138 0 0 1440 878 + 525 535 390 138 0 0 1440 878 32 525 487 390 233 0 0 1440 878 5 @@ -23,6 +23,7 @@ 18 32 + 13 IBSystem Version 8C46 diff --git a/extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib b/extras/MacOSX/Resources/English.lproj/Extended.nib/keyedobjects.nib index 40154ec3a423e34ce174307847e5657ae9175723..9b779b814baa425548912a39704e18ee5ccdac84 100644 GIT binary patch delta 7739 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 aCAW*)`{tipB#HY5xXE(gOuYTc9seIW@t@WJ delta 7652 zcmb7o2Xqrh+wSbntR#xf(u~!6uPd!=uh0@8KmeO&45652Y=>e@Gc|x#K;R>QAzn&C z3)se(-U%T*p8*(4HpFBkVOdckWlPAb?T!d|d9{0R1g zgJ3=s;AHqI{44?&z$LH*mclZ)0+z#da6Q}%x5KaDPWUa{2Y-Y=!QbFfcnY3|7vUv% z72bh&;dA&B{)N}SLL`ESLbXs`Bu83gLoQf?7`OuY;X0IpLZ}I9idv!8r~^tz-B2d# zfw7)=S2oH;Lr?*Vj71SN1x-bTXcn4>=A)&k7?t2frFhXQv<9t3>(F|%0c}KE&{nhq zeS`L(z32e?0sV}AK}XT==p;IY&Y|<@GP;6pqFd-bdVrpyXXq7rO_3C&WK=aOo~lLF zqv}%%N=fM`J!PS+l#6mx{s8fqncB#sZ^>x)q(0veMn_eJ*X_IFV&Cg zPvucVsbSP8YBX-+ahr(SRNQ7zpHW5BeCl&*F|~v$p-QQh)GBH{wSn47ZKJ-Sc2aw( zebf)sLFyOkF!eii3}dHoJBQn!xJ9nx%N^<=^@w^-y`cW4-bj#yl2n(}kkFFak_1Tu zNvfocBq~`iIV(9QIZpt|1<6IpCCQ(X%ecP+iX>O@+-1o%$#sI1+>qRq+``yx$sNfR z$z91k$$iNK$wSE_y!Nr=iR39>^Gxy_uX`bRDfvtCSBm77YK&!sPytkt81mDyx=nM3A;k7X{ITjr5@Wj+}r^UDHooQ#zPWl6GR zQ9ufD5wcU=Wj$qmHe+V%Hu#JjM}&zW5dtT`Nx>nE5k|_4ja!Km>KWt7F#b*k+rigF z2Xd--Gto%Q5aZ<;X>-YWU?wOOCJD=h0Ydc?U=ElI=7ISj0r<%UBI(NLxr&d-Cc$56$dJsRQryI2ZzZY$P#g@;{6Kzw<`RYNGY4c(`0GI?rf!@0=-m) zUJ*r%-XfP*pbwSy3iMGG`c$;3n!{IQnK(qn#}J4r5hxXRU?h%QQL#_1uFx3PuR;^W z7V74NrbsOpm#fnl8?;w=XGN5Vi@E14bVCpHLLX$H9|j-`gD?psz+{*LIq(|{i8@Wa z%}JW-1kp-tqOIF14R~N%*iKk0fG8mqc2>9!b^udKVLI#xGhioSov=kXEj$sj{|Ebh z1K0>Qfz8ns zQ*mo2e1%myhFg`o(_`w+fHPqsoF!}*eh>}`M}+J%65MN#b(<0bUsgtui_H}kAh^70{6hZrEo7n5)cGCwe8q+@aX?00$T&WuOi~0xX6%# zi8u^ril+>=xEOZ43Ogyr8&jyW@Ej}@Q;jZrjG`;TW~^qM`hR=ojo3c01Kt*w8u?oH zuz{<=Avg;@21nr&@wTydpOx@$A|3%E6PzG8VV`hHFbXGyP^XOk1$jCDvQ0=j`@iu~ z84gJDPdK1zs5+_g9wc&KykvEe}x082QyFtj?i|(Ssb7DaH|XlqySS& zkP@koS~w?M6K?%KLILSeTuczbAtN#&^V?83kENXvE(@20KV`U5Qw@8YPK~%!#H7LWQLNa%)T);w$Mujm48@Ob2R#RAPOLFD{0)sdPDN zFQ!}gS{*B0j?`5yUt;OheI@FRU7q#U<&Uw;9|@uV4`+Y$*4YElK$KVE?EDI6x3wx# zhQ^G{7oPpw*&|>lGzxaY&VDXDi4p{^2UXtw7)&Wfl<14KL$G~y4L@cy*#*Qq*HkOOGYzktRD6!{BHlfYM zXtOxl9wfdJ*V$u-l3n6iy9b{u_KWcj11v>9iUEg<_*Lxf@Dj(x*$z7_Mt_Jq9Tr%I zE{aziX1E+(6XTqASdQ+9oYO`;60`7VJbED(Iz4a}dLw@8bU`&miFa{7j;bN5T~1g? z)fQ7-PNIQ0%H<-|VyVkU7{y;)X2LE$av2G)*uZTgf?{L01FEQo;vlz^Xd-^$b`c+l z2Qbn`yyrF(9mV<{BhgjlJT{`2nB{T794c4*%%hbIpazyu1I29~8_dU37d>8Bfcv^$ z2ONw0#@<9OLgj)|p?Z`^j}ong@G~Z>01zkir$5;V5m&g`4ea+iC@EoWEm*K@vMR!$zo85j}57C26BK>vIN@5R&W-WPNu;OP!3AKTBHQ4z%qQi zC`EB_0$2l9!gR0#b^@!()@VFf9s$K*DNd#xxCpHg@`NS$-82cmo#qM6gcrCpZ4o{Z zstXH*k@&53K?n=egcU+Qes|Rr#^Q38CU}J2xP)a0TA@fN#Pw*KkSVmsFXWau{kjOl zgx5l2!6L*9&!WVCDqa?nG?FPM84#?rFw(Zt#2HvU8}MQCCIBCtK+XlzaiYdyv**TU z$uOLNO_^RX!uNPC3>$;#u`h~?UGbW^xYTxx-N%qvBf}`aat%HtY{%NI5J+s@HhkTN z`(gDCaD=FCm!2y3){8>lh|8mFUKq`!OY<_s8W7Ih4PY(;;~?c=t!E}qg&gK9rOBU z=M3{RnN3Dy_aEG%e_lb(u;E?b&Ua}(x*#V%J0}}YH62k*|uXw≫`{d4lN z8HUMxyS8%h787SDt0Ue2+2*fU`4;r|qHF#8IZTgt$A0|SDtY*^-J4_&7%{w{)u28f z<#et%g)kphcK_PtXWoiqnHbVBQe|E28Sm(cP58%dj4+v`EVX(*l8CC|=Yf0;+{}3bv?+##$tzlp& z4zXe!Gg)8|Ck9yYrJM(F>>V>sY!+ zi4UWMDoP9zszr%0QKDUx$cYjy-p0u2im;H55yyruZSL8y8xiSF*QQPM1Ui-OOgrcn zbUHneu0=Pc+tLcU5#5>&(jmGU-JGsZH=(uk06IXsX`VLFPI?%fK-Z*wv_L1*L+Chq zEZu-kq*;0-olRG#?Q}PK6z!tN(+u5-9!%Gz$IubF1D!?dXcaw_ZbSE{yVCIy+De=0 zmUIT)jIKksr;T)DI*r!QVfq7FN~h58(-!(YT1k89hV(!>O6SpjdK{fZ=hCBT8$F56 zr1f+?x(2PLyU-jxoc7Qk(;ev?x?M$r$hv|lONH#p`^k*^c?C4QH9G4apDD~Z<aKOsLUKPCS| zepdce;Z(R4UIn8FD1wS)1*d4P$Wml0awCd^1g~xX;pfaQDs(HR5q1E)l@Y~HAeNZYP>3V@jX>MzyH)FtXo>Rsvs>VxWY>U-)3>c{G*>gO7_rirGbriW&rW{hTvM$|0U ztkP`J?9rUioYefGIjcDz(OlGA)?Cxv&^**U(LB?<)YjM9wTw2TeNWp&o372!cGh;) zcGqTW2WbauhiZpwM`%ZB=V<3?Ki4kMF4Qj3F4Y!mztNu2p3`2?UeaFHUe#XL-qpU* zA)Q1g)78*vbs4%oy5YKrZklesZnNHyHDe89O=G-~Hd>7>jjfGo#*^F+DatH9a@IG`%vr&0aHO z4w!@HWHVy5*>2fqIc<4nd13j>^4jvoN?7Bqw6(eQ18Xa5sm2Qz z=A7<~6gp=+i<~Q+JDfY6-#Yg?_d8EIZ#Zu`?>g^0AG)NjM3=&)c4=LDSJ2hM)zX#f zYU66>>f;*bDsYW*jd6YKDs+A6TIMQsmAT4YU%3vtescZd`qlND>#Xap>%Qxe>xt`` zn{d~0*K;>;%iT)1!`;x$yBoWkx|_K_jJW%`2e=2h2fK&5C%Nai=efUdFLW<(ZhO@Je;SYhxep;dU$$yvOL+I zT+bNKr=A&}S)L-#9M3Y(D$hpGkDk+>GoJIFOPUA>v!p5DRUq22=TDDN2Wr`{RfS>7V=9Pe`P3hyfKTJL)A_udoUliokP z=e!rZPkmBfHD66%EnjV)#h2{kd|}^vz9zm-zFc2F-#}l!Z-{TI?{nV*-(ufVU$Jks zZ>Mj!Z?A8^?|a`F-yPq*i0`5AvF|Ap&uAGvV`8j~ooU3hV>&PyOlPJGlgo@^#xUcU z35>uLGG8*wm{O*UDQC7a2bhD*A?7f1gt^H4$y{Y_Ft?aj%-?>(kNgsU1Has_@@xHi zzu(XLll>uo*x$zA&Y$k@cXD91zS4<_CuahXo6Q zBZH%ZV}s*@6M{l;VsLVBO7K6yPlGdpg~8duqTrn1yx`}-1;ItZCBdb^;$Ug8ELa{~ z60+AgvoX;;z@Nk@`SC*4ST znhcX`Cu@_P$tlULle;A6Bo9p&Fe`^0}d00XLEx z!+p$6-~?`BgqzGw<)(2nxI%6=SH#WX=5e2M3%MoSGOmOx552XDW*%00o-V)vx-X7i&-WlE< z-V@#z{w{nVd@%e|_~-E9@R9J*@UifT@X7G$@R{(r@P+WD@a6E;@b&P`@a^#3@cr<^ z@Z<2)@bmD?@T>6OJm5(l@e*FfSLbW;@jT7f;p_1Ud?K&lRlJ7R@dn<+TX-Aq;9a~Y z!uxnX&+6hOpUL;+d-GX*HlNG) z;|K70d_F&fAI2B(Bl*$%SbiKoffx9R{A7L#KZ~Eu7x4@EMf{h1Ilq!$!*AtxfQk=E RR`#-NP^dOE4e*nY^edPcE diff --git a/modules/gui/macosx/extended.h b/modules/gui/macosx/extended.h index b8ba09daf2..8b9e850c30 100644 --- a/modules/gui/macosx/extended.h +++ b/modules/gui/macosx/extended.h @@ -86,6 +86,8 @@ BOOL o_adjImg_expanded; BOOL o_audFlts_expanded; BOOL o_vidFlts_expanded; + + BOOL o_config_changed; } - (IBAction)adjImg_Enbl:(id)sender; @@ -102,6 +104,8 @@ - (IBAction)vidFlts_mrInfo:(id)sender; + (VLCExtended *)sharedInstance; +- (BOOL)getConfigChanged; +- (void)collapsAll; - (void)showPanel; - (void)initStrings; diff --git a/modules/gui/macosx/extended.m b/modules/gui/macosx/extended.m index f502328c64..32af2b9e67 100644 --- a/modules/gui/macosx/extended.m +++ b/modules/gui/macosx/extended.m @@ -166,6 +166,28 @@ static VLCExtended *_o_sharedInstance = nil; } } +- (void)collapsAll +{ + /* collaps all views so Cocoa saves the window position correctly */ + if( o_adjImg_expanded ) + { + [self extWin_exp_adjImg: nil]; + } + if( o_audFlts_expanded ) + { + [self extWin_exp_audFlts: nil]; + } + if( o_vidFlts_expanded ) + { + [self extWin_exp_vidFlts: nil]; + } +} + +- (BOOL)getConfigChanged +{ + return o_config_changed; +} + - (void)showPanel { /* get the correct slider values from the prefs, in case they were changed @@ -204,8 +226,11 @@ static VLCExtended *_o_sharedInstance = nil; [o_sld_gamma setIntValue: (int)(10 * f_value) ]; } - [o_sld_maxLevel setFloatValue: (config_GetFloat(p_intf, "norm-max-level") \ - * 10)]; + f_value = config_GetFloat( p_intf, "norm-max-level" ); + if( f_value > 0 && f_value < 10 ) + { + [o_sld_maxLevel setFloatValue: f_value ]; + } [o_sld_opaque setFloatValue: (config_GetFloat( p_intf, \ "macosx-opaqueness") * 100)]; @@ -316,6 +341,8 @@ static VLCExtended *_o_sharedInstance = nil; } vlc_object_release( p_vout ); } + + o_config_changed = YES; } /* change the opaqueness of the vouts */ @@ -359,6 +386,8 @@ static VLCExtended *_o_sharedInstance = nil; config_PutFloat( p_playlist , "macosx-opaqueness" , val.f_float ); vlc_object_release( p_playlist ); + + o_config_changed = YES; } - (IBAction)audFtls_hdphnVirt:(id)sender @@ -380,13 +409,12 @@ static VLCExtended *_o_sharedInstance = nil; VLC_OBJECT_AOUT, FIND_ANYWHERE); if( p_aout != NULL ) { - var_SetFloat( p_aout, "norm-max-level", [o_sld_maxLevel floatValue] / 10 ); + var_SetFloat( p_aout, "norm-max-level", [o_sld_maxLevel floatValue] ); vlc_object_release( p_aout ); } - else - { - config_PutFloat( p_intf, "norm-max-level", [o_sld_maxLevel floatValue] /10 ); - } + config_PutFloat( p_intf, "norm-max-level", [o_sld_maxLevel floatValue] ); + + o_config_changed = YES; } - (IBAction)audFtls_vlmeNorm:(id)sender @@ -652,11 +680,16 @@ static VLCExtended *_o_sharedInstance = nil; } free( psz_string ); + + o_config_changed = YES; } - (void)changeAFiltersString: (char *)psz_name onOrOff: (vlc_bool_t )b_add; { + /* copied from ../wxwidgets/extrapanel.cpp + * renamed to conform with Cocoa's rules */ + char *psz_parser, *psz_string; intf_thread_t * p_intf = VLCIntf; aout_instance_t * p_aout= (aout_instance_t *)vlc_object_find(p_intf, @@ -725,6 +758,8 @@ static VLCExtended *_o_sharedInstance = nil; vlc_object_release( p_aout ); } free( psz_string ); + + o_config_changed = YES; } - (void)savePrefs @@ -735,6 +770,9 @@ static VLCExtended *_o_sharedInstance = nil; FIND_ANYWHERE ); int returnedValue; + /* FIXME: we should only save the settings actually changed in this panel + * and no other. This would make the termination much quicker and is better + * for people who are using cmd-line-options (trac #382) -- FK (10/6/05) */ returnedValue = config_SaveConfigFile( p_playlist, NULL); if (returnedValue == 0) { @@ -745,31 +783,4 @@ static VLCExtended *_o_sharedInstance = nil; } vlc_object_release( p_playlist ); } - - -/***************************************************************************** - * delegate method - *****************************************************************************/ - -- (BOOL)applicationShouldTerminate:(NSWindow *)sender -{ - /* collaps all views so Cocoa saves the window position correctly */ - if( o_adjImg_expanded ) - { - [self extWin_exp_adjImg: nil]; - } - if( o_audFlts_expanded ) - { - [self extWin_exp_audFlts: nil]; - } - if( o_vidFlts_expanded ) - { - [self extWin_exp_vidFlts: nil]; - } - - /* save the prefs before shutting down */ - [self savePrefs]; - - return YES; -} @end diff --git a/modules/gui/macosx/intf.m b/modules/gui/macosx/intf.m index 650437603c..da34feb90d 100644 --- a/modules/gui/macosx/intf.m +++ b/modules/gui/macosx/intf.m @@ -432,17 +432,6 @@ static VLCMain *_o_sharedMainInstance = nil; nib_main_loaded = TRUE; } -- (void)dealloc -{ - [o_about release]; - [o_prefs release]; - [o_open release]; - [o_extended release]; - [o_bookmarks release]; - - [super dealloc]; -} - - (void)initStrings { [o_window setTitle: _NS("VLC - Controller")]; @@ -1413,6 +1402,35 @@ static VLCMain *_o_sharedMainInstance = nil; o_msg_lock = nil; } + /* save the prefs if they were changed in the extended panel */ + if (o_extended && [o_extended getConfigChanged]) + { + [o_extended savePrefs]; + } + + /* release some other objects here, because it isn't sure whether dealloc + * will be called later on -- FK (10/6/05) */ + if ( o_about ) + [o_about release]; + + if ( o_prefs ) + [o_prefs release]; + + if ( o_open ) + [o_open release]; + + if ( o_extended ) + { + [o_extended collapsAll]; + [o_extended release]; + } + + if ( o_bookmarks ) + [o_bookmarks release]; + + if ( o_wizard ) + [o_wizard release]; + /* write cached user defaults to disk */ [[NSUserDefaults standardUserDefaults] synchronize]; -- 2.39.2