remove opus files

config/settings/espeak.settings.conf

@@ -10,7 +10,7 @@ driver=genericDriver
 # Sound packs may be located at /usr/share/sounds
 # For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
 # For the current user.
-theme=default-wav
+theme=default
 
 # Sound volume controls how loud the sounds for your chosen soundpack are.
 # 0 is quietest, 1.0 is loudest.

config/settings/settings.conf

@@ -11,7 +11,7 @@ driver=genericDriver
 # Sound packs may be located at /usr/share/sounds
 # For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
 # For the current user.
-theme=default-wav
+theme=default
 
 # Sound volume controls how loud the sounds for your selected soundpack are.
 # 0 is quietest, 1.0 is loudest.

config/settings/settings.conf.example

@@ -11,7 +11,7 @@ driver=genericDriver
 # Sound packs may be located at /usr/share/sounds
 # For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
 # For the current user.
-theme=default-wav
+theme=default
 
 # Sound volume controls how loud the sounds for your selected soundpack are.
 # 0 is quietest, 1.0 is loudest.

config/settings/speech-dispatcher.settings.conf

@@ -11,7 +11,7 @@ driver=genericDriver
 # Sound packs may be located at /usr/share/sounds
 # For system wide availability, or ~/.local/share/fenrirscreenreader/sounds
 # For the current user.
-theme=default-wav
+theme=default
 
 # Sound volume controls how loud the sounds for your selected soundpack are.
 # 0 is quietest, 1.0 is loudest.

config/sound/default-wav/soundicons.conf

@@ -1,54 +0,0 @@
-# Screen Reader Turned On or Off
-ScreenReaderOn='ScreenReaderOn.wav'
-ScreenReaderOff='ScreenReaderOff.wav'
-# PTY bypass
-PTYBypass='PTYBypass.wav'
-# Cancel the current command
-Cancel='Cancel.wav'
-# Accept command
-Accept='Accept.wav'
-# Bell a sound if the TTY is changed (ctrl + alt +FX)
-ChangeTTY='ChangeTTY.wav'
-# Is the first Position on the line
-StartOfLine='StartOfLine.wav'
-# Is the last position of the Line
-EndOfLine='EndOfLine.wav'
-# the Line is empty
-EmptyLine='EmptyLine.wav'
-# Is the first line on the screen.
-StartOfScreen='StartOfScreen.wav'
-# Is the last line on the screen
-EndOfScreen='EndOfScreen.wav'
-# The content has changed
-ContentChanged='ContentChanged.wav'
-# Speech has turned On or Off
-SpeechOn='SpeechOn.wav'
-SpeechOff='SpeechOff.wav'
-# Braille has turned On or Off
-BrailleOn='BrailleOn.wav'
-BrailleOff='BrailleOff.wav'
-# SoundIcons has turned On or Off
-SoundOn='SoundOn.wav'
-SoundOff='SoundOff.wav'
-# Set beginnig mark
-PlaceStartMark='PlaceStartMark.wav'
-# Set end mark
-PlaceEndMark='PlaceEndMark.wav'
-# Copied to clipboard
-CopyToClipboard='CopyToClipboard.wav'
-# Pasted on the screen
-PasteClipboardOnScreen='PasteClipboardOnScreen.wav'
-# An error accoured while speech or braille output or reading the screen
-ErrorSpeech='ErrorSpeech.wav'
-ErrorBraille='ErrorBraille.wav'
-ErrorScreen='ErrorScreen.wav'
-# If you cursor over an text that has attributs (like color)
-HasAttributes='HasAttributes.wav'
-# fenrir can promote strings if they appear on the screen.
-PromotedText='PromotedText.wav'
-# missspelled indicator
-mispell='mispell.wav'
-# the for capital letter
-capital='Caps.wav'
-# general announcement
-announce="Announce.wav"

config/sound/default/soundicons.conf

@@ -1,52 +1,54 @@
 # Screen Reader Turned On or Off
-ScreenReaderOn='ScreenReaderOn.opus'
+ScreenReaderOn='ScreenReaderOn.wav'
-ScreenReaderOff='ScreenReaderOff.opus'
+ScreenReaderOff='ScreenReaderOff.wav'
+# PTY bypass
+PTYBypass='PTYBypass.wav'
 # Cancel the current command
-Cancel='Cancel.opus'
+Cancel='Cancel.wav'
 # Accept command
-Accept='Accept.opus'
+Accept='Accept.wav'
 # Bell a sound if the TTY is changed (ctrl + alt +FX)
