Commit 8fa61167 authored by Julian Bouzas's avatar Julian Bouzas Committed by George Kiagiadakis
Browse files

m-lua-scripting: start indices from 1 when parsing pods

For consistency with LUA
parent b485f0a6
......@@ -948,9 +948,9 @@ push_luapod (lua_State *L, WpSpaPod *pod, WpSpaIdValue field_idval)
wp_spa_pod_get_object (pod, &id_name, NULL);
lua_newtable (L);
lua_pushstring (L, wp_spa_type_name (type));
lua_rawseti (L, -2, 0);
lua_pushstring (L, id_name);
lua_rawseti (L, -2, 1);
lua_pushstring (L, id_name);
lua_rawseti (L, -2, 2);
it = wp_spa_pod_new_iterator (pod);
for (; wp_iterator_next (it, &item); g_value_unset (&item)) {
WpSpaPod *prop = g_value_get_boxed (&item);
......@@ -969,7 +969,7 @@ push_luapod (lua_State *L, WpSpaPod *pod, WpSpaIdValue field_idval)
else if (wp_spa_pod_is_struct (pod)) {
g_auto (GValue) item = G_VALUE_INIT;
g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (pod);
guint i = 0;
guint i = 1;
lua_newtable (L);
for (; wp_iterator_next (it, &item); g_value_unset (&item)) {
WpSpaPod *val = g_value_get_boxed (&item);
......@@ -982,7 +982,7 @@ push_luapod (lua_State *L, WpSpaPod *pod, WpSpaIdValue field_idval)
else if (wp_spa_pod_is_sequence (pod)) {
g_auto (GValue) item = G_VALUE_INIT;
g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (pod);
guint i = 0;
guint i = 1;
lua_newtable (L);
for (; wp_iterator_next (it, &item); g_value_unset (&item)) {
WpSpaPod *control = g_value_get_boxed (&item);
......@@ -1007,8 +1007,8 @@ push_luapod (lua_State *L, WpSpaPod *pod, WpSpaIdValue field_idval)
WpSpaType type = wp_spa_pod_get_spa_type (child);
lua_newtable (L);
lua_pushstring (L, wp_spa_type_name (type));
lua_rawseti (L, -2, 0);
push_primitive_values (L, pod, type, 1);
lua_rawseti (L, -2, 1);
push_primitive_values (L, pod, type, 2);
}
/* Choice */
......@@ -1019,8 +1019,8 @@ push_luapod (lua_State *L, WpSpaPod *pod, WpSpaIdValue field_idval)
choice_type = wp_spa_id_value_short_name (wp_spa_pod_get_choice_type (pod));
lua_newtable (L);
lua_pushstring (L, choice_type);
lua_rawseti (L, -2, 0);
push_primitive_values (L, pod, type, 1);
lua_rawseti (L, -2, 1);
push_primitive_values (L, pod, type, 2);
}
/* Error */
......
......@@ -70,7 +70,7 @@ assert (pod:get_type_name() == "Spa:Fraction")
-- Struct
pod = Pod.Struct { true, 1, "string" }
val = pod:parse()
assert (val[0] and val[1] == 1 and val[2] == "string")
assert (val[1] and val[2] == 1 and val[3] == "string")
assert (pod:get_type_name() == "Spa:Pod:Struct")
-- Object
......@@ -81,8 +81,8 @@ pod = Pod.Object {
monitor = true
}
val = pod:parse()
assert (val[0] == "Spa:Pod:Object:Param:PortConfig")
assert (val[1] == "PortConfig")
assert (val[1] == "Spa:Pod:Object:Param:PortConfig")
assert (val[2] == "PortConfig")
assert (val.direction == "Input")
assert (val.mode == "dsp")
assert (val.monitor)
......@@ -95,29 +95,29 @@ pod = Pod.Sequence {
{offset = 40, typename = "Properties", value = 4},
}
val = pod:parse()
assert (val[0].offset == 10 and val[0].typename == "Properties" and val[0].value == 1)
assert (val[1].offset == 20 and val[1].typename == "Properties" and val[1].value == 2)
assert (val[2].offset == 40 and val[2].typename == "Properties" and val[2].value == 4)
assert (val[1].offset == 10 and val[1].typename == "Properties" and val[1].value == 1)
assert (val[2].offset == 20 and val[2].typename == "Properties" and val[2].value == 2)
assert (val[3].offset == 40 and val[3].typename == "Properties" and val[3].value == 4)
assert (pod:get_type_name() == "Spa:Pod:Sequence")
-- Array
pod = Pod.Array { "Spa:Bool", true, false, false, true }
val = pod:parse()
assert (val[0] == "Spa:Bool")
assert (val[1])
assert (not val[2])
assert (val[1] == "Spa:Bool")
assert (val[2])
assert (not val[3])
assert (val[4])
assert (not val[4])
assert (val[5])
assert (pod:get_type_name() == "Spa:Array")
-- Choice
pod = Pod.Choice { "Enum", 5, 6, 7, 8 }
val = pod:parse()
assert (val[0] == "Enum")
assert (val[1] == 5)
assert (val[2] == 6)
assert (val[3] == 7)
assert (val[4] == 8)
assert (val[1] == "Enum")
assert (val[2] == 5)
assert (val[3] == 6)
assert (val[4] == 7)
assert (val[5] == 8)
assert (pod:get_type_name() == "Spa:Pod:Choice")
-- Nested Pods
......@@ -136,8 +136,8 @@ pod = Pod.Object {
}
}
val = pod:parse()
assert (val[0] == "Spa:Pod:Object:Param:PortConfig")
assert (val[1] == "PortConfig")
assert (val[1] == "Spa:Pod:Object:Param:PortConfig")
assert (val[2] == "PortConfig")
assert (val.direction == "Input")
assert (val.mode == "dsp")
assert (val.monitor)
......@@ -145,5 +145,5 @@ assert (val.format.mediaType == "audio")
assert (val.format.mediaSubtype == "raw")
assert (val.format.rate == 48000)
assert (val.format.channels == 2)
assert (val.format.position[0] == "Spa:Id" and val.format.position[1] == 0 and val.format.position[2] == 1)
assert (val.format.position[1] == "Spa:Id" and val.format.position[2] == 0 and val.format.position[3] == 1)
assert (pod:get_type_name() == "Spa:Pod:Object:Param:PortConfig")
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment