[Xfce4-commits] [panel-plugins/xfce4-pulseaudio-plugin] 01/01: Make MPRIS2 support optional (default enabled)
noreply at xfce.org
noreply at xfce.org
Tue Aug 29 02:13:28 CEST 2017
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository panel-plugins/xfce4-pulseaudio-plugin.
commit 096e309d00c94e64d6e5435f97e3f2d0bdce3017
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Mon Aug 28 20:13:22 2017 -0400
Make MPRIS2 support optional (default enabled)
---
configure.ac.in | 11 ++++++++---
panel-plugin/Makefile.am | 2 ++
panel-plugin/pulseaudio-button.c | 2 ++
panel-plugin/pulseaudio-menu.c | 7 ++++++-
panel-plugin/pulseaudio-plugin.c | 2 ++
5 files changed, 20 insertions(+), 4 deletions(-)
diff --git a/configure.ac.in b/configure.ac.in
index 895a5d6..d4ee913 100644
--- a/configure.ac.in
+++ b/configure.ac.in
@@ -84,13 +84,11 @@ XDT_CHECK_PACKAGE([LIBXFCE4UI], [libxfce4ui-2], [4.11.0])
XDT_CHECK_PACKAGE([LIBXFCE4PANEL], [libxfce4panel-${LIBXFCE4PANEL_VERSION_API}], [4.11.0])
XDT_CHECK_PACKAGE([XFCONF], [libxfconf-0], [4.6.0])
-XDT_CHECK_PACKAGE([GIO], [gio-2.0], [2.42])
-
dnl **********************************
dnl *** Optional keybinder Support ***
dnl **********************************
XDT_CHECK_OPTIONAL_PACKAGE([KEYBINDER], [keybinder-3.0], [0.2.2], [keybinder],
- [keybinder Support])
+ [keybinder support])
dnl **********************************
dnl *** Optional libnotify Support ***
@@ -101,6 +99,12 @@ XDT_CHECK_OPTIONAL_PACKAGE([LIBNOTIFY], [libnotify], [0.7.0], [libnotify],
AC_CHECK_LIBM
AC_SUBST(LIBM)
+dnl *******************************
+dnl *** Optional MPRIS2 Support ***
+dnl *******************************
+XDT_CHECK_OPTIONAL_PACKAGE([MPRIS2], [gio-2.0], [2.42], [mpris2],
+ [mpris2 support])
+
dnl ***********************************
dnl *** Check for debugging support ***
dnl ***********************************
@@ -149,5 +153,6 @@ echo
echo "* Debug Support: $enable_debug"
echo "* Use keybinder: ${KEYBINDER_FOUND:-no}"
echo "* Use libnotify: ${LIBNOTIFY_FOUND:-no}"
+echo "* Use MPRIS2: ${MPRIS2_FOUND:-no}"
echo "* Default Mixer command: $DEFAULT_MIXER_COMMAND"
echo
diff --git a/panel-plugin/Makefile.am b/panel-plugin/Makefile.am
index 286d80f..c6d1c17 100644
--- a/panel-plugin/Makefile.am
+++ b/panel-plugin/Makefile.am
@@ -57,6 +57,7 @@ libpulseaudio_plugin_la_CFLAGS = \
$(XFCONF_CFLAGS) \
$(KEYBINDER_CFLAGS) \
$(LIBNOTIFY_CFLAGS) \
+ $(MPRIS2_CFLAGS) \
$(PLATFORM_CFLAGS)
libpulseaudio_plugin_la_LDFLAGS = \
@@ -76,6 +77,7 @@ libpulseaudio_plugin_la_LIBADD = \
$(XFCONF_LIBS) \
$(KEYBINDER_LIBS) \
$(LIBNOTIFY_LIBS) \
+ $(MPRIS2_LIBS) \
$(LIBM)
#
diff --git a/panel-plugin/pulseaudio-button.c b/panel-plugin/pulseaudio-button.c
index 3e3e1e2..00d6b13 100644
--- a/panel-plugin/pulseaudio-button.c
+++ b/panel-plugin/pulseaudio-button.c
@@ -376,7 +376,9 @@ pulseaudio_button_new (PulseaudioPlugin *plugin,
g_return_val_if_fail (IS_PULSEAUDIO_PLUGIN (plugin), NULL);
g_return_val_if_fail (IS_PULSEAUDIO_CONFIG (config), NULL);
+#ifdef HAVE_MPRIS2
g_return_val_if_fail (IS_PULSEAUDIO_MPRIS (mpris), NULL);
+#endif
g_return_val_if_fail (IS_PULSEAUDIO_VOLUME (volume), NULL);
button = g_object_new (TYPE_PULSEAUDIO_BUTTON, NULL);
diff --git a/panel-plugin/pulseaudio-menu.c b/panel-plugin/pulseaudio-menu.c
index 496c563..d00f8cb 100644
--- a/panel-plugin/pulseaudio-menu.c
+++ b/panel-plugin/pulseaudio-menu.c
@@ -284,6 +284,7 @@ pulseaudio_menu_volume_changed (PulseaudioMenu *menu,
gtk_range_set_value (GTK_RANGE (menu->range_input), pulseaudio_volume_get_volume_mic (menu->volume) * 100.0);
}
+#ifdef HAVE_MPRIS2
static void
media_notify_cb (GtkWidget *widget,
gchar *message,
@@ -370,6 +371,7 @@ item_destroy_cb (GtkWidget *widget,
g_signal_handlers_disconnect_by_func (G_OBJECT (menu->mpris), G_CALLBACK (mpris_update_cb), widget);
}
+#endif
PulseaudioMenu *
pulseaudio_menu_new (PulseaudioVolume *volume,
@@ -382,8 +384,8 @@ pulseaudio_menu_new (PulseaudioVolume *volume,
GtkWidget *mi;
gdouble volume_max;
+#ifdef HAVE_MPRIS2
gchar **players;
-
gchar *title = NULL;
gchar *artist = NULL;
gboolean is_running;
@@ -394,6 +396,7 @@ pulseaudio_menu_new (PulseaudioVolume *volume,
gboolean can_go_previous;
gboolean can_go_next;
gboolean can_raise;
+#endif
g_return_val_if_fail (IS_PULSEAUDIO_VOLUME (volume), NULL);
g_return_val_if_fail (IS_PULSEAUDIO_CONFIG (config), NULL);
@@ -469,6 +472,7 @@ pulseaudio_menu_new (PulseaudioVolume *volume,
gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
/* MPRIS2 */
+#ifdef HAVE_MPRIS2
players = pulseaudio_config_get_mpris_players (menu->config);
if (players != NULL)
{
@@ -530,6 +534,7 @@ pulseaudio_menu_new (PulseaudioVolume *volume,
}
}
}
+#endif
/* Audio mixers */
mi = gtk_menu_item_new_with_mnemonic (_("_Audio mixer..."));
diff --git a/panel-plugin/pulseaudio-plugin.c b/panel-plugin/pulseaudio-plugin.c
index 6d6b550..4e3df87 100644
--- a/panel-plugin/pulseaudio-plugin.c
+++ b/panel-plugin/pulseaudio-plugin.c
@@ -421,8 +421,10 @@ pulseaudio_plugin_construct (XfcePanelPlugin *plugin)
pulseaudio_plugin->volume = pulseaudio_volume_new (pulseaudio_plugin->config);
/* initialize mpris support */
+#ifdef HAVE_MPRIS2
pulseaudio_plugin->mpris = pulseaudio_mpris_new (pulseaudio_plugin->config);
pulseaudio_plugin->players = pulseaudio_mpris_get_available_players (pulseaudio_plugin->mpris);
+#endif
/* instantiate a button box */
pulseaudio_plugin->button = pulseaudio_button_new (pulseaudio_plugin,
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list