From 8d86accf4897a59800ae43beb25bf66b48da6b81 Mon Sep 17 00:00:00 2001
From: kokarare1212 <kokarare1212@gmail.com>
Date: Thu, 20 May 2021 07:03:32 +0900
Subject: [PATCH] Add librespot.audio.decoders

---
 README.md                                            | 12 +++++++-----
 docs/index.md                                        | 11 ++++++-----
 .../codecs => audio/decoders}/AudioQuality.py        |  0
 librespot/audio/decoders/__init__.py                 |  1 +
 librespot/player/PlayerConfiguration.py              |  2 +-
 librespot/player/codecs/VorbisOnlyAudioQuality.py    |  2 +-
 librespot/player/codecs/__init__.py                  |  1 -
 7 files changed, 16 insertions(+), 13 deletions(-)
 rename librespot/{player/codecs => audio/decoders}/AudioQuality.py (100%)
 create mode 100644 librespot/audio/decoders/__init__.py

diff --git a/README.md b/README.md
index 9d0b919..c7ae76a 100644
--- a/README.md
+++ b/README.md
@@ -36,18 +36,20 @@ aceess_token = session.tokens().get("playlist-read")
 ```
 ### Get Music Stream
 \*Currently, music streaming is supported, but it may cause unintended behavior.
+
 ```python
 from librespot.core import Session
 from librespot.metadata import TrackId
-from librespot.player.codecs import AudioQuality, VorbisOnlyAudioQuality
+from librespot.player.codecs import VorbisOnlyAudioQuality
+from librespot.audio.decoders import AudioQuality
 
-
-session = Session.Builder() \
-    .user_pass("Username", "Password") \
+session = Session.Builder()
+    .user_pass("Username", "Password")
     .create()
 
 track_id = TrackId.from_uri("spotify:track:xxxxxxxxxxxxxxxxxxxxxx")
-stream = session.content_feeder().load(track_id, VorbisOnlyAudioQuality(AudioQuality.AudioQuality.VERY_HIGH), False, None)
+stream = session.content_feeder().load(track_id, VorbisOnlyAudioQuality(AudioQuality.AudioQuality.VERY_HIGH), False,
+                                       None)
 # stream.input_stream.stream().read() to get one byte of the music stream.
 # ex: 1 (If there is no more voice data, -1 is received as the result.)
 ```
diff --git a/docs/index.md b/docs/index.md
index e0aa4d2..4fa2e1d 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -69,15 +69,16 @@ aceess_token = session.tokens().get("playlist-read")
 ```python
 from librespot.core import Session
 from librespot.metadata import TrackId
-from librespot.player.codecs import AudioQuality, VorbisOnlyAudioQuality
+from librespot.player.codecs import VorbisOnlyAudioQuality
+from librespot.audio.decoders import AudioQuality
 
-
-session = Session.Builder() \
-    .user_pass("Username", "Password") \
+session = Session.Builder()
+    .user_pass("Username", "Password")
     .create()
 
 track_id = TrackId.from_uri("spotify:track:xxxxxxxxxxxxxxxxxxxxxx")
-stream = session.content_feeder().load(track_id, VorbisOnlyAudioQuality(AudioQuality.AudioQuality.VERY_HIGH), False, None)
+stream = session.content_feeder().load(track_id, VorbisOnlyAudioQuality(AudioQuality.AudioQuality.VERY_HIGH), False,
+                                       None)
 # stream.input_stream.stream().read() to get one byte of the music stream.
 # ex: 1 (If there is no more voice data, -1 is received as the result.)
 ```
diff --git a/librespot/player/codecs/AudioQuality.py b/librespot/audio/decoders/AudioQuality.py
similarity index 100%
rename from librespot/player/codecs/AudioQuality.py
rename to librespot/audio/decoders/AudioQuality.py
diff --git a/librespot/audio/decoders/__init__.py b/librespot/audio/decoders/__init__.py
new file mode 100644
index 0000000..a96ba38
--- /dev/null
+++ b/librespot/audio/decoders/__init__.py
@@ -0,0 +1 @@
+from librespot.audio.decoders.AudioQuality import AudioQuality
\ No newline at end of file
diff --git a/librespot/player/PlayerConfiguration.py b/librespot/player/PlayerConfiguration.py
index 369d72d..22da8e4 100644
--- a/librespot/player/PlayerConfiguration.py
+++ b/librespot/player/PlayerConfiguration.py
@@ -1,5 +1,5 @@
 from __future__ import annotations
-from librespot.player.codecs import AudioQuality
+from librespot.audio.decoders import AudioQuality
 
 
 class PlayerConfiguration:
diff --git a/librespot/player/codecs/VorbisOnlyAudioQuality.py b/librespot/player/codecs/VorbisOnlyAudioQuality.py
index e870316..ec22797 100644
--- a/librespot/player/codecs/VorbisOnlyAudioQuality.py
+++ b/librespot/player/codecs/VorbisOnlyAudioQuality.py
@@ -5,7 +5,7 @@ import typing
 
 from librespot.audio.format.AudioQualityPicker import AudioQualityPicker
 from librespot.audio.format.SuperAudioFormat import SuperAudioFormat
-from librespot.player.codecs.AudioQuality import AudioQuality
+from librespot.audio.decoders.AudioQuality import AudioQuality
 from librespot.proto import Metadata
 
 
diff --git a/librespot/player/codecs/__init__.py b/librespot/player/codecs/__init__.py
index e380e35..c56b7eb 100644
--- a/librespot/player/codecs/__init__.py
+++ b/librespot/player/codecs/__init__.py
@@ -1,2 +1 @@
-from librespot.player.codecs.AudioQuality import AudioFile
 from librespot.player.codecs.VorbisOnlyAudioQuality import VorbisOnlyAudioQuality