Most of the pep8 changes finished. Be careful, things may be horribly broken.

This commit is contained in:
Storm Dragon
2025-07-03 13:22:00 -04:00
parent 7408951152
commit 21bb9c6083
344 changed files with 6374 additions and 6083 deletions

View File

@ -7,7 +7,7 @@
from fenrirscreenreader.core import debug
import time
import threading
from fenrirscreenreader.core.soundDriver import soundDriver
from fenrirscreenreader.core.soundDriver import sound_driver
_gstreamerAvailable = False
try:
@ -21,9 +21,9 @@ except Exception as e:
_availableError = str(e)
class driver(soundDriver):
class driver(sound_driver):
def __init__(self):
soundDriver.__init__(self)
sound_driver.__init__(self)
self._source = None
self._sink = None
@ -33,18 +33,18 @@ class driver(soundDriver):
self._initialized = _gstreamerAvailable
if not self._initialized:
global _availableError
self.environment['runtime']['debug'].writeDebugOut(
'Gstreamer not available ' + _availableError, debug.debugLevel.ERROR)
self.environment['runtime']['DebugManager'].write_debug_out(
'Gstreamer not available ' + _availableError, debug.DebugLevel.ERROR)
return
self._player = Gst.ElementFactory.make('playbin', 'player')
bus = self._player.get_bus()
bus.add_signal_watch()
bus.connect("message", self._onPlayerMessage)
bus.connect("message", self._on_player_message)
self._pipeline = Gst.Pipeline(name='fenrir-pipeline')
bus = self._pipeline.get_bus()
bus.add_signal_watch()
bus.connect("message", self._onPipelineMessage)
bus.connect("message", self._on_pipeline_message)
self._source = Gst.ElementFactory.make('audiotestsrc', 'src')
self._sink = Gst.ElementFactory.make('autoaudiosink', 'output')
@ -65,7 +65,7 @@ class driver(soundDriver):
# 2 second timeout to prevent hanging
self.thread.join(timeout=2.0)
def _onPlayerMessage(self, bus, message):
def _on_player_message(self, bus, message):
if not self._initialized:
return
if message.type == Gst.MessageType.EOS:
@ -73,11 +73,11 @@ class driver(soundDriver):
elif message.type == Gst.MessageType.ERROR:
self._player.set_state(Gst.State.NULL)
error, info = message.parse_error()
self.env['runtime']['debug'].writeDebugOut(
'GSTREAMER: _onPlayerMessage' + str(error) + str(info),
debug.debugLevel.WARNING)
self.env['runtime']['DebugManager'].write_debug_out(
'GSTREAMER: _on_player_message' + str(error) + str(info),
debug.DebugLevel.WARNING)
def _onPipelineMessage(self, bus, message):
def _on_pipeline_message(self, bus, message):
if not self._initialized:
return
if message.type == Gst.MessageType.EOS:
@ -85,39 +85,39 @@ class driver(soundDriver):
elif message.type == Gst.MessageType.ERROR:
self._pipeline.set_state(Gst.State.NULL)
error, info = message.parse_error()
self.env['runtime']['debug'].writeDebugOut(
'GSTREAMER: _onPipelineMessage' + str(error) + str(info),
debug.debugLevel.WARNING)
self.env['runtime']['DebugManager'].write_debug_out(
'GSTREAMER: _on_pipeline_message' + str(error) + str(info),
debug.DebugLevel.WARNING)
def _onTimeout(self, element):
def _on_timeout(self, element):
if not self._initialized:
return
element.set_state(Gst.State.NULL)
def playSoundFile(self, fileName, interrupt=True):
def play_sound_file(self, file_name, interrupt=True):
if not self._initialized:
return
if interrupt:
self.cancel()
self._player.set_property('volume', self.volume)
self._player.set_property('uri', 'file://%s' % fileName)
self._player.set_property('uri', 'file://%s' % file_name)
self._player.set_state(Gst.State.PLAYING)
def playFrequence(
def play_frequence(
self,
frequence,
duration,
adjustVolume=0.0,
adjust_volume=0.0,
interrupt=True):
if not self._initialized:
return
if interrupt:
self.cancel()
duration = duration * 1000
self._source.set_property('volume', self.volume * adjustVolume)
self._source.set_property('volume', self.volume * adjust_volume)
self._source.set_property('freq', frequence)
self._pipeline.set_state(Gst.State.PLAYING)
GLib.timeout_add(duration, self._onTimeout, self._pipeline)
GLib.timeout_add(duration, self._on_timeout, self._pipeline)
def cancel(self, element=None):
if not self._initialized: