From 0a6a282f20187311b0442513ed1f10e52ce22727 Mon Sep 17 00:00:00 2001 From: vspader Date: Sat, 8 Dec 2007 22:53:54 +0000 Subject: [PATCH] Added apple remote fix for leopard. Updated icons for m3u and pls formats. --- Icons/m3u.icns | Bin 54319 -> 54328 bytes Icons/pls.icns | Bin 53638 -> 53647 bytes ThirdParty/AppleRemote/AppleRemote.m | 56 +++++++++++++++++---------- 3 files changed, 35 insertions(+), 21 deletions(-) diff --git a/Icons/m3u.icns b/Icons/m3u.icns index 1f2bc6d8e5e2b4e6a588de905e461457cd9bdcab..3359bc15959584f84c4042afafda9e5be44874e1 100644 GIT binary patch delta 2770 zcmZveYfKy26~_k%B?(w0tKC#;Kcs4TF}A^v@!JMAFCfb+ERTddz=V*HV2mMv-#GX+evNHxjBT>X?HL1sq`C4) zKIiv8=N|d~=gR$EC3m_?_W$#<)8{a3@izne+e&{@au_ACL-1gnBvuIz_WLAO%siyA z^j9oQdUQ=HJ(?sA9Zh27%TgO>)@7Pup{->xnP%N?*NoBgCU!w)#<(r8KwvVtoi5Xs zfQeluxBG6lvrxdqZit=t?vFEx?broX+p!7sv%4`?!7)KYm&vuYr3J$(unLGxZ(_*2 z#hKX1a_`}@Zezu6J%-J?Fbvz}Acq+96b6DX1^g!dGsFeHBY;sr1Z%s%WGqBGG0VuZ zxGgNqw9Q!-mId1zyJpE>?58=|9FFIzs*as3!fH#hTDRVUfl@m&bt z3Ot*~v)LSIjseHs>X65v9M9u9HX8)^@#0M=QlGMZYGn>zQZ?}JPu_5-^cMym;ldg{4@um_X=`2Ials3sv&zT z{=iwd^Igw_dHa(quX;pSu>$!Bf5oI&ByAEZrz}?;s6&W-s6hTeU|P~WXSqkph`v&hnjCPkdVncTb-xtyv0^QXap}rXEE@H9w5m-M z<@c_j765ug^Wp?uZf!SoI>MX@?U)xy_*jV^C6e3(5id9Dv`=ERu0Pl^oO>o+lFVI2{Wi)fV8UOH-+bYV9*_q7*#ubmP)O` zHcY-uhtlg$1}u?!7+~L8GLH1{Yv|DW-v=}6Voh2j;-u4`r_cCI&@pem_oWjyNnL< zr4b&NUsop>ynSvO3Be}f{Ib=0pWi+)(I=?q_x^Vlp*F@Q;!T@<$wtkce;CCY#0IC~JQA+dt|q9)zu1UOAj5rHquz9SfS41}#U^B;pgj zCjd!aJ6-b{nL;jeT3cnp>kr%N+J?rz03t{3759)>D(-UHzm-XP7ln2Fr`9tCvg%!R z-Mulqykc)9B_p;0VfT#x5}YoHyne!0x#C@YVQ*7Nj86OVf;kG-Dp4YTkO)-z{XU;r z%~7;l+#}M#=gE3LwoijXA&MJh1p=d_-01bn`BGb^5o$Cj5+x#)A&PReD%%_Z|Cr*o z%?0$45BRKxgpe{fi? zd>oC0IlxK+J|qRRs8NijsfBh~#}YSM770xIjrO1+_F?6N`?HhIh#2Gl@iv61-ajgiXip zjz$=BA5o)(`pj~_N)=zaq69?K_wGdtM1zv*0kxW3JbaZiWROS=-M7RaKWhZP5W&aO z(@(y;c%k|kU>@jr^t#{4;hU04ffv_L8*%ocqC9}FkFk&`MKO9^B z3eH}FTyDZu>2x~mQ!nq4ENG;f1*dbkrOzA#`;{_xYal@QS>DbT*`pPv);3SWZCIp0TrlRo+Y;HBhgd0f zyByXOA1p?qAeY*|I?yaL`Z>N;U?na`z6p#WhwGT~&gz@5%t6N@pO;uEcD)w!F_s*z zW6QPX_Awtt1%Z`9otyDrnGA))V_j1o9#sr>CHy5m597WgkpHwN5^j)Fvib`Ybt)Jb z8Y=h_Ucd0AFCvjo<>4^(>r;TJ;P9}IaVDS$d3wHwBqNqKd5Ag{qJ~ETNCrfKV#+?H KV$kp*IsQM0H$_e_kNYcis8aY zW6_V<-<9uP)XH}!`@XR|`D^lNk(FyQna0>Czbs(5TrP*vy>6RbX0TTSfV)g4v%_i1 z2Qan^?2A2)T!O`9cDbA;*R5N(4UA*WcA8A9HpBy8x3N<0sw3ahf|Z(G#!?7av$0YW z_KJ;RUuT!D#{-8F*y}dt&J6^VNr&H6`!6|%al-+3W`?f?F!9C>n{8yfViq=LTIFo# zToilRj=9Kpiep?3CxhdA-raLxGtM;LSaf=sSs6OZtg-_ftZW0qU7lxX8qeTaI?Lx^ z*eexi46;{foU;rqXqsQ1Sy?W7u~8z&Gh7-9KnPBk3q>N~-tvtICII|2PUE>T_~m=c z%J%ZtE39%H$7!Y!o!#>;tnzh^GXrGkHICC64u`Y(HU4LqFxP+seR2WWR|`M|nqGlP z7!Hq8K)=kHcf7O}>FM(0GPADYboy1!1Amr>^Rn4=nwL(mth~mv zSq}c}X=a&$U&ryMG%pJ}%Dj!gAs~|_C$_o@_K}xMf5V-hx!KouXX3&6=aJG{~D3fwecMSGj zUN|nm-qN68(A}jaT1pjEU_{<1x^A5r_tgSvLZPsyCr^SCWQ+2~{G4Nn59OLrBpNZQ z^{v|GKxkUkqPppEyPnqPNHiAnUsS2c(MV)U*`mJf^UR?J0an6S|U=! z5_>V3@U`i6cjK{W5NYy&2cUE@Io7Ceb;RSb2vX<$HL0Q{O5dXWib$~HQ7+PgTZfiv zQg1ExH0cHsNg`1gLrnr~6L?ckcqw-BdZYGoVrgkHk%%(@!c)YP;#4Z!r_o$ZLZ3~G z$vA3;r`Dk-fB!Q5-R+_t@gYq{TZ{`{p|7f$+H#aLne$~13=b&q^PL4kB9G7O=#Vx@jq~#l>q%+<%%kxLqb)V^QGUPY{;h#5)pPd zL^+xo$yebuY|7Q9eeYn=~jIi}Paa@KuuR4n`u-#-CHDh7o%)dK#3^1(YF3n8(fMt9Vu7 zq5HS$&g_3@$Ic&oyl)H4AV`c)JWvq=Nv+Z}(t7sjAGz-zKJb3U9{|-QEtUsrp+qd^ znJ4-yxyNMPT{;~OM7%sTWzvbH5(&?2xxud|+J zne2j>f+1L5H>0y%3KTkYDIEIzfb@e;P6q-9DgVGgPJ!?#h0Y$GX!-eHFE|1Rfdqa? s4Gwx46#@#AWyHrv>%x{+WiW6s7#O_fM+zV+6jirX$iMv0w@AbP0gpf*FaQ7m diff --git a/Icons/pls.icns b/Icons/pls.icns index 51b9b4634080a05881a27306a5e4f301daca9650..b96122c8a98bae7d7c6dcd5ce7bf7d1467b7141f 100644 GIT binary patch delta 2814 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 diff --git a/ThirdParty/AppleRemote/AppleRemote.m b/ThirdParty/AppleRemote/AppleRemote.m index 8683a74af..d4bdb8dd1 100644 --- a/ThirdParty/AppleRemote/AppleRemote.m +++ b/ThirdParty/AppleRemote/AppleRemote.m @@ -62,24 +62,43 @@ const NSTimeInterval HOLD_RECOGNITION_TIME_INTERVAL=0.4; #pragma public interface +- (void) setCookieMappingInDictionary: (NSMutableDictionary*) _cookieToButtonMapping { + if (floor(NSAppKitVersionNumber) <= NSAppKitVersionNumber10_4) { + // 10.4.x Tiger + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Plus] forKey:@"14_12_11_6_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Minus] forKey:@"14_13_11_6_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"14_7_6_14_7_6_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"14_8_6_14_8_6_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"14_9_6_14_9_6_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"14_10_6_14_10_6_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"14_6_4_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"14_6_3_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"14_6_14_6_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Sleep] forKey:@"18_14_6_18_14_6_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"]; + } else { + // 10.5.x Leopard + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Plus] forKey:@"31_29_28_19_18_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Minus] forKey:@"31_30_28_19_18_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"31_20_19_18_31_20_19_18_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"31_21_19_18_31_21_19_18_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"31_22_19_18_31_22_19_18_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"31_23_19_18_31_23_19_18_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"31_19_18_4_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"31_19_18_3_2_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"31_19_18_31_19_18_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Sleep] forKey:@"35_31_19_18_35_31_19_18_"]; + [_cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"]; + } +} + - (id) init { if ( self = [super init] ) { openInExclusiveMode = YES; queue = NULL; hidDeviceInterface = NULL; cookieToButtonMapping = [[NSMutableDictionary alloc] init]; - - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Plus] forKey:@"14_12_11_6_"]; - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonVolume_Minus] forKey:@"14_13_11_6_"]; - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu] forKey:@"14_7_6_14_7_6_"]; - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay] forKey:@"14_8_6_14_8_6_"]; - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight] forKey:@"14_9_6_14_9_6_"]; - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft] forKey:@"14_10_6_14_10_6_"]; - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonRight_Hold] forKey:@"14_6_4_2_"]; - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonLeft_Hold] forKey:@"14_6_3_2_"]; - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonMenu_Hold] forKey:@"14_6_14_6_"]; - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteButtonPlay_Sleep] forKey:@"18_14_6_18_14_6_"]; - [cookieToButtonMapping setObject:[NSNumber numberWithInt:kRemoteControl_Switched] forKey:@"19_"]; + [self setCookieMappingInDictionary:cookieToButtonMapping]; /* defaults */ [self setSimulatesPlusMinusHold: YES]; @@ -476,15 +495,10 @@ static void QueueCallbackFunction(void* target, IOReturn result, void* refcon, //printf("%d %d %d\n", event.elementCookie, event.value, event.longValue); - if (REMOTE_SWITCH_COOKIE == (int)event.elementCookie) { - [remote setRemoteId: event.value]; - [remote handleEventWithCookieString: @"19_" sumOfValues: 0]; - } else { - if (((int)event.elementCookie)!=5) { - sumOfValues+=event.value; - [cookieString appendString:[NSString stringWithFormat:@"%d_", event.elementCookie]]; - } - } + if (((int)event.elementCookie)!=5) { + sumOfValues+=event.value; + [cookieString appendString:[NSString stringWithFormat:@"%d_", event.elementCookie]]; + } } [remote handleEventWithCookieString: cookieString sumOfValues: sumOfValues];