Changeset 176:cb593ff93551 for src/mlx

Timestamp:

05/13/12 08:17:00 (13 years ago)

Author:

István Váradi <ivaradi@…>

Branch:

default

Phase:

public

Message:

Checklist playback seems to work

Location:

src/mlx

Files:

• flight.py (modified) (4 diffs)
• sound.py (modified) (2 diffs)
• soundsched.py (modified) (2 diffs)

src/mlx/flight.py

@@ -3 +3 @@
 #---------------------------------------------------------------------------------------
 
-from soundsched import SoundScheduler
+from soundsched import SoundScheduler, ChecklistScheduler
 
 import const
@@ -34 +34 @@
         gui.resetFlightStatus()
 
-        self._soundScheduler = SoundScheduler(self)
         self._pilotHotkeyPressed = False
         self._checklistHotkeyPressed = False
@@ -66 +65 @@
 
         self._tdRate = None
+
+        self._soundScheduler = SoundScheduler(self)
+        self._checklistScheduler = ChecklistScheduler(self)
 
     @property
@@ -128 +130 @@
                                       self._pilotHotkeyPressed)
         self._pilotHotkeyPressed = False
+
+        if self._checklistHotkeyPressed:
+            self._checklistScheduler.hotkeyPressed()
+            self._checklistHotkeyPressed = False
 
     def setStage(self, timestamp, stage):

src/mlx/sound.py

@@ -59 +59 @@
         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)
+            path = name if os.path.isabs(name) \
+                   else os.path.join(self._soundsDirectory, name)
             with self._requestCondition:
                 self._requests.append((path, (finishCallback, extra)))
@@ -167 +168 @@
 
         FIXME: it does not do anything currently, but it should."""
-        pass
+        print "sound.startSound:", name
 
 #------------------------------------------------------------------------------

src/mlx/soundsched.py

@@ -5 +5 @@
 from sound import startSound
 import const
+import fs
 
 import threading
@@ -211 +212 @@
 
 #------------------------------------------------------------------------------
+
+class ChecklistScheduler(object):
+    """A scheduler for the checklist sounds"""
+    def __init__(self, flight):
+        """Construct the checklist scheduler for the given flight."""
+        self._flight = flight
+        self._checklist = None
+        self._itemIndex = 0
+
+    def hotkeyPressed(self):
+        """Called when the checklist hotkey is pressed."""
+        flight = self._flight
+        config = flight.config
+        if config.enableChecklists and flight.aircraftType is not None:
+            if self._checklist is None:
+                self._checklist = config.getChecklist(flight.aircraftType)
+
+            index = self._itemIndex
+            if index>=len(self._checklist):
+                fs.sendMessage(const.MESSAGETYPE_INFORMATION,
+                               "End of checklist")
+            else:
+                startSound(self._checklist[index])
+                self._itemIndex += 1
+
+#------------------------------------------------------------------------------