Load sound libraries on class init

Author: dschreij

mediadecoder/__init__.py

@@ -1,4 +1,4 @@
-__version__ = "0.1.3"
+__version__ = "0.1.4"
 __author__ = "Daniel Schreij"
 __license__ = "MIT"
 

mediadecoder/soundrenderers/pyaudiorenderer.py

@@ -1,6 +1,3 @@
-import time
-import pyaudio
-
 try:
 	# Python 3
 	from queue import Queue, Empty
@@ -26,8 +23,9 @@ def __init__(self, audioformat, queue=None):
 			A queue object which serves as a buffer on which the individual
 			audio frames are placed by the decoder.
 		"""
-		if pyaudio is None:
-			raise RuntimeError("Pyaudio sound renderer is not available")
+		
+		global pyaudio
+		import pyaudio
 
 		if not queue is None:
 			self.queue = queue

mediadecoder/soundrenderers/pyaudiorenderer2.py

@@ -1,5 +1,4 @@
 import time
-import pyaudio
 import threading
 
 try:
@@ -27,9 +26,10 @@ def __init__(self, audioformat, queue=None):
 			A queue object which serves as a buffer on which the individual
 			audio frames are placed by the decoder.
 		"""
-		if pyaudio is None:
-			raise RuntimeError("Pyaudio sound renderer is not available")
+		global pyaudio
+		import pyaudio
 
+		# Init thread
 		super(SoundrendererPyAudio, self).__init__()
 
 		if not queue is None:
@@ -39,7 +39,7 @@ def __init__(self, audioformat, queue=None):
 		self.stream = self.pa.open(
 			channels  	= audioformat["nchannels"],
 			rate 		= audioformat["fps"],
-			# frames_per_buffer = audioformat['buffersize'],
+			frames_per_buffer = audioformat['buffersize'],
 			format 	= pyaudio.get_format_from_width(audioformat["nbytes"]),
 			output 	= True,
 		)

mediadecoder/soundrenderers/pygamerenderer.py

@@ -1,10 +1,6 @@
 import time
 import threading
-import pygame
-
 import warnings
-warnings.warn("Pygame sound renderer is not working correctly yet. Using the "
-	"pyaudio renderer is recommended for now.")
 
 try:
 	# Python 3
@@ -31,10 +27,14 @@ def __init__(self, audioformat, queue=None):
 			A queue object which serves as a buffer on which the individual
 			audio frames are placed by the decoder.
 		"""
+		global pygame
+		import pygame
+
+		# Init thread
 		super(SoundrendererPygame, self).__init__()
 
-		if pygame is None:
-			raise RuntimeError("Pygame sound renderer is not available")
+		warnings.warn("Pygame sound renderer is not working correctly yet. Using the "
+			"pyaudio renderer is recommended for now.")
 
 		if not queue is None:
 			self.queue = queue
@@ -71,7 +71,7 @@ def run(self):
 					chunk = None
 			time.sleep(0.005)
 
-		if not channel is None:
+		if not channel is None and pygame.mixer.get_init():
 			channel.stop()
 			pygame.mixer.quit()
 

mediadecoder/soundrenderers/sounddevicerenderer.py

@@ -1,6 +1,3 @@
-import time
-import sounddevice as sd
-
 try:
 	# Python 3
 	from queue import Queue, Empty
@@ -26,6 +23,9 @@ def __init__(self, audioformat, queue=None):
 			A queue object which serves as a buffer on which the individual
 			audio frames are placed by the decoder.
 		"""
+		global sd
+		import sounddevice as sd
+
 		if not queue is None:
 			self.queue = queue
 

mediadecoder/soundrenderers/sounddevicerenderer2.py

@@ -1,5 +1,4 @@
 import threading
-import sounddevice as sd
 import logging
 logger = logging.getLogger(__name__)
 
@@ -34,6 +33,9 @@ def __init__(self, audioformat, queue=None):
 			A queue object which serves as a buffer on which the individual
 			audio frames are placed by the decoder.
 		"""
+		global sd
+		import sounddevice as sd
+
 		super(SoundrendererSounddevice, self).__init__()
 
 		if not queue is None: