From: Ismo Puustinen <ismo.puustinen@intel.com>
Date: Thu, 2 Jan 2014 11:02:16 +0000 (+0200)
Subject: config: use the correct table for shift position.
X-Git-Tag: accepted/tizen/ivi/20140108.215126~2
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=b8c317f18c1ed4c9a6636a72c30242afcd0303b1;p=profile%2Fivi%2Fpulseaudio-module-murphy-ivi.git

config: use the correct table for shift position.
Change tabs to spaces.

Change-Id: I8b64f986456a358c843a5f211f0da615919c4690
---

diff --git a/murphy/murphy-ivi.lua b/murphy/murphy-ivi.lua
index ec7832a..79415db 100644
--- a/murphy/murphy-ivi.lua
+++ b/murphy/murphy-ivi.lua
@@ -73,7 +73,7 @@ application_class {
     priority = 3,
     route = {
         output = { driver = routing_group.default_driver_output,
-	           passanger1 = routing_group.default_passanger1_output }
+               passanger1 = routing_group.default_passanger1_output }
     },
     roles = { navigator = {0, "autorelease", "mandatory", "shared"} },
     binaries = { ['net.zmap.navi'] = { 0, "autorelease", "mandatory", "shared" } }
@@ -85,7 +85,7 @@ application_class {
     priority = 2,
     route = {
         output = { driver = routing_group.default_driver_output,
-	           passanger1 = routing_group.default_passanger1_output }
+               passanger1 = routing_group.default_passanger1_output }
     },
     roles = { game = {0, "mandatory", "exclusive"} }
 }
@@ -106,11 +106,11 @@ application_class {
     priority = 1,
     route = {
         output = { driver = routing_group.default_driver_output,
-	               passanger1 = routing_group.default_passanger1_output }
+                   passanger1 = routing_group.default_passanger1_output }
     },
     roles = { music    = {0, "mandatory", "exclusive"},
               video    = {0, "mandatory", "exclusive"},
-	          test     = {0, "mandatory", "exclusive"},
+              test     = {0, "mandatory", "exclusive"},
               bt_music = no_resource
     },
     binaries = { ['t8j6HTRpuz.MediaPlayer'] = "music" }
@@ -122,7 +122,7 @@ application_class {
     priority = 1,
     route = {
         output = { driver = routing_group.default_driver_output,
-	           passanger1 = routing_group.default_passanger1_output }
+               passanger1 = routing_group.default_passanger1_output }
     },
     roles = { browser = {0, "mandatory", "shared"} }
 }
@@ -152,20 +152,20 @@ mdb.import {
     condition = "zone_name = 'driver'",
     maxrow = 1,
     update = function(self)
-    	zid = self[1].zone_id
-	if (zid == nil) then zid = "<nil>" end
-	class = self[1].application_class
-	if (class == nil) then class = "<nil>" end
-	role = self[1].role
-	if (role == nil) then role = "<nil>" end
+        zid = self[1].zone_id
+    if (zid == nil) then zid = "<nil>" end
+    class = self[1].application_class
+    if (class == nil) then class = "<nil>" end
+    role = self[1].role
+    if (role == nil) then role = "<nil>" end
 --      print("*** import "..self.table.." update: zone:"..zid.." class:"..class.." role:"..role)
     end
 }
 
 mdb.import {
-    table = "amb_shift_position",
-    columns = {"shift_position"},
-    condition = "id = 0",
+    table = "amb_gear_position",
+    columns = { "value" },
+    condition = "key = 'GearPosition'",
     maxrow = 1,
     update = builtin.method.make_volumes
 }
@@ -191,12 +191,12 @@ volume_limit {
     limit = -90,
     node_type = { node.player, node.game },
     calculate = function(self, class, device)
---    	print("*** limit "..self.name.." class:"..class.." stream:"..device.name)
-    	position = mdb.import.amb_shift_position[1].shift_position
-    	if (position  and position == 128) then
-    	    return self.limit
-    	end
-    	return 0
+--      print("*** limit "..self.name.." class:"..class.." stream:"..device.name)
+        position = mdb.import.amb_gear_position[1].value
+        if (position and position == 128) then
+            return self.limit
+        end
+        return 0
     end
 }