colin/wireplumber
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename all foo_iterate APIs to foo_new_iterator

Browse Source 
Avoids confusion with LUA iterate API
This commit is contained in:
Julian Bouzas
2021-02-05 10:20:33 -05:00
parent d0113e54cb
commit dc2ad1f25d
36 changed files with 163 additions and 149 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
modules/module-lua-scripting/api.c
View File

@@ -543,7 +543,7 @@ static int
object_manager_iterate (lua_State *L)
{
WpObjectManager *om = wplua_checkobject (L, 1, WP_TYPE_OBJECT_MANAGER);
WpIterator *it = wp_object_manager_iterate (om);
WpIterator *it = wp_object_manager_new_iterator (om);
return push_wpiterator (L, it);
}
@@ -552,8 +552,8 @@ object_manager_iterate_filtered (lua_State *L)
{
WpObjectManager *om = wplua_checkobject (L, 1, WP_TYPE_OBJECT_MANAGER);
WpObjectInterest *oi = wplua_checkboxed (L, 2, WP_TYPE_OBJECT_INTEREST);
WpIterator *it =
wp_object_manager_iterate_filtered_full (om, wp_object_interest_ref (oi));
WpIterator *it = wp_object_manager_new_filtered_iterator_full (om,
wp_object_interest_ref (oi));
return push_wpiterator (L, it);
}
@@ -590,7 +590,7 @@ metadata_iterate (lua_State *L)
{
WpMetadata *metadata = wplua_checkobject (L, 1, WP_TYPE_METADATA);
lua_Integer subject = luaL_checkinteger (L, 2);
g_autoptr (WpIterator) it = wp_metadata_iterate (metadata, subject);
g_autoptr (WpIterator) it = wp_metadata_new_iterator (metadata, subject);
return push_metadata_wpiterator (L, it);
}
@@ -618,7 +618,7 @@ static int
session_iterate_endpoints (lua_State *L)
{
WpSession *session = wplua_checkobject (L, 1, WP_TYPE_SESSION);
WpIterator *it = wp_session_iterate_endpoints (session);
WpIterator *it = wp_session_new_endpoints_iterator (session);
return push_wpiterator (L, it);
}
@@ -626,7 +626,7 @@ static int
session_iterate_links (lua_State *L)
{
WpSession *session = wplua_checkobject (L, 1, WP_TYPE_SESSION);
WpIterator *it = wp_session_iterate_links (session);
WpIterator *it = wp_session_new_links_iterator (session);
return push_wpiterator (L, it);
}
@@ -667,7 +667,7 @@ static int
endpoint_iterate_streams (lua_State *L)
{
WpEndpoint *ep = wplua_checkobject (L, 1, WP_TYPE_ENDPOINT);
WpIterator *it = wp_endpoint_iterate_streams (ep);
WpIterator *it = wp_endpoint_new_streams_iterator (ep);
return push_wpiterator (L, it);
}

8
modules/module-lua-scripting/pod.c
View File

@@ -783,7 +783,7 @@ push_primitive_values (lua_State *L, WpSpaPod *pod, const gchar* type_name,
guint start_index)
{
g_auto (GValue) item = G_VALUE_INIT;
g_autoptr (WpIterator) it = wp_spa_pod_iterate (pod);
g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (pod);
for (; wp_iterator_next (it, &item); g_value_unset (&item)) {
gpointer p = g_value_get_pointer (&item);
if (!p || !type_name)
@@ -928,7 +928,7 @@ push_luapod (lua_State *L, WpSpaPod *pod)
lua_rawseti (L, -2, 0);
lua_pushstring (L, id_name);
lua_rawseti (L, -2, 1);
it = wp_spa_pod_iterate (pod);
it = wp_spa_pod_new_iterator (pod);
for (; wp_iterator_next (it, &item); g_value_unset (&item)) {
WpSpaPod *prop = g_value_get_boxed (&item);
const gchar *key = NULL;
@@ -942,7 +942,7 @@ push_luapod (lua_State *L, WpSpaPod *pod)
/* Struct */
else if (wp_spa_pod_is_struct (pod)) {
g_auto (GValue) item = G_VALUE_INIT;
g_autoptr (WpIterator) it = wp_spa_pod_iterate (pod);
g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (pod);
guint i = 0;
lua_newtable (L);
for (; wp_iterator_next (it, &item); g_value_unset (&item)) {
@@ -955,7 +955,7 @@ push_luapod (lua_State *L, WpSpaPod *pod)
/* Sequence */
else if (wp_spa_pod_is_sequence (pod)) {
g_auto (GValue) item = G_VALUE_INIT;
g_autoptr (WpIterator) it = wp_spa_pod_iterate (pod);
g_autoptr (WpIterator) it = wp_spa_pod_new_iterator (pod);
guint i = 0;
lua_newtable (L);
for (; wp_iterator_next (it, &item); g_value_unset (&item)) {