From 36c9f2b47b803dd4f7575c8170ba1583b0b7ccea Mon Sep 17 00:00:00 2001
From: Paulus <Paulus@46df4e5c-bc4e-4628-a0fc-830ba316316d>
Date: Tue, 11 Nov 2008 16:46:30 +0000
Subject: [PATCH] changed oevents/rules.yaml to work with MS 4

git-svn-id: http://www.neo1973-germany.de/svn@210 46df4e5c-bc4e-4628-a0fc-830ba316316d
---
 .../trunk/fso_soundmanagement.tar             | Bin 194560 -> 81920 bytes
 fso_soundmanagement/trunk/src/README          |   8 +++++++-
 .../trunk/src/auxmenu/auxmenu.py              |   2 +-
 .../trunk/src/oevents/rules.yaml              |  19 ++++++++++++++++--
 4 files changed, 25 insertions(+), 4 deletions(-)

diff --git a/fso_soundmanagement/trunk/fso_soundmanagement.tar b/fso_soundmanagement/trunk/fso_soundmanagement.tar
index 2520603bdc4be08e9490ac6ba3f337e1159423c8..6607a20d8759fcd834e4ddbbe3a7e912cc9737bf 100644
GIT binary patch
delta 1266
zcmb_bO=uHA6wcc=Hi;GyHAqD|R%lx2&&>YCMntStVznx*A|BK3Bw0*%%kCz%sI+SF
zVh>`Zi&sxQsdNtudg{%KH&MZZK@b!{1&<1GcC*_iJ-dft=Y8*e@0<6t^lRtRQuN`<
z9$63so|ht+5S|w!NUD+!#R2GmYV5_b2NPZv87v6tbOd1!t^(B8W3k?9?8EH?X%ZoX
zV4nx4Jx5-a14jpj|HNZ+`aCuCe13i8Z~LRKe#(%O7g<W5(}8af+FH}$rgTrova2%q
zu}r3yhVTM&@a4LYW_s;d5pH%dW+4>Bq+nl=7*e@#9NtGerpo3V)fD^3D0JJYEF6tq
zx_I^Uq<wN6h@BmWy**0V$XTkc4Itc~K<vxScvmxng4jOy^(fqlANDZIPzwcWWYE}j
z*}UAi^qC8$MP~<4wI=QFRA@z=p-PI;`Idc$#(c}rS*1iT=$4vSslm|Hl$En+%Kmu{
zl1YWJh1|%Zrq$D*7({ONJUoGvFX~9+L}hat<unE5$~RD!{ghO#(16_91Q2kzwFy|g
z)u>-kdn`*~yIoj>DA+rm!TshAV1Wc3aN#+$c8ADYn6n*|_{}&6cD31^FJZBXSd_fZ
z`CWJ6RckO2yx|GDx&bk;<2AU~6wGjGGkAlw-Hm;QWv<Bs%W38jP<-(pmgHI=CWQm)
z!gq+a**m&g9e6Bk<~Yc0dwDt>Sr@unF;SAXs`4A^+-fh^JnlsDDjFzDadEH{E8N{C
z=^{>VDI4VKXI9^~5)eMzK?hF6!A-p57TUXb%oaFULSEu|HuG3yqaW7zBX_Jlc}*{)
zd9_qRMVd2^rdvfeBm?%9Pn@`zNSrF>v;r;Zg-jwbNh^paID=+<qk?o=p_*k58|4x;
zhZb_PC1mMnUN^2YMyrS>RA#qyjUsU<2*)EClvfSYLKSM5Y;!Wczu5@LoBE(P&`bfE
Yrup5vL7Pb&SgV7B)@uLjz>nX+KU3UbC;$Ke

delta 11771
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

diff --git a/fso_soundmanagement/trunk/src/README b/fso_soundmanagement/trunk/src/README
index bebf8cf..0299f8b 100644
--- a/fso_soundmanagement/trunk/src/README
+++ b/fso_soundmanagement/trunk/src/README
@@ -19,4 +19,10 @@ during a call gsmhandset.state or gsmheadset.state is loaded
 Known Issues:
 -the "lock-funktion" don't work yet
 -the install script will overwrite your /etc/freesmartphone/oevents/rules.yaml and some other files.
--I don't know what happens if you plug in or remove the headset during an call
\ No newline at end of file
+-You will hear nothing, if you plug in or remove the headset during an call
+
+Changelog:
+
+Rev 210: changed oevents/rules.yaml to work with Milestone 4.
+
+Rev 209: first version: works with fso-testing before Milestone 4
diff --git a/fso_soundmanagement/trunk/src/auxmenu/auxmenu.py b/fso_soundmanagement/trunk/src/auxmenu/auxmenu.py
index 0bfba6d..68287bc 100644
--- a/fso_soundmanagement/trunk/src/auxmenu/auxmenu.py
+++ b/fso_soundmanagement/trunk/src/auxmenu/auxmenu.py
@@ -76,7 +76,7 @@ class auxmenuclass:
       os.system("apm -s")
     elif signal == "shutdown":
       print "shutdown"
-      os.system("halt")
+      os.system("poweroff")
     ecore.main_loop_quit()
   def mute(self):
     if self.profile == "default":
diff --git a/fso_soundmanagement/trunk/src/oevents/rules.yaml b/fso_soundmanagement/trunk/src/oevents/rules.yaml
index d84ac10..4ca6578 100644
--- a/fso_soundmanagement/trunk/src/oevents/rules.yaml
+++ b/fso_soundmanagement/trunk/src/oevents/rules.yaml
@@ -24,6 +24,16 @@
 -
     trigger: Time(12,29)
     actions: Debug("A Test")
+-
+    #
+    # Suspend Handling
+    #
+    trigger: InputEvent()
+    filters:
+             - HasAttr(switch, "POWER")
+             - HasAttr(event, "released")
+             - HasAttr(duration, 0)
+    actions: Suspend()
 -
     #
     # Call -> Audio Scenario Handling
@@ -122,6 +132,9 @@
     while: Test("test2")
     actions: RingTone()
 -
+    trigger: DbusTrigger(system, 'org.freesmartphone.odeviced', 0, 'org.freesmartphone.Device.IdleNotifier', 'State')
+    actions: Debug("dbus trigger test")
+- 
 
     #
     # Idleness Brightness Handling
@@ -137,6 +150,10 @@
     trigger: IdleState()
     filters: HasAttr(status, "idle_prelock")
     actions: SetDisplayBrightness("pcf50633_bl", 0)
+
+    #
+    # usb and aux Handling
+    #
 -
     trigger: InputEvent()
     filters:
@@ -151,5 +168,3 @@
              - HasAttr(event, "pressed")
 
     actions: Command('auxmenu')
-
-