Changeset 170:7cda0cc74e19

Timestamp:

05/12/12 15:48:45 (12 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

The background sounds play back properly

Files:

• sounds/737taxi.mp3 (added)
• sounds/767taxi.mp3 (added)
• sounds/F70taxi.mp3 (added)
• sounds/TOC.mp3 (added)
• sounds/TOD.mp3 (added)
• sounds/TaxiAfterLand.mp3 (added)
• sounds/board.mp3 (added)
• sounds/cpt_takeoff.mp3 (added)
• sounds/malev.mp3 (added)
• sounds/notam.mp3 (added)
• sounds/notify.wav (added)
• sounds/sikoly.mp3 (added)
• sounds/speed.mp3 (added)
• sounds/taps.mp3 (added)
• src/mlx/acft.py (modified) (1 diff)
• src/mlx/checks.py (modified) (2 diffs)
• src/mlx/const.py (modified) (2 diffs)
• src/mlx/flight.py (modified) (8 diffs)
• src/mlx/fs.py (modified) (1 diff)
• src/mlx/gui/flight.py (modified) (2 diffs)
• src/mlx/gui/gui.py (modified) (1 diff)
• src/mlx/sound.py (modified) (9 diffs)
• src/mlx/soundsched.py (added)

src/mlx/acft.py

@@ -230 +230 @@
         """Called when the flare has finished."""
         (flareTimeFromFS, flareTime) = self.flight.flareFinished(flareEnd,
-                                                                 flareEndFS)
+                                                                 flareEndFS,
+                                                                 tdRate)
         self.logger.message(self._aircraftState.timestamp,
                             "Flaretime: %.3f (from %s)" % \

src/mlx/checks.py

@@ -7 +7 @@
 import util
 from acars import ACARS
+from sound import startSound
 
 import time
@@ -178 +179 @@
                     logger.message(state.timestamp, "Spoilers deployed")
                     self._logged = True
+                    config = flight.config
+                    if config.enableSounds and config.speedbrakeAtTD:
+                        startSound(const.SOUND_SPEEDBRAKE)
             else:
                 self._spoilersExtension = state.spoilersExtension

src/mlx/const.py

@@ -4 +4 @@
 
 # The version of the program
-VERSION="0.04"
+VERSION="0.05"
 
 #-------------------------------------------------------------------------------
@@ -295 +295 @@
 SOUND_DING = "ding.wav"
 
+# Sound: notify
+SOUND_NOTIFY = "notify.wav"
+
+# Sound: NOTAM
+SOUND_NOTAM = "notam.mp3"
+
+# Sound: scream
+SOUND_SCREAM = "sikoly.mp3"
+
+# Sound: boarding
+SOUND_BOARDING = "board.mp3"
+
+# Sound: Malev theme
+SOUND_MALEV = "malev.mp3"
+
+# Sound: taxi: Boeing 737 NG
+SOUND_TAXI_BOEING737NG = "737taxi.mp3"
+
+# Sound: taxi: Boeing 767
+SOUND_TAXI_BOEING767 = "767taxi.mp3"
+
+# Sound: taxi: Fokker F70
+SOUND_TAXI_F70 = "F70taxi.mp3"
+
+# Sound: takeoff preparation request from the captain
+SOUND_CAPTAIN_TAKEOFF = "cpt_takeoff.mp3"
+
+# Sound: cruise
+SOUND_CRUISE = "TOC.mp3"
+
+# Sound: descent
+SOUND_DESCENT = "TOD.mp3"
+
+# Sound: applause
+SOUND_APPLAUSE = "taps.mp3"
+
+# Sound: speedbrake
+SOUND_SPEEDBRAKE = "speed.mp3"
+
+# Sound: taxi after landing
+SOUND_TAXIAFTERLAND = "TaxiAfterLand.mp3"
+
+
 #-------------------------------------------------------------------------------
 

src/mlx/flight.py

@@ -2 +2 @@
 
 #---------------------------------------------------------------------------------------
+
+from soundsched import SoundScheduler
 
 import const
@@ -32 +34 @@
         gui.resetFlightStatus()
 
+        self._soundScheduler = SoundScheduler(self)
+        self._pilotHotkeyPressed = False
+        self._checklistHotkeyPressed = False
+
         self.flareTimeFromFS = False
         self.entranceExam = False
@@ -59 +65 @@
         self._flareStartFS = None
 
+        self._tdRate = None
+
     @property
     def config(self):
@@ -103 +111 @@
         """Get the VRef speed of the flight."""
         return self._gui.vref
+
+    @property
+    def tdRate(self):
+        """Get the touchdown rate if known, None otherwise."""
+        return self._tdRate
 
     def handleState(self, oldState, currentState):
@@ -111 +124 @@
         if self.startFuel is None:
             self.startFuel = self.endFuel
+        
+        self._soundScheduler.schedule(currentState,
+                                      self._pilotHotkeyPressed)
+        self._pilotHotkeyPressed = False
 
     def setStage(self, timestamp, stage):
@@ -155 +172 @@
         self._flareStartFS = flareStartFS
 
-    def flareFinished(self, flareEnd, flareEndFS):
+    def flareFinished(self, flareEnd, flareEndFS, tdRate):
         """Called when the flare time has ended.
         
@@ -162 +179 @@
         - the flare time
         """
+        self._tdRate = tdRate
         if self.flareTimeFromFS:
             return (True, flareEndFS - self._flareStartFS)
@@ -176 +194 @@
         """Get the fleet and call the given callback."""
         self._gui.getFleetAsync(callback = callback, force = force)
+
+    def pilotHotkeyPressed(self):
+        """Called when the pilot hotkey is pressed."""
+        self._pilotHotkeyPressed = True
+
+    def checklistHotkeyPressed(self):
+        """Called when the checklist hotkey is pressed."""
+        self._checklistHotkeyPressed = True
 
     def _updateFlownDistance(self, currentState):

src/mlx/fs.py

@@ -109 +109 @@
         if messageLevel==const.MESSAGELEVEL_SOUND or \
            messageLevel==const.MESSAGELEVEL_BOTH:
-            startSound(const.SOUND_DING)
+            startSound(const.SOUND_NOTIFY
+                       if messageType==const.MESSAGETYPE_VISIBILITY
+                       else const.SOUND_DING)
         if (messageLevel==const.MESSAGELEVEL_FS or \
             messageLevel==const.MESSAGELEVEL_BOTH):

src/mlx/gui/flight.py

@@ -10 +10 @@
 from mlx.pirep import PIREP
 from mlx.i18n import xstr
+from mlx.sound import startSound
 
 import datetime
@@ -1423 +1424 @@
                                                   bookedFlight.departureICAO,
                                                   bookedFlight.arrivalICAO)
