@@ -1,4 +1,9 @@

 -------------------------------------------------------------------

+Fri Nov 24 19:29:49 UTC 2023 - Bjørn Lie <zaitor@opensuse.org>

+

+- Update to version 0.3.85

+

+-------------------------------------------------------------------

 Fri Nov  3 13:41:27 UTC 2023 - Bjørn Lie <zaitor@opensuse.org>

 - Update to version 0.3.84

​

@@ -7,7 +7,7 @@

 %define soversion 0_2

 Name:           pipewire-aptx

-Version:        0.3.84

+Version:        0.3.85

 Release:        0

 Summary:        PipeWire Bluetooth aptX codec plugin

 License:        MIT

​

@@ -1,3 +1,61 @@

+# PipeWire 0.3.85 (2023-11-16)

+

+This is the fifth (and last) 1.0 release candidate that is API and ABI

+compatible with previous 0.3.x releases.

+

+## Highlights

+  - Fix an issue where a link could end up paused while not negotiated.

+  - Fix an infinite recursion issue when finding runnable nodes.

+  - Support XDG base directories when loading ACP config.

+  - Fix MIDI event recording preview in Ardour.

+  - Many more small fixes, cleanups and improvements.

+

+

+## PipeWire

+  - Fix an issue where a link could end up paused while not negotiated.