-ChangeTTY='ChangeTTY.opus'
+ChangeTTY='ChangeTTY.wav'
 # Is the first Position on the line
-StartOfLine='StartOfLine.opus'
+StartOfLine='StartOfLine.wav'
 # Is the last position of the Line
-EndOfLine='EndOfLine.opus'
+EndOfLine='EndOfLine.wav'
 # the Line is empty
-EmptyLine='EmptyLine.opus'
+EmptyLine='EmptyLine.wav'
 # Is the first line on the screen.
-StartOfScreen='StartOfScreen.opus'
+StartOfScreen='StartOfScreen.wav'
 # Is the last line on the screen
-EndOfScreen='EndOfScreen.opus'
+EndOfScreen='EndOfScreen.wav'
 # The content has changed
-ContentChanged='ContentChanged.opus'
+ContentChanged='ContentChanged.wav'
 # Speech has turned On or Off
-SpeechOn='SpeechOn.opus'
+SpeechOn='SpeechOn.wav'
-SpeechOff='SpeechOff.opus'
+SpeechOff='SpeechOff.wav'
 # Braille has turned On or Off
-BrailleOn='BrailleOn.opus'
+BrailleOn='BrailleOn.wav'
-BrailleOff='BrailleOff.opus'
+BrailleOff='BrailleOff.wav'
 # SoundIcons has turned On or Off
-SoundOn='SoundOn.opus'
+SoundOn='SoundOn.wav'
-SoundOff='SoundOff.opus'
+SoundOff='SoundOff.wav'
-# Set beginnig mark for copy to clipboard
+# Set beginnig mark
-PlaceStartMark='PlaceStartMark.opus'
+PlaceStartMark='PlaceStartMark.wav'
-# Set end mark for copy to clipboard
+# Set end mark
-PlaceEndMark='PlaceEndMark.opus'
+PlaceEndMark='PlaceEndMark.wav'
 # Copied to clipboard
-CopyToClipboard='CopyToClipboard.opus'
+CopyToClipboard='CopyToClipboard.wav'
 # Pasted on the screen
-PasteClipboardOnScreen='PasteClipboardOnScreen.opus'
+PasteClipboardOnScreen='PasteClipboardOnScreen.wav'
 # An error accoured while speech or braille output or reading the screen
-ErrorSpeech='ErrorSpeech.opus'
+ErrorSpeech='ErrorSpeech.wav'
-ErrorBraille='ErrorBraille.opus'
+ErrorBraille='ErrorBraille.wav'
-ErrorScreen='ErrorScreen.opus'
+ErrorScreen='ErrorScreen.wav'
 # If you cursor over an text that has attributs (like color)
-HasAttributes='HasAttributes.opus'
+HasAttributes='HasAttributes.wav'
 # fenrir can promote strings if they appear on the screen.
-PromotedText='PromotedText.opus'
+PromotedText='PromotedText.wav'
 # missspelled indicator
-mispell='mispell.opus'
+mispell='mispell.wav'
 # the for capital letter
-capital='Caps.opus'
+capital='Caps.wav'
 # general announcement
-announce="Announce.opus"
+announce="Announce.wav"

install.sh

@@ -27,7 +27,6 @@ cp -af config/punctuation/* /etc/fenrirscreenreader/punctuation
 # sound
 install -d /usr/share/sounds/fenrirscreenreader
 cp -af config/sound/default /usr/share/sounds/fenrirscreenreader/default
-cp -af config/sound/default-wav /usr/share/sounds/fenrirscreenreader/default-wav
 cp -af config/sound/template /usr/share/sounds/fenrirscreenreader/template
 
 # config

setup.py

@@ -36,9 +36,6 @@ for directory in directories:
     if destDir != '':
         data_files.append((destDir, files))
 
-files = glob.glob('config/sound/default-wav/*')         
-destDir = '/usr/share/sounds/fenrirscreenreader/default-wav'
-data_files.append((destDir, files))        
 files = glob.glob('config/sound/default/*')                 
 destDir = '/usr/share/sounds/fenrirscreenreader/default'            
 data_files.append((destDir, files))

src/fenrirscreenreader/core/settingsManager.py

@@ -25,7 +25,6 @@ from fenrirscreenreader.core import headLineManager
 from fenrirscreenreader.core import tableManager
 from fenrirscreenreader.core import byteManager
 from fenrirscreenreader.core import environment 
-from fenrirscreenreader.core import inputData
 from fenrirscreenreader.core.settingsData import settingsData
 from fenrirscreenreader.core import debug
 from fenrirscreenreader.utils import module_utils