[grilo-plugins] meson: Fix DPAP/DAAP plugin names

[Bastien Nocera <hadess src gnome org>]

commit 39a15bc911cc3c3af92181fefc5d59fe40d68ec4
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Apr 13 17:17:59 2017 +0200

    meson: Fix DPAP/DAAP plugin names
    
    Both had their ID set to the same value (DMAP_PLUGIN_ID), instead
    to their own ID, meaning that one of them always failed to load as a
    duplicate.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=781278

 meson.build          |    7 ++++++-
 src/dmap/meson.build |    2 --
 2 files changed, 6 insertions(+), 3 deletions(-)
---
diff --git a/meson.build b/meson.build
index 29f9fb9..9181706 100644
--- a/meson.build
+++ b/meson.build
@@ -126,7 +126,12 @@ foreach p: plugins
     endif
     set_variable(varname_enabled, current_enabled)
     set_variable(varname_idx, idx)
-    cdata.set_quoted(varname.to_upper() + '_PLUGIN_ID', 'grl-' + p[NAME])
+    if p[NAME] != 'dmap'
+        cdata.set_quoted(varname.to_upper() + '_PLUGIN_ID', 'grl-' + p[NAME])
+    else
+        cdata.set_quoted('DPAP_PLUGIN_ID', 'grl-dpap')
+        cdata.set_quoted('DAAP_PLUGIN_ID', 'grl-daap')
+    endif
     idx = idx + 1
 endforeach
 
diff --git a/src/dmap/meson.build b/src/dmap/meson.build
index 1bd3b8e..2907a80 100644
--- a/src/dmap/meson.build
+++ b/src/dmap/meson.build
@@ -40,7 +40,6 @@ shared_library('grldaap',
     install_dir: pluginsdir,
     dependencies: must_deps + plugins[dmap_idx][REQ_DEPS] + plugins[dmap_idx][OPT_DEPS],
     c_args: [
-        '-DDAAP_PLUGIN_ID=DMAP_PLUGIN_ID',
         '-DG_LOG_DOMAIN="GrlDmap"',
         '-DHAVE_CONFIG_H',
     ])
@@ -51,7 +50,6 @@ shared_library('grldpap',
     install_dir: pluginsdir,
     dependencies: must_deps + plugins[dmap_idx][REQ_DEPS] + plugins[dmap_idx][OPT_DEPS],
     c_args: [
-        '-DDPAP_PLUGIN_ID=DMAP_PLUGIN_ID',
         '-DG_LOG_DOMAIN="GrlDmap"',
         '-DHAVE_CONFIG_H',
     ])