[rhythmbox: 2/2] Merge branch 'master' into 'master'

[Jonathan Matthew <jmatthew src gnome org>]

commit 3de3a92a287facb2936dc736ac9498b5e19348d1
Merge: c2442dec0 ffbd5ca80
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Jan 18 00:02:54 2022 +0000

    Merge branch 'master' into 'master'
    
    Port DAAP plugin to libdmapsharing-4.0 API
    
    See merge request GNOME/rhythmbox!12

 meson.build                                        |  12 +-
 plugins/daap/meson.build                           |  12 +-
 plugins/daap/rb-daap-compat.h                      |  96 ++++++++++++
 plugins/daap/rb-daap-container-record.c            |  16 +-
 plugins/daap/rb-daap-container-record.h            |  14 +-
 plugins/daap/rb-daap-plugin.c                      | 109 ++++++++-----
 plugins/daap/rb-daap-plugin.h                      |   2 +
 plugins/daap/rb-daap-record-factory.c              |  15 +-
 plugins/daap/rb-daap-record-factory.h              |   4 +-
 plugins/daap/rb-daap-record.c                      |  12 +-
 plugins/daap/rb-daap-record.h                      |  14 +-
 plugins/daap/rb-daap-sharing.c                     |   8 +-
 plugins/daap/rb-daap-sharing.h                     |   3 +
 plugins/daap/rb-daap-source.c                      |  44 +++---
 plugins/daap/rb-daap-source.h                      |   8 +-
 plugins/daap/rb-dacp-compat.h                      |  99 ++++++++++++
 plugins/daap/rb-dacp-pairing-page.c                |  69 ++++----
 plugins/daap/rb-dacp-pairing-page.h                |   9 +-
 plugins/daap/rb-dacp-player.c                      |  61 ++++----
 plugins/daap/rb-dacp-player.h                      |   4 +-
 plugins/daap/rb-dmap-compat.h                      | 173 +++++++++++++++++++++
 plugins/daap/rb-dmap-container-db-adapter.c        |  28 ++--
 plugins/daap/rb-dmap-container-db-adapter.h        |   1 +
 plugins/daap/rb-rhythmdb-dmap-db-adapter.c         |  32 ++--
 .../daap/rb-rhythmdb-query-model-dmap-db-adapter.c |  32 ++--
 25 files changed, 661 insertions(+), 216 deletions(-)
---