@@ -72,6 +72,7 @@ def __init__(
7272
7373 self ._last_capture = 0.0
7474 self ._q_size = 0.0
75+ self ._capture_gen = 0
7576 self ._join_handle : asyncio .TimerHandle | None = None
7677 self ._join_fut : asyncio .Future [None ] | None = None
7778
@@ -102,7 +103,7 @@ def clear_queue(self) -> None:
102103 req = proto_ffi .FfiRequest ()
103104 req .clear_audio_buffer .source_handle = self ._ffi_handle .handle
104105 _ = FfiClient .instance .request (req )
105- self ._release_waiter_threadsafe ()
106+ self ._release_waiter_threadsafe (gen = self . _capture_gen )
106107
107108 def _get_loop (self ) -> asyncio .AbstractEventLoop :
108109 if self ._loop is None or self ._loop .is_closed ():
@@ -131,6 +132,9 @@ async def capture_frame(self, frame: AudioFrame) -> None:
131132
132133 loop = self ._get_loop ()
133134
135+ self ._capture_gen += 1
136+ current_gen = self ._capture_gen
137+
134138 now = time .monotonic ()
135139 elapsed = 0.0 if self ._last_capture == 0.0 else now - self ._last_capture
136140 self ._q_size += frame .samples_per_channel / self .sample_rate - elapsed
@@ -146,7 +150,7 @@ async def capture_frame(self, frame: AudioFrame) -> None:
146150 ):
147151 self ._join_fut = loop .create_future ()
148152
149- self ._join_handle = loop .call_later (self ._q_size , self ._release_waiter )
153+ self ._join_handle = loop .call_later (self ._q_size , self ._release_waiter , current_gen )
150154
151155 req = proto_ffi .FfiRequest ()
152156 req .capture_audio_frame .source_handle = self ._ffi_handle .handle
@@ -178,7 +182,10 @@ async def wait_for_playout(self) -> None:
178182
179183 await asyncio .shield (self ._join_fut )
180184
181- def _release_waiter (self ) -> None :
185+ def _release_waiter (self , gen : int | None = None ) -> None :
186+ if gen is not None and gen != self ._capture_gen :
187+ return
188+
182189 if self ._join_handle is not None :
183190 self ._join_handle .cancel ()
184191 self ._join_handle = None
@@ -193,16 +200,16 @@ def _release_waiter(self) -> None:
193200 self ._q_size = 0.0
194201 self ._join_fut = None
195202
196- def _release_waiter_threadsafe (self ) -> None :
203+ def _release_waiter_threadsafe (self , gen : int | None = None ) -> None :
197204 try :
198205 running_loop = asyncio .get_running_loop ()
199206 except RuntimeError :
200207 running_loop = None
201208
202209 if self ._loop is not None and self ._loop .is_running () and running_loop is not self ._loop :
203- self ._loop .call_soon_threadsafe (self ._release_waiter )
210+ self ._loop .call_soon_threadsafe (self ._release_waiter , gen )
204211 else :
205- self ._release_waiter ()
212+ self ._release_waiter (gen )
206213
207214 def close (self ) -> None :
208215 """Close the audio source.
0 commit comments