Changeset 1123:f0334593281d for src

Timestamp:

12/10/23 09:50:04 (12 months ago)

Author:

István Váradi <ivaradi@…>

Branch:

python3

Phase:

public

Message:

Support for an alternative sound set

Location:

src/mlx

Files:

• config.py (modified) (6 diffs)
• const.py (modified) (1 diff)
• gui/prefs.py (modified) (4 diffs)
• soundsched.py (modified) (2 diffs)

src/mlx/config.py

@@ -255 +255 @@
         self._enableApproachCallouts = False
         self._speedbrakeAtTD = True
+        self._soundSet = 0
 
         self._enableChecklists = False
@@ -672 +673 @@
         if speedbrakeAtTD!=self._speedbrakeAtTD:
             self._speedbrakeAtTD = speedbrakeAtTD
+            self._modified = True
+
+    @property
+    def soundSet(self):
+        """Get the number of the  sound set to use."""
+        return self._soundSet
+
+    @soundSet.setter
+    def soundSet(self, soundSet):
+        """Set the number of the sound set."""
+        if soundSet!=self._soundSet:
+            self._soundSet = soundSet
             self._modified = True
 
@@ -856 +869 @@
         self._speedbrakeAtTD = self._getBoolean(config, "sounds",
                                                 "speedbrakeAtTD", True)
+        self._soundSet = self._getInteger(config, "sounds",
+                                          "soundSet", 0)
 
         self._enableChecklists = self._getBoolean(config, "sounds",
@@ -963 +978 @@
         config.set("sounds", "speedbrakeAtTD",
                    "yes" if self._speedbrakeAtTD else "no")
+        config.set("sounds", "soundSet", str(self._soundSet))
 
         config.set("sounds", "enableChecklists",
@@ -998 +1014 @@
         otherwise the default."""
         return config.getboolean(section, option) \
+               if config.has_option(section, option) \
+               else default
+
+    def _getInteger(self, config, section, option, default):
+        """Get the given option as an integer, if found in the given config,
+        otherwise the default."""
+        return config.getint(section, option) \
                if config.has_option(section, option) \
                else default
@@ -1109 +1132 @@
         print("  enableApproachCallouts:", self._enableApproachCallouts)
         print("  speedbrakeAtTD:", self._speedbrakeAtTD)
+        print("  soundSet:", self._soundSet)
 
         print("  enableChecklists:", self._enableChecklists)

src/mlx/const.py

@@ -461 +461 @@
 SOUND_TAXI_BOEING737NG = "737taxi.mp3"
 
+## Sound: taxi: Boeing 737 NG (alternative variant)
+SOUND_TAXI_BOEING737NG_ALT1 = "737taxi_1.mp3"
+
 ## Sound: taxi: Boeing 767
 SOUND_TAXI_BOEING767 = "767taxi.mp3"
+
+## Sound: taxi: Boeing 767 (alternative variant)
+SOUND_TAXI_BOEING767_ALT1 = "767taxi_1.mp3"
 
 ## Sound: taxi: Fokker F70

src/mlx/gui/prefs.py

@@ -268 +268 @@
         self._enableApproachCallouts.set_active(config.enableApproachCallouts)
         self._speedbrakeAtTD.set_active(config.speedbrakeAtTD)
+        self._alternativeSoundSet.set_active(config.soundSet!=0)
 
         self._enableChecklists.set_active(config.enableChecklists)
@@ -321 +322 @@
         config.enableApproachCallouts = self._enableApproachCallouts.get_active()
         config.speedbrakeAtTD = self._speedbrakeAtTD.get_active()
+        config.soundSet = 1 if self._alternativeSoundSet.get_active() else 0
 
         config.enableChecklists = self._enableChecklists.get_active()
@@ -726 +728 @@
         backgroundBox.pack_start(self._speedbrakeAtTD, False, False, 4)
 
+        self._alternativeSoundSet = Gtk.CheckButton(xstr("prefs_sounds_alternativeSoundSet"))
+        self._alternativeSoundSet.set_use_underline(True)
+        self._alternativeSoundSet.set_tooltip_text(
+            xstr("prefs_sounds_alternativeSoundSet_tooltip"))
+        backgroundBox.pack_start(self._alternativeSoundSet, False, False, 4)
+
         checklistFrame = Gtk.Frame(label = xstr("prefs_sounds_frame_checklists"))
         mainBox.pack_start(checklistFrame, False, False, 4)
@@ -769 +777 @@
         self._enableApproachCallouts.set_sensitive(active)
         self._speedbrakeAtTD.set_sensitive(active)
+        self._alternativeSoundSet.set_sensitive(active)
 
     def _pilotControlsSoundsToggled(self, button):

src/mlx/soundsched.py

@@ -139 +139 @@
     played."""
 
-    _sounds = { const.AIRCRAFT_B736  : const.SOUND_TAXI_BOEING737NG,
-                const.AIRCRAFT_B737  : const.SOUND_TAXI_BOEING737NG,
-                const.AIRCRAFT_B738  : const.SOUND_TAXI_BOEING737NG,
-                const.AIRCRAFT_B738C : const.SOUND_TAXI_BOEING737NG,
-                const.AIRCRAFT_B762  : const.SOUND_TAXI_BOEING767,
-                const.AIRCRAFT_B763  : const.SOUND_TAXI_BOEING767,
-                const.AIRCRAFT_F70   : const.SOUND_TAXI_F70 }
+    _sounds = [{ const.AIRCRAFT_B736  : const.SOUND_TAXI_BOEING737NG,
+                 const.AIRCRAFT_B737  : const.SOUND_TAXI_BOEING737NG,
+                 const.AIRCRAFT_B738  : const.SOUND_TAXI_BOEING737NG,
+                 const.AIRCRAFT_B738C : const.SOUND_TAXI_BOEING737NG,
+                 const.AIRCRAFT_B762  : const.SOUND_TAXI_BOEING767,
+                 const.AIRCRAFT_B763  : const.SOUND_TAXI_BOEING767,
+                 const.AIRCRAFT_F70   : const.SOUND_TAXI_F70 },
+               { const.AIRCRAFT_B736  : const.SOUND_TAXI_BOEING737NG_ALT1,
+                 const.AIRCRAFT_B737  : const.SOUND_TAXI_BOEING737NG_ALT1,
+                 const.AIRCRAFT_B738  : const.SOUND_TAXI_BOEING737NG_ALT1,
+                 const.AIRCRAFT_B738C : const.SOUND_TAXI_BOEING737NG_ALT1,
+                 const.AIRCRAFT_B762  : const.SOUND_TAXI_BOEING767_ALT1,
+                 const.AIRCRAFT_B763  : const.SOUND_TAXI_BOEING767_ALT1,
+                 const.AIRCRAFT_F70   : const.SOUND_TAXI_F70 },
+               ]
 
     def __init__(self, flight, boardingSound = None):
@@ -165 +173 @@
         super(TaxiSound, self)._playbackDone(success, extra)
         aircraftType = self._flight.aircraftType
+
+        soundSet = self._flight.config.soundSet
         sounds = TaxiSound._sounds
+        sounds = sounds[soundSet] if soundSet<len(sounds) else sounds[-1]
+
         if aircraftType in sounds:
             startSound(sounds[aircraftType])