Skip to content

Commit b86c66f

Browse files
authored
Make send_frame public for use in display handler (#297)
Make send_frame public
1 parent 83f4e4f commit b86c66f

File tree

1 file changed

+12
-12
lines changed

1 file changed

+12
-12
lines changed

aioslimproto/client.py

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -293,7 +293,7 @@ async def power(self, powered: bool = True) -> None:
293293
if not powered:
294294
await self.stop()
295295
power_int = 1 if powered else 0
296-
await self._send_frame(b"aude", struct.pack("2B", power_int, 1))
296+
await self.send_frame(b"aude", struct.pack("2B", power_int, 1))
297297
self._powered = powered
298298
self.signal_update()
299299
await self._render_display()
@@ -309,7 +309,7 @@ async def volume_set(self, volume_level: int) -> None:
309309
self.volume_control.volume = volume_level
310310
old_gain = self.volume_control.old_gain()
311311
new_gain = self.volume_control.new_gain()
312-
await self._send_frame(
312+
await self.send_frame(
313313
b"audg",
314314
struct.pack("!LLBBLL", old_gain, old_gain, 1, 255, new_gain, new_gain),
315315
)
@@ -321,7 +321,7 @@ async def volume_up(self) -> None:
321321
self.volume_control.increment()
322322
old_gain = self.volume_control.old_gain()
323323
new_gain = self.volume_control.new_gain()
324-
await self._send_frame(
324+
await self.send_frame(
325325
b"audg",
326326
struct.pack("!LLBBLL", old_gain, old_gain, 1, 255, new_gain, new_gain),
327327
)
@@ -333,7 +333,7 @@ async def volume_down(self) -> None:
333333
self.volume_control.decrement()
334334
old_gain = self.volume_control.old_gain()
335335
new_gain = self.volume_control.new_gain()
336-
await self._send_frame(
336+
await self.send_frame(
337337
b"audg",
338338
struct.pack("!LLBBLL", old_gain, old_gain, 1, 255, new_gain, new_gain),
339339
)
@@ -345,7 +345,7 @@ async def mute(self, muted: bool = False) -> None:
345345
if self._muted == muted:
346346
return
347347
muted_int = 0 if muted else 1
348-
await self._send_frame(b"aude", struct.pack("2B", muted_int, 0))
348+
await self.send_frame(b"aude", struct.pack("2B", muted_int, 0))
349349
self._muted = muted
350350
self.signal_update()
351351

@@ -496,7 +496,7 @@ def signal_update(self) -> None:
496496
"""Signal a player updated event to listeners."""
497497
self.callback(self, EventType.PLAYER_UPDATED)
498498

499-
async def _send_frame(self, command: bytes, data: bytes) -> None:
499+
async def send_frame(self, command: bytes, data: bytes) -> None:
500500
"""Send (raw) command to Squeeze player."""
501501
if self._reader.at_eof() or self._writer.is_closing():
502502
self.logger.debug("Socket is disconnected.")
@@ -629,7 +629,7 @@ async def _send_strm( # noqa: PLR0913
629629
server_port,
630630
server_ip,
631631
)
632-
await self._send_frame(b"strm", data + httpreq)
632+
await self.send_frame(b"strm", data + httpreq)
633633

634634
async def _process_helo(self, data: bytes) -> None:
635635
"""Process incoming HELO event from player (player connected)."""
@@ -642,10 +642,10 @@ async def _process_helo(self, data: bytes) -> None:
642642
self._capabilities = parse_capabilities(data)
643643
self.logger.debug("Player connected: %s", self.player_id)
644644
# Set some startup settings for the player
645-
await self._send_frame(b"vers", b"7.9")
645+
await self.send_frame(b"vers", b"7.9")
646646
# request player to send the player name
647-
await self._send_frame(b"setd", struct.pack("B", 0xFE))
648-
await self._send_frame(b"setd", struct.pack("B", 0))
647+
await self.send_frame(b"setd", struct.pack("B", 0xFE))
648+
await self.send_frame(b"setd", struct.pack("B", 0))
649649
# restore last power and volume levels
650650
# NOTE: this can be improved by storing the previous volume/power levels
651651
# so they can be restored when the player (re)connects.
@@ -922,15 +922,15 @@ async def _process_resp(self, data: bytes) -> None:
922922
content_type,
923923
codc_msg,
924924
)
925-
await self._send_frame(b"codc", codc_msg)
925+
await self.send_frame(b"codc", codc_msg)
926926

927927
# parse ICY metadata
928928
if "icy-name" in headers and not self.next_media.metadata.get("title"):
929929
self._next_media.metadata["title"] = headers["icy-name"]
930930

931931
# send continue (used when autoplay 1 or 3)
932932
if self._auto_play:
933-
await self._send_frame(b"cont", b"1")
933+
await self.send_frame(b"cont", b"1")
934934

935935
def _process_setd(self, data: bytes) -> None:
936936
"""Process incoming SETD message: Get/set player firmware settings."""

0 commit comments

Comments
 (0)