From f64899a670b32999f4c9e5a658fb8cac3ed8c1ab Mon Sep 17 00:00:00 2001 From: qwerty2501 Date: Sat, 21 Jan 2012 22:28:40 +0900 Subject: [PATCH] 2012/01/21 22:28:40 --- nlib/nlib_nicoLive.c | 17 +++++++++-------- nlite.suo | Bin 91648 -> 92672 bytes 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/nlib/nlib_nicoLive.c b/nlib/nlib_nicoLive.c index 4671d11..5237840 100644 --- a/nlib/nlib_nicoLive.c +++ b/nlib/nlib_nicoLive.c @@ -121,7 +121,7 @@ static BOOL NicoLiveRecvChatLoop(NicoLiveStream_P self); /// ///ƒ‹[ƒv /// -static unsigned int loopCommon(NicoLiveStream_P self,WSAEVENT sendEvent,WSAEVENT resetEvent ,NicoLiveOnSend nicoLiveOnSend); +static unsigned int loopCommon(NicoLiveStream_P self,WSAEVENT sendEvent,WSAEVENT resetEvent ,NicoLiveOnSend nicoLiveOnSend,LPDWORD time); /// ///ƒRƒƒ“ƒg‰ðÍŠÖ” @@ -317,8 +317,9 @@ VOID NicoLiveStream_delete(NicoLiveStream_P* self){ /// VOID NicoLiveStream_setHeartBeatMsec(NicoLiveStream_P self,DWORD msec){ - WSASetEvent(self->chatManager.setHeartBeatTimeEvent); + self->chatManager.heartBeatTime = msec; + WSASetEvent(self->chatManager.setHeartBeatTimeEvent); return; } @@ -358,9 +359,9 @@ BOOL NicoLiveStream_getHeartBeatFlag(NicoLiveStream_P self){ /// VOID NicoLiveStream_setKeapALiveMsec(NicoLiveStream_P self,DWORD msec){ - WSASetEvent(self->chatManager.setKeepAliveTimeEvent); + self->chatManager.keepAliveTime = msec; - + WSASetEvent(self->chatManager.setKeepAliveTimeEvent); return; } @@ -1274,7 +1275,7 @@ static unsigned int WINAPI NicoLiveKeapALiveThread(void* lpBuffer){ NicoLiveStream_P self = (NicoLiveStream_P)lpBuffer; - rslt = loopCommon(self,self->chatManager.setKeepAliveTimeEvent,self->chatManager.resetEvents[2],self->chatManager.onKeepAlliveSend); + rslt = loopCommon(self,self->chatManager.setKeepAliveTimeEvent,self->chatManager.resetEvents[2],self->chatManager.onKeepAlliveSend,&self->chatManager.keepAliveTime); _endthreadex(rslt); @@ -1288,7 +1289,7 @@ static unsigned int WINAPI NicoLiveHeartBeatThread(void* lpBuffer){ NicoLiveStream_P self = (NicoLiveStream_P)lpBuffer; - rslt = loopCommon(self,self->chatManager.setHeartBeatTimeEvent,self->chatManager.resetEvents[1],self->chatManager.onHeartBeatSend); + rslt = loopCommon(self,self->chatManager.setHeartBeatTimeEvent,self->chatManager.resetEvents[1],self->chatManager.onHeartBeatSend,&self->chatManager.heartBeatTime); @@ -1296,7 +1297,7 @@ static unsigned int WINAPI NicoLiveHeartBeatThread(void* lpBuffer){ return rslt; } -static unsigned int loopCommon(NicoLiveStream_P self,WSAEVENT sendEvent,WSAEVENT resetEvent ,NicoLiveOnSend nicoLiveOnSend){ +static unsigned int loopCommon(NicoLiveStream_P self,WSAEVENT sendEvent,WSAEVENT resetEvent ,NicoLiveOnSend nicoLiveOnSend,LPDWORD time){ unsigned int rslt = 0; WSAEVENT events[3] = {self->chatManager.deleteEvent,self->chatManager.startEvent,self->chatManager.endEvent}; //ƒCƒxƒ“ƒg”z—ñ @@ -1340,7 +1341,7 @@ restart: while(TRUE){ WSAResetEvent(sendEvent); - endResult = WSAWaitForMultipleEvents(sizeof(streamEvent) / sizeof(streamEvent[0]),streamEvent,FALSE,self->chatManager.heartBeatTime,FALSE); + endResult = WSAWaitForMultipleEvents(sizeof(streamEvent) / sizeof(streamEvent[0]),streamEvent,FALSE,*time,FALSE); if(endResult == WSA_WAIT_TIMEOUT){ diff --git a/nlite.suo b/nlite.suo index e521e7dc4d0e54d043ce936938662218af933d3d..929804f709d8a296a2cfad61e77d18b0b522f7e7 100644 GIT binary patch delta 2242 zcmY*a4N%kP8UH^ai2*`LBIMA;5KuEvz=Urxb^$-y^*S3VqZI8Fuuid~wBQZ3(x5F0 z2qye0Z~eq&);h`*j3eh=-G$b3Uh8Sv^KQG{Y14L2EnW{i>g?SP_9UXRH}}81@ALV4 zpRd<-Md7-x7|trqoEo1qJ>9pXJsciHp$WnNXmRMI zg^e%7wS7xa-)+bGoFVGQu(1=)E~TP`b&sH>tpnOUdfJFz<<05NZ={cXTk|^zrQIe* zV#mciE&Ff6)dN;V4Qn{@W!@rWY%fQ7VKdCHTHv;6C=N##|B1TTT3c+Ew29@+{G9@& zHJr6ymz#I}ePh!zhKDOY41PQ~Z|I->8%kqG&K>@4)nL!@XEVRZKII#Cs1s=`&Xn)x zD4nK$RN1#Z@mUw~dCy;tfmf7toV`E<6DbBkpA`cYmB>1ySA;XRo-daJXRD#R@*(}p z_fw^Aq3Cmvnxn81H%8{dtWIFI88NMTF`mwVwR=9HzDV|*AI?T_uToYfp}4FR=DjLh z>U~=TmPImD$$5PbW}!!In}Gw|jM0vKhB9p2kKhklc2I@P_Fhg}mAwV7Z5pODa^TyL zU~~yr0fjTM1s6JxBIqeYU8`2Hm;oP&7;tV;b1t=f{tZVgj}fY{Ghk-g5~lS>WZavK zY#|oIy*oHANf_{$x!4|E*95Ic3%$FaZExa#H{6W|l_VKiJ5p553Q4Nr+PBr_!STM5 z9;aOc_Y#%(HjzvS*f!$yRWlY?HOgPI9*1FARmv`9Q!cMg-Bx>6%fME!$O#7PK}aNV zx+rZoN5_f{ce~(jNMJoRRv(-1JtW6{Pc~wD)l`gY2W<$Iuf)n@8kiq6A#hO7clc%` zc`7d^UrcW;adgk2@py^Xn}J=`70__7?;Te&I;(801RASk|JCgO1HS(584XgSw1K1l zPTyQ#YA{tRKg=vV7n-Ly!kY=a8CvA2m#ZeiUCj&qp(Mpw=Job_wtyL~!fp^30UXA(-T6{iYptmu2 zy8zAipXYjfWJd$nsZ?L;_)Us`3NM#6y^$hwtP5Aj>wFIPnFsEz1`c~3<~-=so#5*f zNo%EFOAXR%(pypk-nqfyc^HaPj+nwDPiW)lJTCv&ElPBhPN#(~j@}c+I$9upAo>i2 z6CGkeO?l#uoc4$v8nXHdCx)VMezL=FkD@hEaNS7tr>f{CkBYx^v*S|#WHfCinO72K z4XqKI=TdGQNhD){yd1|I5ub5-sU-8IvLY-0cI5Y{X?~a-f$<9iLz`MD0W0s4`CI-J zo5NtC#{!a6$otH&z+Xju6t(*q?jq7{m?lxhd-9LQ(FIcPeWGX&_|M0ag)sb)8S7uJ z=zhhb2v4jAF_uod5g0V_ZPsAy*6&4g0wr;?3>(vj40KtEfI35r8|k{djpZM|BCOTwfi7@?k6a7)%W1;t>EgYnu^EWYARYQR5Nv#$1v+i*dDVk^Kf$UvfFzLJgaB=FXd8El>h5g z8k70Qil~&Lshv&i`9CvudJ&(=ZDQO`W%B*gSh2|*;BiO26YStm6m4Rx%T_0~UXwlk*{(i|Esnr6lt^7E?gxXA6$F{{dLP B>8Jnz delta 2049 zcmY*ae^6BQ7Qbh?Tv0FUWu*;iU6y^t03t5S4|%jh>krJ~y@zB3NmOW>=CdSQA3p2B zLPoiQyYLad=@{r%Orz+8TWrl_t=cqAAZ2G;P8v+ci5piHC%BV3$+*K z5>^)nsfX>l5WOO!yjYRwS zUJ?h3D3v3c@k`wSL!$%=uI;J+gQ`M*)~764xJ%k7Jth59nu7Qs$8Y2d7oxhuhN}mS zv?kQr@ee{zZzUSv)aV4r@+O*IQ&Dud9b;t*+z-gm4ksbqXU6z83mS`?#HCeag?GO~ zeXRZpv`#+q4Z`7jkBdBn_QFz5p9_vI6K!IROhj{1rz4u^5Z~XgC!9gMu%fsPkzwl` zNzxeG5DI*6z*b}Av-$A*x6&Y^^&_y`jK&^?8m6&ZaiUv`!_lk_oSV{FacsBpl~VQ< zXHyG1eu_8KZaijoY+*9AVa#Ph^rC`If5}Dlc3oZ$fA8aBG>7&uQ&cqeI%h>l6MPy2mX*`MF@FMG&-2#Devg_Q6|}gvf{a?DruoxO{&wn1{;C zxzntlf@@=Pt5k{SFZiMx{>In|3 zi%;?!Lt|+)F}(493Vv^ZHvR!q?+jnTgQ{z0Lxk1PpfPkt~H4(>uI?k1)Y#{%X3H?7QSbxhmMP6(0 zX9dTHoG8DQN-wd$>m>5bJLr^*wz z6~kM4Cpa-?Ssfn=pTBS6$m>Isw-aRL3m#evB>XZF5d|837&K^2Y+5H>3P;3wkOe5eOhun3&-=Ag?m1I%st+Ti(XZ1N~Zhb zuH8m53yVhMDd!ma)MJl~@*+E&l0s)m_05R+9sb%xStR^+s_XrgiiK{iI_Zu^__UQ? zFsM_FY-jnMdWetjqBOL3c&A(GF+Po_N_bN#OQ*E8rI{IixUADf=Xj1!P)|){bs*u!J-&>UP%bW6drwO~gbVYj*Mo zUKO7o-g7FexZ}<^)grQl%!WrLtVpUAMh7W+C!P`4%lYnO<2KzyTq+>rU_KexZV}r} zwf$6k%Ob@=Z;&Lq)={X>Nvm*So>T00QWY-91tR98b+}MpAUuUsoupT$i@!5z5wSu# zozg5yax*5+w^l4`JA1TsciQsqhZcrEE26T5!8IiJxpbfG%HyJSbLllU@BBX(E~>%j z^?8XI21)u1Dan6B%XZgDIen_g`*p>Lx>WqOnjV%-v&}pejHity9kZnKf8a7jS-?;D tlLmTVz9`>H=La7p1I~9;iK-g9b?09sxr2vb8BdpLX_vG!Jh_2L`yV_=#BKlp -- 2.11.0