+            startSound(const.SOUND_NOTAM)
 
     def _notamsCallback(self, returned, result):

src/mlx/gui/gui.py

@@ -1130 +1130 @@
         """Handle the hotkeys."""
         if id==self._hotkeySetID:
-            print "gui.GUI._handleHotkeys", hotkeys
+            for index in hotkeys:
+                if index==0:
+                    self._flight.pilotHotkeyPressed()
+                else:
+                    self._flight.checklistHotkeyPressed()

src/mlx/sound.py

@@ -4 +4 @@
 
 import os
+import traceback
 
 #------------------------------------------------------------------------------
@@ -50 +51 @@
 
             self._requestCondition = threading.Condition()
-            self._requestedPaths = []
-            self._pendingAliases = []
+            self._requests = []
+            self._pending = []
             self._count = 0
 
             self.daemon = True
 
-        def requestSound(self, name):
+        def requestSound(self, name, finishCallback = None, extra = None):
             """Request the playback of the sound with the given name."""
             path = os.path.join(self._soundsDirectory, name)
             with self._requestCondition:
-                self._requestedPaths.append(path)
+                self._requests.append((path, (finishCallback, extra)))
                 self._requestCondition.notify()
 
@@ -72 +73 @@
             while True:
                 with self._requestCondition:
