mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-03 09:01:54 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

context: move core implementation to impl-core.h

Browse source 
Move the core implementation to a separate file. Make a default
core object in the context.

Pass impl-core to server. We now tie the server to a core. Also
keep track of the core that a client connected to.

Fill the properties that we usually use to connect in the context
and copy them when a connection is made.

Use "internal" as the remote name to connect to the default
internal core.
This commit is contained in:
Wim Taymans 2019-12-12 16:34:01 +01:00
parent a1451fd820
commit f724319e8a
16 changed files with 839 additions and 613 deletions
Download patch file Download diff file Expand all files Collapse all files

37
src/tests/test-context.c
View file

@ -38,7 +38,6 @@ static void test_abi(void)
uint32_t version;
void (*destroy) (void *data);
void (*free) (void *data);
void (*info_changed) (void *data, const struct pw_core_info *info);
void (*check_access) (void *data, struct pw_impl_client *client);
void (*global_added) (void *data, struct pw_global *global);
void (*global_removed) (void *data, struct pw_global *global);
@ -46,7 +45,6 @@ static void test_abi(void)
TEST_FUNC(ev, test, destroy);
TEST_FUNC(ev, test, free);
TEST_FUNC(ev, test, info_changed);
TEST_FUNC(ev, test, check_access);
TEST_FUNC(ev, test, global_added);
TEST_FUNC(ev, test, global_removed);
@ -63,10 +61,6 @@ static void context_free_error(void *data)
{
spa_assert_not_reached();
}
static void context_info_changed_error(void *data, const struct pw_core_info *info)
{
spa_assert_not_reached();
}
static void context_check_access_error(void *data, struct pw_impl_client *client)
{
spa_assert_not_reached();
@ -85,7 +79,6 @@ static const struct pw_context_events context_events_error =
PW_VERSION_CONTEXT_EVENTS,
.destroy = context_destroy_error,
.free = context_free_error,
.info_changed = context_info_changed_error,
.check_access = context_check_access_error,
.global_added = context_global_added_error,
.global_removed = context_global_removed_error,
@ -123,7 +116,6 @@ static void test_create(void)
struct pw_context *context;
struct spa_hook listener = { NULL, };
struct pw_context_events context_events = context_events_error;
struct pw_global *global;
int res;
loop = pw_main_loop_new(NULL);
@ -131,7 +123,7 @@ static void test_create(void)
context = pw_context_new(pw_main_loop_get_loop(loop),
pw_properties_new(
PW_KEY_CORE_PROFILE_MODULES, "none",
PW_KEY_CONTEXT_PROFILE_MODULES, "none",
NULL), 12);
spa_assert(context != NULL);
pw_context_add_listener(context, &listener, &context_events, context);
@ -141,19 +133,6 @@ static void test_create(void)
/* check user data */
spa_assert(pw_context_get_user_data(context) != NULL);
/* check info */
spa_assert(pw_context_get_info(context) != NULL);
/* check global */
global = pw_context_get_global(context);
spa_assert(global != NULL);
spa_assert(pw_context_find_global(context, 0) == global);
spa_assert(pw_global_get_context(global) == context);
spa_assert(pw_global_get_type(global) == PW_TYPE_INTERFACE_Core);
spa_assert(pw_global_get_version(global) == PW_VERSION_CORE);
spa_assert(pw_global_get_id(global) == 0);
spa_assert(pw_global_get_object(global) == (void*)context);
/* iterate globals */
spa_assert(context_foreach_count == 0);
res = pw_context_for_each_global(context, context_foreach, context);
@ -178,15 +157,6 @@ static void test_create(void)
pw_main_loop_destroy(loop);
}
static int info_changed_count = 0;
static void context_info_changed_count(void *data, const struct pw_core_info *info)
{
spa_assert(spa_dict_lookup(info->props, "foo") == NULL);
spa_assert(!strcmp(spa_dict_lookup(info->props, "biz"), "buzz"));
spa_assert(!strcmp(spa_dict_lookup(info->props, "buzz"), "frizz"));
info_changed_count++;
}
static void test_properties(void)
{
struct pw_main_loop *loop;
@ -206,9 +176,6 @@ static void test_properties(void)
spa_assert(pw_context_get_user_data(context) == NULL);
pw_context_add_listener(context, &listener, &context_events, context);
context_events.info_changed = context_info_changed_count;
spa_assert(info_changed_count == 0);
props = pw_context_get_properties(context);
spa_assert(props != NULL);
spa_assert(!strcmp(pw_properties_get(props, "foo"), "bar"));
@ -223,8 +190,6 @@ static void test_properties(void)
items[2] = SPA_DICT_ITEM_INIT("buzz", "frizz");
pw_context_update_properties(context, &SPA_DICT_INIT(items, 3));
spa_assert(info_changed_count == 1);
spa_assert(props == pw_context_get_properties(context));
spa_assert(pw_properties_get(props, "foo") == NULL);
spa_assert(!strcmp(pw_properties_get(props, "biz"), "buzz"));