append Driver to drivernames in settings and files to be unique

config/settings/espeak.settings.conf

@@ -4,7 +4,7 @@ enabled=True
 
 # Select the driver used to play sounds, choices are generic and gstreamer.
 # Sox is the default.
-driver=generic
+driver=genericDriver
 
 # Sound themes. This is the pack of sounds used for sound alerts.
 # Sound packs may be located at /usr/share/sounds
@@ -32,8 +32,8 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine
 enabled=True
 
 # Select speech driver, options are speechd (default) or espeak:
-#driver=speechd
+#driver=speechdDriver
-driver=espeak
+driver=espeakDriver
 
 
 # The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
@@ -65,7 +65,7 @@ autoReadIncoming=True
 [braille]
 #braille is not implemented yet
 enabled=False
-driver=brlapi
+driver=brlapiDriver
 layout=en
 
 [screen]
@@ -76,7 +76,7 @@ suspendingScreen=
 autodetectSuspendingScreen=True
 
 [keyboard]
-driver=evdev
+driver=evdevDriver
 # filter input devices NOMICE, ALL or a DEVICE NAME
 device=ALL
 # gives fenrir exclusive access to the keyboard and let consume keystrokes.

config/settings/settings.conf

@@ -4,8 +4,8 @@ enabled=True
 
 # Select the driver used to play sounds, choices are generic and gstreamer.
 # Sox is the default.
-#driver=gstreamer
+#driver=gstreamerDriver
-driver=generic
+driver=genericDriver
 
 # Sound themes. This is the pack of sounds used for sound alerts.
 # Sound packs may be located at /usr/share/sounds
@@ -33,8 +33,8 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine
 enabled=True
 
 # Select speech driver, options are speechd (default) or espeak:
-driver=speechd
+driver=speechdDriver
-#driver=espeak
+#driver=espeakDriver
 
 
 # The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
@@ -66,18 +66,18 @@ autoReadIncoming=True
 [braille]
 #braille is not implemented yet
 enabled=False
-driver=brlapi
+driver=brlapiDriver
 layout=en
 
 [screen]
-driver=vcsa
+driver=vcsaDriver
 encoding=cp850
 screenUpdateDelay=0.05
 suspendingScreen=
 autodetectSuspendingScreen=True
 
 [keyboard]
-driver=evdev
+driver=evdevDriver
 # filter input devices NOMICE, ALL or a DEVICE NAME
 device=ALL
 # gives fenrir exclusive access to the keyboard and let consume keystrokes.

config/settings/settings.conf.chrys

@@ -4,7 +4,7 @@ enabled=True
 
 # Select the driver used to play sounds, choices are generic and gstreamer.
 # Sox is the default.
-driver=generic
+driver=genericDriver
 
 # Sound themes. This is the pack of sounds used for sound alerts.
 # Sound packs may be located at /usr/share/sounds
@@ -32,8 +32,8 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine
 enabled=True
 
 # Select speech driver, options are speechd (default) or espeak:
-driver=speechd
+driver=speechdDriver
-#driver=espeak
+#driver=espeakDriver
 
 
 # The rate selects how fast fenrir will speak. Options range from 0, slowest, to 1.0, fastest.
@@ -65,18 +65,18 @@ autoReadIncoming=True
 [braille]
 #braille is not implemented yet
 enabled=True
-driver=brlapi
+driver=brlapiDriver
 layout=en
 
 [screen]
-driver=vcsa
+driver=vcsaDriver
 encoding=cp850
 screenUpdateDelay=0.05
 suspendingScreen=
 autodetectSuspendingScreen=True
 
 [keyboard]
-driver=evdev
+driver=evdevDriver
 # filter input devices NOMICE, ALL or a DEVICE NAME
 device=ALL
 # gives fenrir exclusive access to the keyboard and let consume keystrokes. just disable on problems.

config/settings/settings.conf.storm

@@ -1,6 +1,6 @@
 [sound]
 enabled=True
-driver=generic
+driver=genericDriver
 theme=default
 volume=1.0
 # shell commands for generic sound driver
@@ -9,7 +9,7 @@ genericFrequencyCommand=play -q -v fenrirVolume -n -c1 synth fenrirDuration sine
 
 [speech]
 enabled=True
-driver=speechd
+driver=speechdDriver
 rate=0.85
 pitch=0.5
 # Pitch for capital letters
@@ -22,7 +22,7 @@ autoReadIncoming=True
 
 [braille]
 enabled=False
-driver=brlapi
+driver=brlapiDriver
 layout=en
 
 [screen]
@@ -33,7 +33,7 @@ suspendingScreen=7
 autodetectSuspendingScreen=False
 
 [keyboard]
-driver=evdev
+driver=evdevDriver
 # filter input devices NOMICE, ALL or a DEVICE NAME
 device=ALL
 grabDevices=True