-                    if not self._requestedPaths:
-                        if self._pendingAliases:
-                            timeout = max(time.time() -
-                                          self._pendingAliases[0][0], 0.0)
+                    if not self._requests:
+                        if self._pending:
+                            timeout = max(time.time() - self._pending[0][0],
+                                          0.0)
                         else:
                             timeout = 10.0
@@ -81 +82 @@
                         self._requestCondition.wait(timeout)
 
-                    requestedPaths = []
-                    for path in self._requestedPaths:
-                        requestedPaths.append((path, self._count))
+                    requests = []
+                    for (path, finishData) in self._requests:
+                        requests.append((path, finishData, self._count))
                         self._count += 1
-                    self._requestedPaths = []
+                    self._requests = []
 
                     now = time.time()
-                    aliasesToClose = []
-                    while self._pendingAliases and \
-                          self._pendingAliases[0][0]<=now:
-                        aliasesToClose.append(self._pendingAliases[0][1])
-                        del self._pendingAliases[0]
+                    toClose = []
+                    while self._pending and \
+                          self._pending[0][0]<=now:
+                        toClose.append(self._pending[0][1])
+                        del self._pending[0]
 
-                for alias in aliasesToClose:
+                for (alias, (finishCallback, extra)) in toClose:
+                    success = True
                     try:
                         print "Closing", alias
@@ -101 +103 @@
                     except Exception, e:
                         print "Failed closing " + alias + ":", str(e)
+                        success = False
 
-                for (path, counter) in requestedPaths:
+                    if finishCallback is not None:
+                        try:
+                            finishCallback(success, extra)
+                        except:
+                            traceback.print_exc()
+
+                for (path, finishData, counter) in requests:
                     try:
                         alias = "mlxsound%d" % (counter,)
@@ -117 +126 @@
                         timeout = time.time() + length / 1000.0
                         with self._requestCondition:
-                            self._pendingAliases.append((timeout, alias))
-                            self._pendingAliases.sort()
+                            self._pending.append((timeout, (alias, finishData)))
+                            self._pending.sort()
                         print "Started to play", path
                     except Exception, e:
-                        print "Failed to start playing " + path + ":", str(e)
+                        print "Failed to start playing " + path + ":", str(e)                        
+                        (finishCallback, extra) = finishData
+                        if finishCallback is not None:
+                            try:
+                                finishCallback(None, extra)
+                            except:
+                                traceback.print_exc()
 
     _thread = None
@@ -132 +147 @@
         _thread.start()
 
-    def startSound(name):
+    def startSound(name, finishCallback = None, extra = None):
         """Start playing back the given sound.
         
         name should be the name of a sound file relative to the sound directory
         given in initializeSound."""
-        _thread.requestSound(name)
+        _thread.requestSound(name, finishCallback = finishCallback,
+                             extra = extra)
         
 #------------------------------------------------------------------------------
@@ -147 +163 @@
         pass
 
-    def startSound(name):
+    def startSound(name, finishCallback = None, extra = None):
         """Start playing back the given sound.
 
@@ -157 +173 @@
 
 if __name__ == "__main__":
+    def callback(result, extra):
+        print "callback", result, extra
+    
     initializeSound("e:\\home\\vi\\tmp")
-    startSound("malev.mp3")
+    startSound("malev.mp3", finishCallback = callback, extra="malev.mp3")
     time.sleep(5)
-    startSound("ding.wav")
+    startSound("ding.wav", finishCallback = callback, extra="ding1.wav")
     time.sleep(5)
-    startSound("ding.wav")
+    startSound("ding.wav", finishCallback = callback, extra="ding2.wav")
     time.sleep(5)
-    startSound("ding.wav")
+    startSound("ding.wav", finishCallback = callback, extra="ding3.wav")
     time.sleep(50)