Skip to content

Commit

Permalink
Merge branch 'master' into fix-is-integration
Browse files Browse the repository at this point in the history
  • Loading branch information
plun1331 authored Oct 17, 2024
2 parents aedefdb + 33adf22 commit 7f731ba
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 3 deletions.
3 changes: 3 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,9 @@ These changes are available on the `master` branch, but have not yet been releas
([#2496](https://github.com/Pycord-Development/pycord/pull/2496))
- ⚠️ **Removed support for Python 3.8.**
([#2521](https://github.com/Pycord-Development/pycord/pull/2521))
- Replaced audioop (deprecated module) implementation of `PCMVolumeTransformer.read`
method with a pure Python equivalent.
([#2176](https://github.com/Pycord-Development/pycord/pull/2176))

### Deprecated

Expand Down
14 changes: 12 additions & 2 deletions discord/player.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@

from __future__ import annotations

import array
import asyncio
import audioop
import io
import json
import logging
Expand All @@ -37,6 +37,7 @@
import threading
import time
import traceback
from math import floor
from typing import IO, TYPE_CHECKING, Any, Callable, Generic, TypeVar

from .errors import ClientException
Expand Down Expand Up @@ -704,8 +705,17 @@ def cleanup(self) -> None:
self.original.cleanup()

def read(self) -> bytes:
maxval = 0x7FFF
minval = -0x8000

volume = min(self._volume, 2.0)
ret = self.original.read()
return audioop.mul(ret, 2, min(self._volume, 2.0))
samples = array.array("h")
samples.frombytes(ret)
for i in range(len(samples)):
samples[i] = int(floor(min(maxval, max(samples[i] * volume, minval))))

return samples.tobytes()


class AudioPlayer(threading.Thread):
Expand Down
2 changes: 1 addition & 1 deletion requirements/dev.txt
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ pylint~=3.3.1
pytest~=8.3.3
pytest-asyncio~=0.23.8
# pytest-order~=1.0.1
mypy~=1.11.2
mypy~=1.12.0
coverage~=7.6
pre-commit==4.0.1
codespell==2.3.0
Expand Down

0 comments on commit 7f731ba

Please sign in to comment.