+    (#3619)

+  - Fix an infinite recursion issue when finding runnable nodes by stopping

+    the scan on feedback links around the driver. (#3621)

+  - The system service now has better socket permissions.

+

+## Modules

+  - Add support for uclamp. This allows the scheduler to make better informed

+    decisions about where tasks should be placed, and what pstate to set

+    for the CPU it is running on.

+  - Emit warnings when applications are not doing the right locking instead

+    of crashing.

+  - Improve media.name for RAOP sinks. (#3801)

+  - Support pause/resume in pipe-tunnel. (#3197)

+  - Remove time rlimit when probing for realtime to avoid SIGXCPU.

+

+## SPA

+  - Fix a bug where the resampler would be activated even when there is an

+    ALSA pitch element. (#3628)

+  - Improve resume from suspend in ALSA. (#3646)

+  - Add option to expose ALSA controls as prop params.

+  - Support XDG base directories when loading ACP config. This makes it possible

+    to override the ACP config files.

+

+## Bluetooth

+  - Schedule nodes in the same ISO group together.

+  - More BAP fixes and cleanups.

+

+## JACK

+  - Fix MIDI events from peer ports. This makes the MIDI event recording preview

+    of Ardour work correctly.

+

+## GStreamer

+  - Fix some error handling in the source and sink.

+

+## ALSA plugin

+  - Improve poll descriptor handling. (#3648)

+

+## Docs

+  - Many improvements to the layout and organization.

+

+Older versions:

+

+

 # PipeWire 0.3.84 (2023-11-02)

 This is the fourth 1.0 release candidate that is API and ABI compatible

@@ -56,9 +114,6 @@

 ## ALSA

   - The ALSA plugin now handles NULL values from mmap_areas. (#3600)

-Older versions:

-

-

 # PipeWire 0.3.83 (2023-10-19)

 This is the third 1.0 release candidate that is API and ABI compatible

​

@@ -1,7 +1,7 @@

 PROJECT_NAME           = PipeWire

 PROJECT_NUMBER         = @PACKAGE_VERSION@

 OUTPUT_DIRECTORY       = "@output_directory@"

-FULL_PATH_NAMES        = NO

+FULL_PATH_NAMES        = YES

 JAVADOC_AUTOBRIEF      = YES

 TAB_SIZE               = 8

 OPTIMIZE_OUTPUT_FOR_C  = YES

@@ -36,6 +36,9 @@

 SEARCHENGINE           = YES

 GENERATE_LATEX         = NO

+TOC_INCLUDE_HEADINGS   = 0

+LAYOUT_FILE            = @layout@

+

 MACRO_EXPANSION        = YES

 EXPAND_ONLY_PREDEF     = YES

 PREDEFINED             = PA_C_DECL_BEGIN= \

​

@@ -0,0 +1,238 @@

+<doxygenlayout version="1.0">

+  <navindex>

+    <tab type="mainpage" visible="yes" title=""/>

+    <tab type="pages" visible="yes" title="Pages" intro=""/>

+    <tab type="modules" visible="yes" title="API Reference" intro="" />

+    <tab type="namespaces" visible="no" title="">

+      <tab type="namespacelist" visible="yes" title="" intro=""/>

+      <tab type="namespacemembers" visible="yes" title="" intro=""/>

+    </tab>

+    <tab type="concepts" visible="no" title="">

+    </tab>

+    <tab type="interfaces" visible="no" title="">

+      <tab type="interfacelist" visible="yes" title="" intro=""/>

+      <tab type="interfaceindex" visible="$ALPHABETICAL_INDEX" title=""/>

+      <tab type="interfacehierarchy" visible="yes" title="" intro=""/>

+    </tab>

+    <tab type="classes" visible="yes" title="">

+      <tab type="classlist" visible="yes" title="" intro=""/>

+      <tab type="classindex" visible="yes" title=""/>

+      <tab type="hierarchy" visible="yes" title="" intro=""/>

+      <tab type="classmembers" visible="no" title="" intro=""/>

+    </tab>

+    <tab type="structs" visible="no" title="">

+      <tab type="structlist" visible="yes" title="" intro=""/>

+      <tab type="structindex" visible="$ALPHABETICAL_INDEX" title=""/>

+    </tab>

+    <tab type="exceptions" visible="no" title="">

+      <tab type="exceptionlist" visible="yes" title="" intro=""/>

+      <tab type="exceptionindex" visible="$ALPHABETICAL_INDEX" title=""/>

+      <tab type="exceptionhierarchy" visible="yes" title="" intro=""/>

+    </tab>

+    <tab type="files" visible="yes" title="">

+      <tab type="filelist" visible="yes" title="" intro=""/>

+      <tab type="globals" visible="no" title="" intro=""/>

+    </tab>

+    <tab type="examples" visible="yes" title="" intro=""/>

+  </navindex>

+

+  <!-- Layout definition for a class page -->

+  <class>

+    <briefdescription visible="yes"/>

+    <includes visible="$SHOW_HEADERFILE"/>

+    <inheritancegraph visible="$CLASS_GRAPH"/>

+    <collaborationgraph visible="$COLLABORATION_GRAPH"/>

+    <memberdecl>

+      <nestedclasses visible="yes" title=""/>

+      <publictypes title=""/>

+      <services title=""/>

+      <interfaces title=""/>

+      <publicslots title=""/>

+      <signals title=""/>

+      <publicmethods title=""/>

+      <publicstaticmethods title=""/>

+      <publicattributes title=""/>

+      <publicstaticattributes title=""/>

+      <protectedtypes title=""/>

+      <protectedslots title=""/>

+      <protectedmethods title=""/>

+      <protectedstaticmethods title=""/>

+      <protectedattributes title=""/>

+      <protectedstaticattributes title=""/>

+      <packagetypes title=""/>

+      <packagemethods title=""/>

+      <packagestaticmethods title=""/>

+      <packageattributes title=""/>

+      <packagestaticattributes title=""/>

+      <properties title=""/>

+      <events title=""/>

+      <privatetypes title=""/>

+      <privateslots title=""/>

+      <privatemethods title=""/>

+      <privatestaticmethods title=""/>

+      <privateattributes title=""/>

+      <privatestaticattributes title=""/>

+      <friends title=""/>

+      <related title="" subtitle=""/>

+      <membergroups visible="yes"/>

+    </memberdecl>

+    <detaileddescription title=""/>

+    <memberdef>

+      <inlineclasses title=""/>

+      <typedefs title=""/>

+      <enums title=""/>

+      <services title=""/>

+      <interfaces title=""/>

+      <constructors title=""/>

+      <functions title=""/>

+      <related title=""/>

+      <variables title=""/>

+      <properties title=""/>

+      <events title=""/>

+    </memberdef>

+    <allmemberslink visible="yes"/>

+    <usedfiles visible="$SHOW_USED_FILES"/>

+    <authorsection visible="yes"/>

+  </class>

+

+  <!-- Layout definition for a namespace page -->

+  <namespace>

+    <briefdescription visible="yes"/>

+    <memberdecl>

+      <nestednamespaces visible="yes" title=""/>

+      <constantgroups visible="yes" title=""/>

+      <interfaces visible="yes" title=""/>

+      <classes visible="yes" title=""/>

+      <concepts visible="yes" title=""/>

+      <structs visible="yes" title=""/>

+      <exceptions visible="yes" title=""/>

+      <typedefs title=""/>

+      <sequences title=""/>

+      <dictionaries title=""/>

+      <enums title=""/>

+      <functions title=""/>

+      <variables title=""/>

+      <membergroups visible="yes"/>

+    </memberdecl>

+    <detaileddescription title=""/>

+    <memberdef>

+      <inlineclasses title=""/>

+      <typedefs title=""/>

+      <sequences title=""/>

+      <dictionaries title=""/>

+      <enums title=""/>

+      <functions title=""/>

+      <variables title=""/>

+    </memberdef>

+    <authorsection visible="yes"/>

+  </namespace>

+

+  <!-- Layout definition for a concept page -->

+  <concept>

+    <briefdescription visible="yes"/>

+    <includes visible="$SHOW_HEADERFILE"/>

+    <definition visible="yes" title=""/>

+    <detaileddescription title=""/>

+    <authorsection visible="yes"/>

+  </concept>

+

+  <!-- Layout definition for a file page -->

+  <file>

+    <briefdescription visible="yes"/>

+    <includes visible="$SHOW_INCLUDE_FILES"/>

+    <includegraph visible="$INCLUDE_GRAPH"/>

+    <includedbygraph visible="$INCLUDED_BY_GRAPH"/>

+    <sourcelink visible="yes"/>

+    <memberdecl>

+      <interfaces visible="yes" title=""/>

+      <classes visible="yes" title=""/>

+      <structs visible="yes" title=""/>

+      <exceptions visible="yes" title=""/>

+      <namespaces visible="yes" title=""/>

+      <concepts visible="yes" title=""/>

+      <constantgroups visible="yes" title=""/>

+      <defines title=""/>

+      <typedefs title=""/>

+      <sequences title=""/>

+      <dictionaries title=""/>

+      <enums title=""/>

+      <functions title=""/>

+      <variables title=""/>

+      <membergroups visible="yes"/>

+    </memberdecl>

+    <detaileddescription title=""/>

+    <memberdef>

+      <inlineclasses title=""/>

+      <defines title=""/>

+      <typedefs title=""/>

+      <sequences title=""/>

+      <dictionaries title=""/>

+      <enums title=""/>

+      <functions title=""/>

+      <variables title=""/>

+    </memberdef>

+    <authorsection/>

+  </file>

+

+  <!-- Layout definition for a group page -->

+  <group>

+    <briefdescription visible="yes"/>

+    <groupgraph visible="$GROUP_GRAPHS"/>

+    <memberdecl>

+      <nestedgroups visible="yes" title=""/>

+      <dirs visible="yes" title=""/>

+      <files visible="yes" title=""/>

+      <namespaces visible="yes" title=""/>

+      <concepts visible="yes" title=""/>

+      <classes visible="yes" title=""/>

+      <typedefs title=""/>

+      <sequences title=""/>

+      <dictionaries title=""/>

+      <enums title=""/>

+      <enumvalues title=""/>

+      <defines title=""/>

+      <functions title=""/>

+      <variables title=""/>

+      <signals title=""/>

+      <publicslots title=""/>

+      <protectedslots title=""/>

+      <privateslots title=""/>

​

@@ -89,6 +89,7 @@

 \addtogroup spa_hooks

 \addtogroup spa_interfaces

 \addtogroup spa_json

+\addtogroup spa_json_pod

 \addtogroup spa_keys

 \addtogroup spa_names

 \addtogroup spa_result

@@ -119,8 +120,4 @@

 \{

 \}

-\defgroup pwtest Test Suite

-\{

-\}

-

 */

​

@@ -17,3 +17,20 @@

        --fragment-link: #729fcf;

    }

 }

+

+#nav-tree .arrow {

+    opacity: 1;

+    padding-right: 0.25em;

+}

+

+.textblock h1 {

+    font-size: 150%;

+}

+.textblock h2 {

+    font-size: 100%;

+}

+.textblock h3, .textblock h4, .textblock h5, .textblock h6 {

+    font-size: 100%;

+    font-style: italic;

+    font-size: medium;

+}

​

@@ -43,4 +43,13 @@

 - Intoduction to PipeWire(https://bootlin.com/blog/an-introduction-to-pipewire/)

 - A custom PipeWire node(https://bootlin.com/blog/a-custom-pipewire-node/)

+

+\page page_overview

+\page page_pipewire

+\page page_tools

+\page page_pipewire_modules

+\page page_api

+\page page_spa

+\page page_tutorial

+

 */

​

@@ -1,5 +1,7 @@

 /** \page @pagename@ @title@

+\brief Manual page for @title@

+

 \verbinclude @filename@

 */

​

@@ -68,7 +68,6 @@

 foreach h : module_sources

   inputs += meson.project_source_root() / 'src' / 'modules' / h

 endforeach

-inputs += meson.project_source_root() / 'test' / 'pwtest.h'

 input_dirs =  meson.project_source_root() / 'spa' / 'include' / 'spa' 

 path_prefixes = 

@@ -141,11 +140,16 @@

                           configuration: pw_tools_dox_conf)

 input_dirs +=  'doc/pipewire-tools.dox' 

+doxygen_layout = meson.project_source_root() / 'doc' / 'DoxygenLayout.xml'

+doxygen_filter_c = meson.project_source_root() / 'doc' / 'input-filter.sh'

+doxygen_filter_h = meson.project_source_root() / 'doc' / 'input-filter-h.sh'

+

 doxyfile_conf.set('inputs', ' '.join(inputs + input_dirs))

 doxyfile_conf.set('cssfiles', ' '.join(cssfiles))

+doxyfile_conf.set('layout', doxygen_layout)

 doxyfile_conf.set('path_prefixes', ' '.join(path_prefixes))

-doxyfile_conf.set('c_input_filter', meson.project_source_root() / 'doc' / 'input-filter.sh')

-doxyfile_conf.set('h_input_filter', meson.project_source_root() / 'doc' / 'input-filter-h.sh')

+doxyfile_conf.set('c_input_filter', doxygen_filter_c)

+doxyfile_conf.set('h_input_filter', doxygen_filter_h)

 doxyfile = configure_file(input: 'Doxyfile.in',

                           output: 'Doxyfile',

@@ -157,7 +161,7 @@

 endif

 html_target = custom_target('pipewire-docs',

-                            input:  doxyfile, examples_dox, pw_tools_dox  + inputs + cssfiles + man_doxygen,

+                            input:  doxyfile, doxygen_layout, examples_dox, pw_tools_dox, doxygen_filter_c, doxygen_filter_h  + inputs + cssfiles + man_doxygen,

                             output:  'html' ,

                             command:  doxygen, doxyfile ,

                             install: true,

​

@@ -17,10 +17,8 @@

 # Components

 - \subpage page_daemon

-- \subpage page_tools

 - \subpage page_session_manager

-

 # Backends

 - \subpage page_pulseaudio

​

@@ -42,6 +42,8 @@

    stride = sizeof(int16_t) * DEFAULT_CHANNELS;

    n_frames = buf->datas0.maxsize / stride;

+   if (b->requested)

+       n_frames = SPA_MIN(b->requested, n_frames);

    for (i = 0; i < n_frames; i++) {

        data->accumulator += M_PI_M2 * 440 / DEFAULT_RATE;

​

@@ -1,5 +1,5 @@

 project('pipewire', 'c' ,

-  version : '0.3.84',

+  version : '0.3.85',

   license :  'MIT', 'LGPL-2.1-or-later', 'GPL-2.0-only' ,

   meson_version : '>= 0.61.1',

   default_options :  'warning_level=3',

@@ -219,8 +219,7 @@

 cdata.set_quoted('PIPEWIRE_CONFIG_DIR', pipewire_configdir)

 cdata.set_quoted('PLUGINDIR', spa_plugindir)

 cdata.set_quoted('SPADATADIR', spa_datadir)

-cdata.set_quoted('PA_ALSA_PATHS_DIR', alsadatadir / 'paths')

-cdata.set_quoted('PA_ALSA_PROFILE_SETS_DIR', alsadatadir / 'profile-sets')

+cdata.set_quoted('PA_ALSA_DATA_DIR', alsadatadir)

 if host_machine.endian() == 'big'

   cdata.set('WORDS_BIGENDIAN', 1)

​

@@ -89,7 +89,7 @@

 static int snd_pcm_pipewire_stop(snd_pcm_ioplug_t *io);

-static int check_active(snd_pcm_ioplug_t *io)

+static int update_active(snd_pcm_ioplug_t *io)

 {

    snd_pcm_pipewire_t *pw = io->private_data;

    snd_pcm_sframes_t avail;

@@ -97,7 +97,10 @@

    avail = snd_pcm_ioplug_avail(io, pw->hw_ptr, io->appl_ptr);

-   if (io->state == SND_PCM_STATE_DRAINING) {

+   if (pw->error > 0) {

+       active = true;

+   }

+   else if (io->state == SND_PCM_STATE_DRAINING) {

        active = pw->drained;

    }

    else if (avail >= 0 && avail < (snd_pcm_sframes_t)pw->min_avail) {

@@ -105,33 +108,27 @@

    }

    else if (avail >= (snd_pcm_sframes_t)pw->min_avail) {

        active = true;

-   } else {

+   }

+   else {

        active = false;

    }

    if (pw->active != active) {

+       uint64_t val;

+

        pw_log_trace("%p: avail:%lu min-avail:%lu state:%s hw:%lu appl:%lu active:%d->%d state:%s",

            pw, avail, pw->min_avail, snd_pcm_state_name(io->state),

            pw->hw_ptr, io->appl_ptr, pw->active, active,

            snd_pcm_state_name(io->state));

+

+       pw->active = active;

+       if (active)

+           spa_system_eventfd_write(pw->system, io->poll_fd, 1);

+       else

+           spa_system_eventfd_read(pw->system, io->poll_fd, &val);

    }

    return active;

 }

-

-static int update_active(snd_pcm_ioplug_t *io)

-{

-   snd_pcm_pipewire_t *pw = io->private_data;

-   pw->active = check_active(io);

-   uint64_t val;

-

-   if (pw->active || pw->error < 0)

-       spa_system_eventfd_write(pw->system, io->poll_fd, 1);

-   else

-       spa_system_eventfd_read(pw->system, io->poll_fd, &val);

-

-   return pw->active;

-}

-

 static void snd_pcm_pipewire_free(snd_pcm_pipewire_t *pw)

 {

    if (pw == NULL)

@@ -162,15 +159,6 @@

    return 0;

 }

-static int snd_pcm_pipewire_poll_descriptors(snd_pcm_ioplug_t *io, struct pollfd *pfds, unsigned int space)

-{

-   snd_pcm_pipewire_t *pw = io->private_data;

-   update_active(io);

-   pfds->fd = pw->fd;

-   pfds->events = POLLIN | POLLERR | POLLNVAL;

-   return 1;

-}

-

 static int snd_pcm_pipewire_poll_revents(snd_pcm_ioplug_t *io,

                     struct pollfd *pfds, unsigned int nfds,

                     unsigned short *revents)

@@ -183,10 +171,10 @@

        return pw->error;

    *revents = pfds0.revents & ~(POLLIN | POLLOUT);

-   if (pfds0.revents & POLLIN && check_active(io)) {

+   if (pfds0.revents & POLLIN && update_active(io))

        *revents |= (io->stream == SND_PCM_STREAM_PLAYBACK) ? POLLOUT : POLLIN;

-       update_active(io);

-   }

+

+   pw_log_trace_fp("poll %d", *revents);

    return 0;

 }

@@ -911,7 +899,6 @@

    .delay = snd_pcm_pipewire_delay,

    .drain = snd_pcm_pipewire_drain,

    .prepare = snd_pcm_pipewire_prepare,

-   .poll_descriptors = snd_pcm_pipewire_poll_descriptors,

    .poll_revents = snd_pcm_pipewire_poll_revents,

    .hw_params = snd_pcm_pipewire_hw_params,

    .sw_params = snd_pcm_pipewire_sw_params,

​

@@ -110,6 +110,10 @@

 static struct globals globals;

 static bool mlock_warned = false;

+#define MIDI_SCRATCH_FRAMES    8192

+static float midi_scratchMIDI_SCRATCH_FRAMES;

+

+

 #define OBJECT_CHUNK       8

 #define RECYCLE_THRESHOLD  128

@@ -122,9 +126,10 @@

    struct client *client;

-#define INTERFACE_Port     0

-#define INTERFACE_Node     1

-#define INTERFACE_Link     2

+#define INTERFACE_Invalid  0

+#define INTERFACE_Port     1

+#define INTERFACE_Node     2

+#define INTERFACE_Link     3

    uint32_t type;

    uint32_t id;

    uint32_t serial;

@@ -502,7 +507,7 @@

    pthread_mutex_lock(&globals.lock);

    spa_list_for_each_safe(o, t, &c->context.objects, link) {

        if (o->removed) {

-           pw_log_info("%p: recycle object:%p type:%d id:%u/%u",

+           pw_log_debug("%p: recycle object:%p type:%d id:%u/%u",

                    c, o, o->type, o->id, o->serial);

            spa_list_remove(&o->link);

            memset(o, 0, sizeof(struct object));

@@ -531,6 +536,15 @@

 }

+static inline struct object *port_to_object(const jack_port_t *port)

+{

+   return (struct object*)port;

+}

+static inline jack_port_t *object_to_port(struct object *o)

+{

+   return (jack_port_t*)o;

+}

+

 struct io_info {

    struct mix *mix;

    void *data;

@@ -2522,6 +2536,17 @@

    return 0;

 }

+static void midi_init_buffer(void *data, uint32_t max_frames)

+{

+   struct midi_buffer *mb = data;

+   mb->magic = MIDI_BUFFER_MAGIC;

+   mb->buffer_size = max_frames * sizeof(float);

+   mb->nframes = max_frames;

+   mb->write_pos = 0;

+   mb->event_count = 0;

+   mb->lost_events = 0;

+}

+

 static inline void *init_buffer(struct port *p)

 {

    struct client *c = p->client;

@@ -2531,12 +2556,7 @@

    if (p->object->port.type_id == TYPE_ID_MIDI) {

        struct midi_buffer *mb = data;

-       mb->magic = MIDI_BUFFER_MAGIC;

-       mb->buffer_size = c->max_frames * sizeof(float);

-       mb->nframes = c->max_frames;

-       mb->write_pos = 0;

-       mb->event_count = 0;

-       mb->lost_events = 0;

+       midi_init_buffer(data, c->max_frames);

        pw_log_debug("port %p: init midi buffer size:%d", p, mb->buffer_size);

    } else

        memset(data, 0, c->max_frames * sizeof(float));

@@ -3218,7 +3238,7 @@

 }

 static const struct pw_node_events node_events = {

-   PW_VERSION_NODE,

+   PW_VERSION_NODE_EVENTS,

    .info = node_info,

 };

@@ -3243,7 +3263,7 @@

 }

 static const struct pw_port_events port_events = {

-   PW_VERSION_PORT,

+   PW_VERSION_PORT_EVENTS,

    .param = port_param,

 };

@@ -5005,7 +5025,7 @@

        goto error_free;

    }

-   return (jack_port_t *) o;

+   return object_to_port(o);

 error_free:

    free_port(c, p, true);

@@ -5037,7 +5057,7 @@

 int jack_port_unregister (jack_client_t *client, jack_port_t *port)

 {

    struct client *c = (struct client *) client;

-   struct object *o = (struct object *) port;

+   struct object *o = port_to_object(port);

    struct port *p;

    int res;

@@ -5214,41 +5234,58 @@

 SPA_EXPORT

 void * jack_port_get_buffer (jack_port_t *port, jack_nframes_t frames)

 {

-   struct object *o = (struct object *) port;

-   struct port *p;

-   void *ptr;

+   struct object *o = port_to_object(port);

+   struct port *p = NULL;

+   void *ptr = NULL;

    return_val_if_fail(o != NULL, NULL);

    if (o->type != INTERFACE_Port || o->client == NULL)

-       return NULL;

+       goto done;

    if ((p = o->port.port) == NULL) {

        struct mix *mix;

        struct buffer *b;

        if ((mix = find_mix_peer(o->client, o->id)) == NULL)

-           return NULL;

+           goto done;

        pw_log_trace("peer mix: %p %d", mix, mix->peer_id);

        if ((b = get_mix_buffer(mix, frames)) == NULL)

-           return NULL;

+           goto done;

-       return get_buffer_data(b, frames);

+       if (o->port.type_id == TYPE_ID_MIDI) {

+           struct spa_pod_sequence *seq1;

+           struct spa_data *d;

+           void *pod;

+

+           ptr = midi_scratch;

+           midi_init_buffer(ptr, MIDI_SCRATCH_FRAMES);

+

+           d = &b->datas0;

+           if ((pod = spa_pod_from_data(d->data, d->maxsize,

+                           d->chunk->offset, d->chunk->size)) == NULL)

+               goto done;

+           if (!spa_pod_is_sequence(pod))

+               goto done;

+           seq0 = pod;

+           convert_to_midi(seq, 1, ptr, o->client->fix_midi_events);

+       } else {

+           ptr = get_buffer_data(b, frames);

+       }

+   } else if (p->valid) {

+       ptr = p->get_buffer(p, frames);

    }

-   if (!p->valid)

-       return NULL;

-

-   ptr = p->get_buffer(p, frames);

-   pw_log_trace_fp("%p: port %p buffer %p empty:%u", p->client, p, ptr, p->empty_out);

+done:

+   pw_log_trace_fp("%p: port %p buffer %p", p->client, p, ptr);

    return ptr;

 }

 SPA_EXPORT

 jack_uuid_t jack_port_uuid (const jack_port_t *port)

 {

-   struct object *o = (struct object *) port;

+   struct object *o = port_to_object(port);

    return_val_if_fail(o != NULL, 0);

    return jack_port_uuid_generate(o->serial);

 }

@@ -5269,47 +5306,57 @@

 SPA_EXPORT

 const char * jack_port_name (const jack_port_t *port)

 {

-   struct object *o = (struct object *) port;

+   struct object *o = port_to_object(port);

    return_val_if_fail(o != NULL, NULL);

+   if (o->type != INTERFACE_Port)

+       return NULL;

    return port_name(o);

​

@@ -38,7 +38,7 @@

 SPA_PRINTF_FUNC(2,3)

 static inline void spa_debug_log_log(struct spa_debug_context *ctx, const char *fmt, ...)

 {

-   struct spa_debug_log_ctx *c = (struct spa_debug_log_ctx*)ctx;

+   struct spa_debug_log_ctx *c = SPA_CONTAINER_OF(ctx, struct spa_debug_log_ctx, ctx);

    va_list args;

    va_start(args, fmt);

    spa_log_logtv(c->log, c->level, c->topic, c->file, c->line, c->func, fmt, args);

​

@@ -64,24 +64,26 @@

    SPA_PROP_patternType,

    SPA_PROP_ditherType,

    SPA_PROP_truncate,

-   SPA_PROP_channelVolumes,        /**< a volume array, one volume per channel

+   SPA_PROP_channelVolumes,        /**< a volume array, one (linear) volume per channel

                          * (Array of Float). 0.0 is silence, 1.0 is

-                         *  without attenuation. This is the effective volume

-                         *  that is applied. It can result in a hardware volume

-                         *  and software volume (see softVolumes) */

+                         *  without attenuation. This is the effective

+                         *  volume that is applied. It can result

+                         *  in a hardware volume and software volume

+                         *  (see softVolumes) */

    SPA_PROP_volumeBase,            /**< a volume base (Float) */

    SPA_PROP_volumeStep,            /**< a volume step (Float) */

    SPA_PROP_channelMap,            /**< a channelmap array

                          * (Array (Id enum spa_audio_channel)) */

    SPA_PROP_monitorMute,           /**< mute (Bool) */

-   SPA_PROP_monitorVolumes,        /**< a volume array, one volume per

+   SPA_PROP_monitorVolumes,        /**< a volume array, one (linear) volume per

                          *  channel (Array of Float) */

    SPA_PROP_latencyOffsetNsec,     /**< delay adjustment */

    SPA_PROP_softMute,          /**< mute (Bool) applied in software */

-   SPA_PROP_softVolumes,           /**< a volume array, one volume per channel

+   SPA_PROP_softVolumes,           /**< a volume array, one (linear) volume per channel

                          * (Array of Float). 0.0 is silence, 1.0 is without

-                         * attenuation. This is the volume applied in software,

-                         * there might be a part applied in hardware. */

+                         * attenuation. This is the volume applied in

+                         * software, there might be a part applied in

+                         * hardware. */

    SPA_PROP_iec958Codecs,          /**< enabled IEC958 (S/PDIF) codecs,

                          *  (Array (Id enum spa_audio_iec958_codec) */

​

@@ -44,6 +44,7 @@

 #define SPA_KEY_API_ALSA_OPEN_UCM  "api.alsa.open.ucm"     /**< if UCM should be opened card */

 #define SPA_KEY_API_ALSA_DISABLE_LONGNAME  \

                    "api.alsa.disable-longname" /**< if card long name should not be passed to MIDI port */

+#define SPA_KEY_API_ALSA_BIND_CTLS "api.alsa.bind-ctls"        /**< alsa controls to bind as params */

 /** info from alsa card_info */

 #define SPA_KEY_API_ALSA_CARD_ID   "api.alsa.card.id"      /**< id from card_info */

​

@@ -2795,20 +2795,6 @@

     return 0;

 }

-static const char *get_default_paths_dir(void) {

-    const char *str;

-#ifdef HAVE_RUNNING_FROM_BUILD_TREE

-    if (pa_run_from_build_tree())

-        return PA_SRCDIR "mixer/paths";

-    else

-#endif

-    if (getenv("ACP_BUILDDIR") != NULL)

-        return "mixer/paths";

-    if ((str = getenv("ACP_PATHS_DIR")) != NULL)

-        return str;

-    return PA_ALSA_PATHS_DIR;

-}

-

 pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa_direction_t direction) {

     pa_alsa_path *p;

     char *fn;

@@ -2873,10 +2859,9 @@

     items2.data = &p->description;

     items3.data = &mute_during_activation;

-    if (!paths_dir)

-        paths_dir = get_default_paths_dir();

+    fn = get_data_path(paths_dir, "paths", fname);

-    fn = pa_maybe_prefix_path(fname, paths_dir);

+    pa_log_info("Loading path config: %s", fn);

     r = pa_config_parse(fn, NULL, items, p->proplist, false, p);

     pa_xfree(fn);

@@ -4827,20 +4812,6 @@

     pa_xfree(db_values);

 }

-static const char *get_default_profile_dir(void) {

-    const char *str;

-#ifdef HAVE_RUNNING_FROM_BUILD_TREE

-    if (pa_run_from_build_tree())

-        return PA_SRCDIR "mixer/profile-sets";

-    else

-#endif

-    if (getenv("ACP_BUILDDIR") != NULL)

-        return "mixer/profile-sets";

-    if ((str = getenv("ACP_PROFILES_DIR")) != NULL)

-        return str;

-    return PA_ALSA_PROFILE_SETS_DIR;

-}

-

 pa_alsa_profile_set* pa_alsa_profile_set_new(const char *fname, const pa_channel_map *bonus) {

     pa_alsa_profile_set *ps;

     pa_alsa_profile *p;

@@ -4890,13 +4861,14 @@

     items0.data = &ps->auto_profiles;

-    fn = pa_maybe_prefix_path(fname ? fname : "default.conf",

-           get_default_profile_dir());

+    fn = get_data_path(NULL, "profile-sets", fname ? fname : "default.conf");

+

+    pa_log_info("Loading profile set: %s", fn);

+

     if ((r = access(fn, R_OK)) != 0) {

         if (fname != NULL) {

             pa_log_warn("profile-set '%s' can't be accessed: %m", fn);

-            fn = pa_maybe_prefix_path("default.conf",

-               get_default_profile_dir());

+            fn = get_data_path(NULL, "profile-sets", "default.conf");

             r = access(fn, R_OK);

    }

    if (r != 0) {

​

@@ -18,9 +18,13 @@

   along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.

 ***/

+#include <spa/utils/string.h>

+#include <spa/utils/cleanup.h>

+

 #include "compat.h"

 #include "device-port.h"

 #include "alsa-mixer.h"

+#include "config.h"

 static const char *port_types = {

    PA_DEVICE_PORT_TYPE_UNKNOWN = "unknown",

@@ -208,3 +212,76 @@

     return true;

 }

+

+static char *try_path(const char *fname, const char *path)

+{

+    char *result = pa_maybe_prefix_path(fname, path);

+

+    pa_log_trace("Check for file: %s", result);

+

+    if (access(result, R_OK) == 0)

+   return result;

+

+    pa_xfree(result);

+    return NULL;

+}

+

+static char *get_xdg_home(const char *key, const char *fallback)

+{

+    const char *e;

+

+    e = getenv(key);

+    if (e && *e) {

+   return strdup(e);

+    } else {

+   e = getenv("HOME");

+   if (!(e && *e))

+       e = getenv("USERPROFILE");

+   if (e && *e)

+       return spa_aprintf("%s/%s", e, fallback);

+    }

+    return NULL;

+}

+

+char *get_data_path(const char *data_dir, const char *data_type, const char *fname)

+{

+    static const char * const subpaths = {

+   "alsa-card-profile/mixer",

+   "alsa-card-profile",

+    };

+    const char *e;

+    spa_autofree char *base = NULL;

+    char *result;

+

+    if (data_dir)

+   if ((result = try_path(fname, data_dir)) != NULL)

+       return result;

+

+    e = getenv("ACP_PATHS_DIR");

+    if (e && *e && spa_streq(data_type, "paths"))

+   if ((result = try_path(fname, e)) != NULL)

+       return result;

+

+    e = getenv("ACP_PROFILES_DIR");

+    if (e && *e && spa_streq(data_type, "profile-sets"))

+   if ((result = try_path(fname, e)) != NULL)

+       return result;

+

+    base = get_xdg_home("XDG_CONFIG_HOME", ".config");

+    if (base) {

+   SPA_FOR_EACH_ELEMENT_VAR(subpaths, subpath) {

+       spa_autofree char *path = spa_aprintf("%s/%s/%s", base, *subpath, data_type);

+       if ((result = try_path(fname, path)) != NULL)

+       return result;

+   }

+    }

+

+    SPA_FOR_EACH_ELEMENT_VAR(subpaths, subpath) {

+   spa_autofree char *path = spa_aprintf("/etc/%s/%s", *subpath, data_type);

+   if ((result = try_path(fname, path)) != NULL)

+       return result;

+    }

+

+    spa_autofree char *path = spa_aprintf("%s/%s", PA_ALSA_DATA_DIR, data_type);

+    return pa_maybe_prefix_path(fname, path);

+}

​

@@ -214,6 +214,7 @@

    PA_LOG_NOTICE = 2,    /* Notice messages */

    PA_LOG_INFO   = 3,    /* Info messages */

    PA_LOG_DEBUG  = 4,    /* Debug messages */

+   PA_LOG_TRACE = 5,

    PA_LOG_LEVEL_MAX

 } pa_log_level_t;

@@ -245,6 +246,7 @@

 #define pa_log_notice(fmt,...) pa_logl(PA_LOG_NOTICE, fmt, ##__VA_ARGS__)

 #define pa_log_info(fmt,...)   pa_logl(PA_LOG_INFO, fmt, ##__VA_ARGS__)

 #define pa_log_debug(fmt,...)  pa_logl(PA_LOG_DEBUG, fmt, ##__VA_ARGS__)

+#define pa_log_trace(fmt,...)  pa_logl(PA_LOG_TRACE, fmt, ##__VA_ARGS__)

 #define pa_log         pa_log_error

 #define pa_assert_se(expr)                                              \

@@ -677,6 +679,8 @@

 #endif

 }

+char *get_data_path(const char *data_dir, const char *data_type, const char *fname);

+

 #include <spa/support/i18n.h>

 extern struct spa_i18n *acp_i18n;

​

@@ -86,7 +86,7 @@

         * hardware that can capture audio is difficult to do. The only hardware

         * known is the Wolfson ADSP; the only driver in the kernel that exposes

         * Compress-Offload capture devices is the one for that hardware. */

-       assert(false);

+       spa_assert_not_reached();

    }

    info.change_mask = SPA_DEVICE_OBJECT_CHANGE_MASK_PROPS;

​

@@ -8,8 +8,6 @@

 #include <spa/node/node.h>

 #include <spa/node/utils.h>

-#include <spa/node/keys.h>

-#include <spa/monitor/device.h>

 #include <spa/utils/keys.h>

 #include <spa/utils/names.h>

 #include <spa/utils/string.h>

@@ -31,75 +29,6 @@

    props->use_chmap = DEFAULT_USE_CHMAP;

 }

-static void emit_node_info(struct state *this, bool full)

-{

-   uint64_t old = full ? this->info.change_mask : 0;

-

-   if (full)

-       this->info.change_mask = this->info_all;

-   if (this->info.change_mask) {

-       struct spa_dict_item items7;

-       uint32_t i, n_items = 0;

-       char latency64, period64, nperiods64, headroom64;

-

-       itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_DEVICE_API, "alsa");

-       itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_MEDIA_CLASS, "Audio/Sink");

-       itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_DRIVER, "true");

-       if (this->have_format) {

-           snprintf(latency, sizeof(latency), "%lu/%d", this->buffer_frames / 2, this->rate);

-           itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, latency);

-           snprintf(period, sizeof(period), "%lu", this->period_frames);

-           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-size", period);

-           snprintf(nperiods, sizeof(nperiods), "%lu",

-                   this->period_frames != 0 ? this->buffer_frames / this->period_frames : 0);

-           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-num", nperiods);

-           snprintf(headroom, sizeof(headroom), "%u", this->headroom);

-           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.headroom", headroom);

-       } else {

-           itemsn_items++ = SPA_DICT_ITEM_INIT(SPA_KEY_NODE_MAX_LATENCY, NULL);

-           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-size", NULL);

-           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.period-num", NULL);

-           itemsn_items++ = SPA_DICT_ITEM_INIT("api.alsa.headroom", NULL);

-       }

-       this->info.props = &SPA_DICT_INIT(items, n_items);

-

-       if (this->info.change_mask & SPA_NODE_CHANGE_MASK_PARAMS) {

-           for (i = 0; i < this->info.n_params; i++) {

-               if (this->paramsi.user > 0) {

-                   this->paramsi.flags ^= SPA_PARAM_INFO_SERIAL;

-                   this->paramsi.user = 0;

-               }

-           }

-       }

-       spa_node_emit_info(&this->hooks, &this->info);

-

-       this->info.change_mask = old;

-   }

-}

-

-static void emit_port_info(struct state *this, bool full)

-{

-   uint64_t old = full ? this->port_info.change_mask : 0;

-

-   if (full)

-       this->port_info.change_mask = this->port_info_all;

-   if (this->port_info.change_mask) {

-       uint32_t i;

-

-       if (this->port_info.change_mask & SPA_PORT_CHANGE_MASK_PARAMS) {

-           for (i = 0; i < this->port_info.n_params; i++) {

-               if (this->port_paramsi.user > 0) {

-                   this->port_paramsi.flags ^= SPA_PARAM_INFO_SERIAL;

-                   this->port_paramsi.user = 0;

-               }

-           }