|
@@ -13,7 +13,9 @@ class AudioPlayer:
|
|
|
AUDIO_MP3_CHANNEL = 1
|
|
|
AUDIO_MP3_BUFFER = 2048
|
|
|
|
|
|
- def __init__(self, default_type=None, audio_frequency=AUDIO_MP3_FREQUENCY, audio_size=AUDIO_MP3_SIZE, audio_channel=AUDIO_MP3_CHANNEL, audio_buffer=AUDIO_MP3_BUFFER):
|
|
|
+ AUDIO_DEFAULT_VOLUME = 0.8
|
|
|
+
|
|
|
+ def __init__(self, default_type=None, audio_frequency=AUDIO_MP3_FREQUENCY, audio_size=AUDIO_MP3_SIZE, audio_channel=AUDIO_MP3_CHANNEL, audio_buffer=AUDIO_MP3_BUFFER, volume=AUDIO_DEFAULT_VOLUME):
|
|
|
if default_type == self.PLAYER_MP3:
|
|
|
self.audio_frequency = self.AUDIO_MP3_FREQUENCY
|
|
|
self.audio_size = self.AUDIO_MP3_SIZE
|
|
@@ -24,11 +26,12 @@ class AudioPlayer:
|
|
|
self.audio_size = audio_size
|
|
|
self.audio_channel = audio_channel
|
|
|
self.audio_buffer = audio_buffer
|
|
|
+ self.volume = volume
|
|
|
pygame.mixer.init(audio_frequency, audio_size, audio_channel, audio_buffer)
|
|
|
|
|
|
- def play_audio(self, music_file, volume=0.8, keep_file=False):
|
|
|
+ def play_audio(self, music_file):
|
|
|
try:
|
|
|
- self._init_player_audio(music_file, volume)
|
|
|
+ self._init_player_audio(music_file)
|
|
|
logging.debug("Music file %s loaded!", music_file)
|
|
|
except pygame.error:
|
|
|
FileManager.remove_file(music_file)
|
|
@@ -36,12 +39,9 @@ class AudioPlayer:
|
|
|
return
|
|
|
|
|
|
self._start_player_audio()
|
|
|
- if not keep_file:
|
|
|
- FileManager.remove_file(music_file)
|
|
|
|
|
|
- @staticmethod
|
|
|
- def _init_player_audio(music_file, volume):
|
|
|
- pygame.mixer.music.set_volume(volume)
|
|
|
+ def _init_player_audio(self, music_file):
|
|
|
+ pygame.mixer.music.set_volume(self.volume)
|
|
|
pygame.mixer.music.load(music_file)
|
|
|
|
|
|
@staticmethod
|