remove some more unneeded return values

This commit is contained in:
chrys
2016-09-17 21:13:43 +02:00
parent 0729d2daf2
commit 5ad6cbbb68
7 changed files with 19 additions and 24 deletions

View File

@ -15,10 +15,10 @@ class driver():
self.soundFileCommand = 'play -q -v fenrirVolume fenrirSoundFile'
if self.frequenceCommand == '':
self.frequenceCommand = '=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine fenrirFrequence'
return environment
return
def shutdown(self, environment):
self.cancel()
return environment
return
def playFrequence(self, frequence, duration, adjustVolume):
if interrupt:
self.cancel()

View File

@ -20,9 +20,9 @@ class driver:
return
def initialize(self, environment):
if self._initialized:
return environment
return
if not _gstreamerAvailable:
return environment
return
self._player = Gst.ElementFactory.make('playbin', 'player')
bus = self._player.get_bus()
@ -41,9 +41,14 @@ class driver:
self._source.link(self._sink)
self._initialized = True
return environment
return
def shutdown(self, environment):
return environment
global _gstreamerAvailable
if not _gstreamerAvailable:
return
self.cancel()
self._initialized = False
_gstreamerAvailable = False
def _onPlayerMessage(self, bus, message):
if message.type == Gst.MessageType.EOS:
@ -92,12 +97,6 @@ class driver:
self._pipeline.set_state(Gst.State.NULL)
def setVolume(self, volume):
self.volume = volume
def shutdown(self):
global _gstreamerAvailable
if not _gstreamerAvailable:
return
self.cancel()
self._initialized = False
_gstreamerAvailable = False