mirrors/pipewire
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pipewire/pipewire.git synced 2025-11-04 13:30:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

pulse: don't use endpoints

Browse source 
Revert back to using nodes, ports and devices. Let's first get this
stable until we add endpoints in the mix.
This commit is contained in:
Wim Taymans 2020-01-13 09:30:25 +01:00
parent 9db240e786
commit 3dbcc7808c
4 changed files with 174 additions and 238 deletions
Download patch file Download diff file Expand all files Collapse all files

22
pipewire-pulseaudio/src/internal.h
View file

@ -34,7 +34,6 @@
#include <pulse/version.h>
#include <pipewire/pipewire.h>
#include <extensions/session-manager.h>
/* Some PulseAudio API added const qualifiers in 13.0 */
#if PA_MAJOR >= 13
@ -216,6 +215,9 @@ struct param {
void *param;
};
#define PA_IDX_FLAG_DSP 0x800000U
#define PA_IDX_MASK_DSP 0x7fffffU
struct global {
struct spa_list link;
uint32_t id;
@ -226,7 +228,7 @@ struct global {
pa_subscription_mask_t mask;
pa_subscription_event_type_t event;
int priority_session;
int priority_master;
int pending_seq;
int init:1;
int subscribed:1;
@ -239,15 +241,12 @@ struct global {
struct spa_hook object_listener;
union {
/* for links, globals are endpoints */
/* for links */
struct {
struct global *output;
struct global *input;
struct global *src;
struct global *dst;
} link_info;
struct {
uint32_t endpoint_id;
} stream_info;
/* for endpoints */
/* for sink/source */
struct {
uint32_t client_id;
uint32_t monitor;
@ -256,8 +255,10 @@ struct global {
uint32_t n_channel_volumes;
float channel_volumes[SPA_AUDIO_MAX_CHANNELS];
uint32_t device_id;
} node_info;
struct {
uint32_t node_id;
} endpoint_info;
} port_info;
/* for devices */
struct {
struct spa_list profiles;
@ -341,7 +342,6 @@ struct pa_stream {
pa_format_info *req_formats[PA_MAX_FORMATS];
pa_format_info *format;
uint32_t endpoint_id;
uint32_t stream_index;
pa_buffer_attr buffer_attr;