[Xfce4-commits] [panel-plugins/xfce4-pulseaudio-plugin] 01/01: Standardize spacing
noreply at xfce.org
noreply at xfce.org
Thu Nov 23 13:03:24 CET 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 0c889f4680b8ceb025c237b622bd1ec80aa5d809
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Thu Nov 23 07:03:18 2017 -0500
Standardize spacing
---
panel-plugin/devicemenuitem.c | 4 +
panel-plugin/pulseaudio-button.c | 9 +-
panel-plugin/pulseaudio-config.c | 37 +++----
panel-plugin/pulseaudio-debug.c | 6 +-
panel-plugin/pulseaudio-debug.h | 4 +-
panel-plugin/pulseaudio-dialog.c | 4 +
panel-plugin/pulseaudio-menu.c | 190 ++++++++++++++++++---------------
panel-plugin/pulseaudio-mpris-player.c | 129 +++++++++++++++++-----
panel-plugin/pulseaudio-mpris.c | 40 +++++--
panel-plugin/pulseaudio-mpris.h | 2 +-
panel-plugin/pulseaudio-notify.c | 26 ++---
panel-plugin/pulseaudio-plugin.c | 6 +-
panel-plugin/pulseaudio-volume.c | 72 ++++++++-----
panel-plugin/scalemenuitem.c | 20 ++--
14 files changed, 346 insertions(+), 203 deletions(-)
diff --git a/panel-plugin/devicemenuitem.c b/panel-plugin/devicemenuitem.c
index 0032f3e..32a650f 100644
--- a/panel-plugin/devicemenuitem.c
+++ b/panel-plugin/devicemenuitem.c
@@ -183,6 +183,8 @@ device_menu_item_class_init (DeviceMenuItemClass *item_class)
g_type_class_add_private (item_class, sizeof (DeviceMenuItemPrivate));
}
+
+
static void
device_menu_item_init (DeviceMenuItem *item)
{
@@ -196,6 +198,8 @@ device_menu_item_init (DeviceMenuItem *item)
priv->group = NULL;
}
+
+
static void
device_menu_item_finalize (GObject *object)
{
diff --git a/panel-plugin/pulseaudio-button.c b/panel-plugin/pulseaudio-button.c
index a6aa811..92d8f3a 100644
--- a/panel-plugin/pulseaudio-button.c
+++ b/panel-plugin/pulseaudio-button.c
@@ -75,6 +75,7 @@ static void pulseaudio_button_update (PulseaudioButton
gboolean force_update);
+
struct _PulseaudioButton
{
GtkToggleButton __parent__;
@@ -103,7 +104,6 @@ struct _PulseaudioButtonClass
-
G_DEFINE_TYPE (PulseaudioButton, pulseaudio_button, GTK_TYPE_TOGGLE_BUTTON)
static void
@@ -182,6 +182,7 @@ pulseaudio_button_finalize (GObject *object)
}
+
static gboolean
pulseaudio_button_button_press (GtkWidget *widget,
GdkEventButton *event)
@@ -222,6 +223,7 @@ G_GNUC_END_IGNORE_DEPRECATIONS
}
+
static gboolean
pulseaudio_button_scroll_event (GtkWidget *widget, GdkEventScroll *event)
{
@@ -230,7 +232,6 @@ pulseaudio_button_scroll_event (GtkWidget *widget, GdkEventScroll *event)
gdouble volume_step = pulseaudio_config_get_volume_step (button->config) / 100.0;
gdouble new_volume;
-
if (event->direction == 1) // decrease volume
new_volume = volume - volume_step;
else if (event->direction == 0) // increase volume
@@ -244,6 +245,7 @@ pulseaudio_button_scroll_event (GtkWidget *widget, GdkEventScroll *event)
}
+
static void
pulseaudio_button_menu_deactivate (PulseaudioButton *button,
GtkMenuShell *menu)
@@ -268,6 +270,7 @@ pulseaudio_button_menu_deactivate (PulseaudioButton *button,
}
+
static void
pulseaudio_button_update_icons (PulseaudioButton *button)
{
@@ -276,6 +279,7 @@ pulseaudio_button_update_icons (PulseaudioButton *button)
}
+
static void
pulseaudio_button_update (PulseaudioButton *button,
gboolean force_update)
@@ -323,6 +327,7 @@ pulseaudio_button_update (PulseaudioButton *button,
}
+
void
pulseaudio_button_set_size (PulseaudioButton *button,
gint size,
diff --git a/panel-plugin/pulseaudio-config.c b/panel-plugin/pulseaudio-config.c
index 04f0ebe..8c9ca77 100644
--- a/panel-plugin/pulseaudio-config.c
+++ b/panel-plugin/pulseaudio-config.c
@@ -43,7 +43,6 @@
-
#define DEFAULT_ENABLE_KEYBOARD_SHORTCUTS TRUE
#define DEFAULT_SHOW_NOTIFICATIONS TRUE
#define DEFAULT_VOLUME_STEP 6
@@ -117,6 +116,7 @@ enum
static guint pulseaudio_config_signals [LAST_SIGNAL] = { 0, };
+
G_DEFINE_TYPE (PulseaudioConfig, pulseaudio_config, G_TYPE_OBJECT)
@@ -393,7 +393,6 @@ pulseaudio_config_set_property (GObject *object,
-
gboolean
pulseaudio_config_get_enable_keyboard_shortcuts (PulseaudioConfig *config)
{
@@ -424,7 +423,6 @@ pulseaudio_config_get_show_notifications (PulseaudioConfig *config)
-
guint
pulseaudio_config_get_volume_step (PulseaudioConfig *config)
{
@@ -435,7 +433,6 @@ pulseaudio_config_get_volume_step (PulseaudioConfig *config)
-
guint
pulseaudio_config_get_volume_max (PulseaudioConfig *config)
{
@@ -446,7 +443,6 @@ pulseaudio_config_get_volume_max (PulseaudioConfig *config)
-
const gchar *
pulseaudio_config_get_mixer_command (PulseaudioConfig *config)
{
@@ -457,7 +453,6 @@ pulseaudio_config_get_mixer_command (PulseaudioConfig *config)
-
gboolean
pulseaudio_config_get_enable_mpris (PulseaudioConfig *config)
{
@@ -468,7 +463,6 @@ pulseaudio_config_get_enable_mpris (PulseaudioConfig *config)
-
gchar **
pulseaudio_config_get_mpris_players (PulseaudioConfig *config)
{
@@ -480,12 +474,16 @@ pulseaudio_config_get_mpris_players (PulseaudioConfig *config)
return g_strsplit (config->mpris_players, ";", 0);
}
+
+
static gint
compare_players (gconstpointer item1, gconstpointer item2)
{
return g_ascii_strcasecmp (item1, item2);
}
+
+
void
pulseaudio_config_set_mpris_players (PulseaudioConfig *config,
gchar **players)
@@ -498,15 +496,18 @@ pulseaudio_config_set_mpris_players (PulseaudioConfig *config,
g_return_if_fail (IS_PULSEAUDIO_CONFIG (config));
player_array = NULL;
- for (guint i = 0; i < g_strv_length (players); i++) {
- player_array = g_slist_prepend (player_array, players[i]);
- }
+ for (guint i = 0; i < g_strv_length (players); i++)
+ {
+ player_array = g_slist_prepend (player_array, players[i]);
+ }
+
player_array = g_slist_sort (player_array, (GCompareFunc) compare_players);
- for (GSList *list = player_array; list != NULL; list = g_slist_next (list)) {
- players[index] = list->data;
- index++;
- }
+ for (GSList *list = player_array; list != NULL; list = g_slist_next (list))
+ {
+ players[index] = list->data;
+ index++;
+ }
g_slist_free (player_array);
@@ -518,6 +519,8 @@ pulseaudio_config_set_mpris_players (PulseaudioConfig *config,
pulseaudio_config_set_property (G_OBJECT (config), PROP_MPRIS_PLAYERS, &src, NULL);
}
+
+
void
pulseaudio_config_add_mpris_player (PulseaudioConfig *config,
gchar *player)
@@ -528,9 +531,8 @@ pulseaudio_config_add_mpris_player (PulseaudioConfig *config,
gchar *player_string;
players = pulseaudio_config_get_mpris_players (config);
- if (g_strv_contains ((const char * const *) players, player)) {
- return;
- }
+ if (g_strv_contains ((const char * const *) players, player))
+ return;
players_string = g_strjoinv (";", players);
player_string = g_strjoin (";", players_string, player, NULL);
@@ -546,7 +548,6 @@ pulseaudio_config_add_mpris_player (PulseaudioConfig *config,
-
PulseaudioConfig *
pulseaudio_config_new (const gchar *property_base)
{
diff --git a/panel-plugin/pulseaudio-debug.c b/panel-plugin/pulseaudio-debug.c
index 0cba907..2b8c2d5 100644
--- a/panel-plugin/pulseaudio-debug.c
+++ b/panel-plugin/pulseaudio-debug.c
@@ -8,12 +8,12 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
@@ -26,6 +26,8 @@
#include "pulseaudio-debug.h"
+
+
void
pulseaudio_debug_real (const gchar *log_domain,
const gchar *file,
diff --git a/panel-plugin/pulseaudio-debug.h b/panel-plugin/pulseaudio-debug.h
index 9403b6f..6dbe14f 100644
--- a/panel-plugin/pulseaudio-debug.h
+++ b/panel-plugin/pulseaudio-debug.h
@@ -8,12 +8,12 @@
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
* General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor,
* Boston, MA 02110-1301, USA.
*/
diff --git a/panel-plugin/pulseaudio-dialog.c b/panel-plugin/pulseaudio-dialog.c
index 10dc8e2..90630f2 100644
--- a/panel-plugin/pulseaudio-dialog.c
+++ b/panel-plugin/pulseaudio-dialog.c
@@ -52,6 +52,7 @@
#endif
+
static void pulseaudio_dialog_build (PulseaudioDialog *dialog);
static void pulseaudio_dialog_help_button_clicked (PulseaudioDialog *dialog,
GtkWidget *button);
@@ -143,6 +144,7 @@ pulseaudio_dialog_run_mixer (PulseaudioDialog *dialog,
}
+
static void
pulseaudio_dialog_build (PulseaudioDialog *dialog)
{
@@ -233,6 +235,7 @@ pulseaudio_dialog_build (PulseaudioDialog *dialog)
}
+
static void
pulseaudio_dialog_help_button_clicked (PulseaudioDialog *dialog,
GtkWidget *button)
@@ -273,6 +276,7 @@ pulseaudio_dialog_show (PulseaudioDialog *dialog,
}
+
PulseaudioDialog *
pulseaudio_dialog_new (PulseaudioConfig *config)
{
diff --git a/panel-plugin/pulseaudio-menu.c b/panel-plugin/pulseaudio-menu.c
index e1c5e58..2a03246 100644
--- a/panel-plugin/pulseaudio-menu.c
+++ b/panel-plugin/pulseaudio-menu.c
@@ -41,6 +41,7 @@
#include "scalemenuitem.h"
+
struct _PulseaudioMenu
{
GtkMenu __parent__;
@@ -63,11 +64,15 @@ struct _PulseaudioMenuClass
};
+
static void pulseaudio_menu_finalize (GObject *object);
+
G_DEFINE_TYPE (PulseaudioMenu, pulseaudio_menu, GTK_TYPE_MENU)
+
+
static void
pulseaudio_menu_class_init (PulseaudioMenuClass *klass)
{
@@ -93,6 +98,7 @@ pulseaudio_menu_init (PulseaudioMenu *menu)
}
+
static void
pulseaudio_menu_finalize (GObject *object)
{
@@ -298,6 +304,8 @@ pulseaudio_menu_volume_changed (PulseaudioMenu *menu,
scale_menu_item_set_value (SCALE_MENU_ITEM (menu->input_scale), pulseaudio_volume_get_volume_mic (menu->volume) * 100.0);
}
+
+
#ifdef HAVE_MPRIS2
static void
media_notify_cb (GtkWidget *widget,
@@ -312,6 +320,8 @@ media_notify_cb (GtkWidget *widget,
pulseaudio_mpris_notify_player (menu->mpris, mpris_menu_item_get_player (MPRIS_MENU_ITEM (widget)), message);
}
+
+
static void
mpris_update_cb (PulseaudioMpris *mpris,
gchar *player,
@@ -334,46 +344,46 @@ mpris_update_cb (PulseaudioMpris *mpris,
g_return_if_fail (IS_MPRIS_MENU_ITEM (menu_item));
if (mpris_menu_item_get_player (menu_item) == NULL)
+ return;
+
+ if (g_strcmp0 (player, mpris_menu_item_get_player (menu_item)) == 0)
{
- return;
- }
+ if (pulseaudio_mpris_get_player_snapshot (mpris,
+ player,
+ &title,
+ &artist,
+ &is_running,
+ &is_playing,
+ &is_stopped,
+ &can_play,
+ &can_pause,
+ &can_go_previous,
+ &can_go_next,
+ &can_raise))
+ {
+ mpris_menu_item_set_is_running (menu_item, is_running);
+ mpris_menu_item_set_title (menu_item, title);
+ mpris_menu_item_set_artist (menu_item, artist);
+
+ mpris_menu_item_set_can_play (menu_item, can_play);
+ mpris_menu_item_set_can_pause (menu_item, can_pause);
- if (g_strcmp0 (player, mpris_menu_item_get_player (menu_item)) == 0)
- {
- if (pulseaudio_mpris_get_player_snapshot (mpris,
- player,
- &title,
- &artist,
- &is_running,
- &is_playing,
- &is_stopped,
- &can_play,
- &can_pause,
- &can_go_previous,
- &can_go_next,
- &can_raise))
- {
- mpris_menu_item_set_is_running (menu_item, is_running);
- mpris_menu_item_set_title (menu_item, title);
- mpris_menu_item_set_artist (menu_item, artist);
-
- mpris_menu_item_set_can_play (menu_item, can_play);
- mpris_menu_item_set_can_pause (menu_item, can_pause);
-
- mpris_menu_item_set_can_go_previous (menu_item, can_go_previous);
- mpris_menu_item_set_can_go_next (menu_item, can_go_next);
-
- mpris_menu_item_set_is_playing (menu_item, is_playing);
- mpris_menu_item_set_is_stopped (menu_item, is_stopped);
- }
-
- if (title != NULL)
- g_free (title);
- if (artist != NULL)
- g_free (artist);
+ mpris_menu_item_set_can_go_previous (menu_item, can_go_previous);
+ mpris_menu_item_set_can_go_next (menu_item, can_go_next);
+
+ mpris_menu_item_set_is_playing (menu_item, is_playing);
+ mpris_menu_item_set_is_stopped (menu_item, is_stopped);
+ }
+
+ if (title != NULL)
+ g_free (title);
+ if (artist != NULL)
+ g_free (artist);
}
}
+
+
static void
item_destroy_cb (GtkWidget *widget,
gpointer user_data)
@@ -387,6 +397,8 @@ item_destroy_cb (GtkWidget *widget,
}
#endif
+
+
PulseaudioMenu *
pulseaudio_menu_new (PulseaudioVolume *volume,
PulseaudioConfig *config,
@@ -442,77 +454,81 @@ pulseaudio_menu_new (PulseaudioVolume *volume,
/* Output Devices */
sources = pulseaudio_volume_get_output_list (menu->volume);
- if (g_list_length (sources) > 0) {
- /* output volume slider */
- menu->output_scale = scale_menu_item_new_with_range (0.0, volume_max, 1.0);
- scale_menu_item_set_base_icon_name (SCALE_MENU_ITEM (menu->output_scale), "audio-volume");
+ if (g_list_length (sources) > 0)
+ {
+ /* output volume slider */
+ menu->output_scale = scale_menu_item_new_with_range (0.0, volume_max, 1.0);
+ scale_menu_item_set_base_icon_name (SCALE_MENU_ITEM (menu->output_scale), "audio-volume");
- g_signal_connect_swapped (menu->output_scale, "value-changed", G_CALLBACK (pulseaudio_menu_output_range_value_changed), menu);
- g_signal_connect_swapped (menu->output_scale, "toggled", G_CALLBACK (pulseaudio_menu_mute_output_item_toggled), menu);
- g_signal_connect (menu->output_scale, "scroll-event", G_CALLBACK (pulseaudio_menu_output_range_scroll), menu);
+ g_signal_connect_swapped (menu->output_scale, "value-changed", G_CALLBACK (pulseaudio_menu_output_range_value_changed), menu);
+ g_signal_connect_swapped (menu->output_scale, "toggled", G_CALLBACK (pulseaudio_menu_mute_output_item_toggled), menu);
+ g_signal_connect (menu->output_scale, "scroll-event", G_CALLBACK (pulseaudio_menu_output_range_scroll), menu);
- gtk_widget_show_all (menu->output_scale);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu->output_scale);
+ gtk_widget_show_all (menu->output_scale);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu->output_scale);
- /* output device items */
- if (g_list_length (sources) > 1) {
- device_mi = device_menu_item_new_with_label(_("Output"));
- for (GList *list = sources; list != NULL; list = g_list_next(list))
- {
- device_menu_item_add_device(DEVICE_MENU_ITEM(device_mi), (gchar *)list->data, pulseaudio_volume_get_output_by_name(menu->volume, list->data));
- }
+ /* output device items */
+ if (g_list_length (sources) > 1)
+ {
+ device_mi = device_menu_item_new_with_label(_("Output"));
+ for (GList *list = sources; list != NULL; list = g_list_next(list))
+ {
+ device_menu_item_add_device(DEVICE_MENU_ITEM(device_mi), (gchar *)list->data, pulseaudio_volume_get_output_by_name(menu->volume, list->data));
+ }
- device_menu_item_set_device_by_name(DEVICE_MENU_ITEM(device_mi), pulseaudio_volume_get_default_output(menu->volume));
- gtk_widget_show(device_mi);
+ device_menu_item_set_device_by_name(DEVICE_MENU_ITEM(device_mi), pulseaudio_volume_get_default_output(menu->volume));
+ gtk_widget_show(device_mi);
- g_signal_connect_swapped(G_OBJECT(device_mi), "device-changed", G_CALLBACK(pulseaudio_menu_default_output_changed), menu);
+ g_signal_connect_swapped(G_OBJECT(device_mi), "device-changed", G_CALLBACK(pulseaudio_menu_default_output_changed), menu);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), device_mi);
- }
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), device_mi);
+ }
- /* separator */
- mi = gtk_separator_menu_item_new ();
- gtk_widget_show (mi);
- gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
- }
+ /* separator */
+ mi = gtk_separator_menu_item_new ();
+ gtk_widget_show (mi);
+ gtk_menu_shell_append (GTK_MENU_SHELL (menu), mi);
+ }
g_list_free (sources);
/* Input Devices */
sources = pulseaudio_volume_get_input_list (menu->volume);
- if (g_list_length (sources) > 0) {
- /* input volume slider */
- menu->input_scale = scale_menu_item_new_with_range (0.0, volume_max, 1.0);
- scale_menu_item_set_base_icon_name (SCALE_MENU_ITEM (menu->input_scale), "microphone-sensitivity");
+ if (g_list_length (sources) > 0)
+ {
+ /* input volume slider */
+ menu->input_scale = scale_menu_item_new_with_range (0.0, volume_max, 1.0);
+ scale_menu_item_set_base_icon_name (SCALE_MENU_ITEM (menu->input_scale), "microphone-sensitivity");
- g_signal_connect_swapped (menu->input_scale, "value-changed", G_CALLBACK (pulseaudio_menu_input_range_value_changed), menu);
- g_signal_connect_swapped (menu->input_scale, "toggled", G_CALLBACK (pulseaudio_menu_mute_input_item_toggled), menu);
- g_signal_connect (menu->input_scale, "scroll-event", G_CALLBACK (pulseaudio_menu_input_range_scroll), menu);
+ g_signal_connect_swapped (menu->input_scale, "value-changed", G_CALLBACK (pulseaudio_menu_input_range_value_changed), menu);
+ g_signal_connect_swapped (menu->input_scale, "toggled", G_CALLBACK (pulseaudio_menu_mute_input_item_toggled), menu);
+ g_signal_connect (menu->input_scale, "scroll-event", G_CALLBACK (pulseaudio_menu_input_range_scroll), menu);
- gtk_widget_show_all (menu->input_scale);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu->input_scale);
+ gtk_widget_show_all (menu->input_scale);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), menu->input_scale);
+
+ /* input device items */
+ if (g_list_length(sources) > 1)
+ {
+ device_mi = device_menu_item_new_with_label(_("Input"));
+ for (GList *list = sources; list != NULL; list = g_list_next(list))
+ {
+ device_menu_item_add_device(DEVICE_MENU_ITEM(device_mi), (gchar *)list->data, pulseaudio_volume_get_input_by_name(menu->volume, list->data));
+ }
- /* input device items */
- if (g_list_length(sources) > 1) {
- device_mi = device_menu_item_new_with_label(_("Input"));
- for (GList *list = sources; list != NULL; list = g_list_next(list))
- {
- device_menu_item_add_device(DEVICE_MENU_ITEM(device_mi), (gchar *)list->data, pulseaudio_volume_get_input_by_name(menu->volume, list->data));
- }
+ device_menu_item_set_device_by_name(DEVICE_MENU_ITEM(device_mi), pulseaudio_volume_get_default_input(menu->volume));
+ gtk_widget_show(device_mi);
- device_menu_item_set_device_by_name(DEVICE_MENU_ITEM(device_mi), pulseaudio_volume_get_default_input(menu->volume));
- gtk_widget_show(device_mi);
+ g_signal_connect_swapped(G_OBJECT(device_mi), "device-changed", G_CALLBACK(pulseaudio_menu_default_input_changed), menu);
- g_signal_connect_swapped(G_OBJECT(device_mi), "device-changed", G_CALLBACK(pulseaudio_menu_default_input_changed), menu);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), device_mi);
+ }
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), device_mi);
+ /* separator */
+ mi = gtk_separator_menu_item_new();
+ gtk_widget_show(mi);
+ gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
}
- /* separator */
- mi = gtk_separator_menu_item_new();
- gtk_widget_show(mi);
- gtk_menu_shell_append(GTK_MENU_SHELL(menu), mi);
- }
-
/* MPRIS2 */
#ifdef HAVE_MPRIS2
if (pulseaudio_config_get_enable_mpris (menu->config))
diff --git a/panel-plugin/pulseaudio-mpris-player.c b/panel-plugin/pulseaudio-mpris-player.c
index 0e32260..677b905 100644
--- a/panel-plugin/pulseaudio-mpris-player.c
+++ b/panel-plugin/pulseaudio-mpris-player.c
@@ -28,6 +28,8 @@
#include "pulseaudio-mpris-player.h"
+
+
struct _PulseaudioMprisPlayer
{
GObject __parent__;
@@ -66,10 +68,12 @@ struct _PulseaudioMprisPlayerClass
};
+
static void pulseaudio_mpris_player_finalize (GObject *object);
static void pulseaudio_mpris_player_dbus_connect (PulseaudioMprisPlayer *player);
+
enum
{
CONNECTION,
@@ -81,8 +85,11 @@ enum
static int signals[LAST_SIGNAL] = { 0 };
+
G_DEFINE_TYPE (PulseaudioMprisPlayer, pulseaudio_mpris_player, G_TYPE_OBJECT)
+
+
static void
pulseaudio_mpris_player_class_init (PulseaudioMprisPlayerClass *klass)
{
@@ -119,6 +126,8 @@ pulseaudio_mpris_player_class_init (PulseaudioMprisPlayerClass *klass)
G_TYPE_NONE, 0);
}
+
+
static void
pulseaudio_mpris_player_parse_metadata (PulseaudioMprisPlayer *player,
GVariant *dictionary)
@@ -133,7 +142,9 @@ pulseaudio_mpris_player_parse_metadata (PulseaudioMprisPlayer *player,
while (g_variant_iter_loop (&iter, "{sv}", &key, &value))
{
if (0 == g_ascii_strcasecmp (key, "xesam:title"))
- player->title = g_strdup (g_variant_get_string (value, NULL));
+ {
+ player->title = g_strdup(g_variant_get_string(value, NULL));
+ }
else if (0 == g_ascii_strcasecmp (key, "xesam:artist"))
{
artists = g_variant_dup_strv (value, NULL);
@@ -149,10 +160,12 @@ pulseaudio_mpris_player_parse_metadata (PulseaudioMprisPlayer *player,
}
g_strfreev (artists);
}
- }
+ }
}
}
+
+
void
pulseaudio_mpris_player_call_player_method (PulseaudioMprisPlayer *player,
const gchar *method)
@@ -195,6 +208,8 @@ pulseaudio_mpris_player_call_player_method (PulseaudioMprisPlayer *player,
g_object_unref (message);
}
+
+
static GVariant *
pulseaudio_mpris_player_get_all_player_properties (PulseaudioMprisPlayer *player)
{
@@ -222,6 +237,8 @@ pulseaudio_mpris_player_get_all_player_properties (PulseaudioMprisPlayer *player
return child;
}
+
+
static GVariant *
pulseaudio_mpris_player_get_all_media_player_properties (PulseaudioMprisPlayer *player)
{
@@ -249,6 +266,8 @@ pulseaudio_mpris_player_get_all_media_player_properties (PulseaudioMprisPlayer *
return child;
}
+
+
static void
pulseaudio_mpris_player_parse_playback_status (PulseaudioMprisPlayer *player,
const gchar *playback_status)
@@ -261,6 +280,8 @@ pulseaudio_mpris_player_parse_playback_status (PulseaudioMprisPlayer *player,
player->playback_status = STOPPED;
}
+
+
static void
pulseaudio_mpris_player_parse_player_properties (PulseaudioMprisPlayer *player,
GVariant *properties)
@@ -272,32 +293,33 @@ pulseaudio_mpris_player_parse_player_properties (PulseaudioMprisPlayer *player,
g_variant_iter_init (&iter, properties);
- while (g_variant_iter_loop (&iter, "{sv}", &key, &value)) {
- if (0 == g_ascii_strcasecmp (key, "PlaybackStatus"))
- {
- playback_status = g_variant_get_string(value, NULL);
- }
- else if (0 == g_ascii_strcasecmp (key, "CanGoNext"))
- {
- player->can_go_next = g_variant_get_boolean(value);
- }
- else if (0 == g_ascii_strcasecmp (key, "CanGoPrevious"))
- {
- player->can_go_previous = g_variant_get_boolean(value);
- }
- else if (0 == g_ascii_strcasecmp (key, "CanPlay"))
- {
- player->can_play = g_variant_get_boolean(value);
- }
- else if (0 == g_ascii_strcasecmp (key, "CanPause"))
- {
- player->can_pause = g_variant_get_boolean(value);
- }
- else if (0 == g_ascii_strcasecmp (key, "Metadata"))
- {
- pulseaudio_mpris_player_parse_metadata (player, value);
- g_signal_emit (player, signals[METADATA], 0, NULL);
- }
+ while (g_variant_iter_loop (&iter, "{sv}", &key, &value))
+ {
+ if (0 == g_ascii_strcasecmp (key, "PlaybackStatus"))
+ {
+ playback_status = g_variant_get_string(value, NULL);
+ }
+ else if (0 == g_ascii_strcasecmp (key, "CanGoNext"))
+ {
+ player->can_go_next = g_variant_get_boolean(value);
+ }
+ else if (0 == g_ascii_strcasecmp (key, "CanGoPrevious"))
+ {
+ player->can_go_previous = g_variant_get_boolean(value);
+ }
+ else if (0 == g_ascii_strcasecmp (key, "CanPlay"))
+ {
+ player->can_play = g_variant_get_boolean(value);
+ }
+ else if (0 == g_ascii_strcasecmp (key, "CanPause"))
+ {
+ player->can_pause = g_variant_get_boolean(value);
+ }
+ else if (0 == g_ascii_strcasecmp (key, "Metadata"))
+ {
+ pulseaudio_mpris_player_parse_metadata (player, value);
+ g_signal_emit (player, signals[METADATA], 0, NULL);
+ }
}
if (playback_status != NULL)
@@ -307,6 +329,8 @@ pulseaudio_mpris_player_parse_player_properties (PulseaudioMprisPlayer *player,
}
}
+
+
static void
pulseaudio_mpris_player_parse_media_player_properties (PulseaudioMprisPlayer *player,
GVariant *properties)
@@ -326,6 +350,8 @@ pulseaudio_mpris_player_parse_media_player_properties (PulseaudioMprisPlayer *pl
}
}
+
+
static void
pulseaudio_mpris_player_on_dbus_property_signal (GDBusProxy *proxy,
gchar *sender_name,
@@ -351,6 +377,8 @@ pulseaudio_mpris_player_on_dbus_property_signal (GDBusProxy *proxy,
g_variant_unref (child);
}
+
+
static void
pulseaudio_mpris_player_on_dbus_connected (GDBusConnection *connection,
const gchar *name,
@@ -376,6 +404,8 @@ pulseaudio_mpris_player_on_dbus_connected (GDBusConnection *connection,
g_variant_unref (reply);
}
+
+
static void
pulseaudio_mpris_player_on_dbus_lost (GDBusConnection *connection,
const gchar *name,
@@ -403,6 +433,8 @@ pulseaudio_mpris_player_on_dbus_lost (GDBusConnection *connection,
g_signal_emit (player, signals[CONNECTION], 0, player->connected);
}
+
+
static gchar *
find_desktop_entry (const gchar *player_name)
{
@@ -444,6 +476,8 @@ find_desktop_entry (const gchar *player_name)
return filename;
}
+
+
static void
pulseaudio_mpris_player_set_details_from_desktop (PulseaudioMprisPlayer *player,
const gchar *player_name)
@@ -489,6 +523,8 @@ pulseaudio_mpris_player_set_details_from_desktop (PulseaudioMprisPlayer *player,
g_free (file);
}
+
+
static void
pulseaudio_mpris_player_set_player (PulseaudioMprisPlayer *player,
const gchar *player_name)
@@ -524,6 +560,8 @@ pulseaudio_mpris_player_set_player (PulseaudioMprisPlayer *player,
pulseaudio_mpris_player_dbus_connect (player);
}
+
+
static void
pulseaudio_mpris_player_dbus_connect (PulseaudioMprisPlayer *player)
{
@@ -591,91 +629,121 @@ pulseaudio_mpris_player_dbus_connect (PulseaudioMprisPlayer *player)
player->watch_id = watch_id;
}
+
+
const gchar *
pulseaudio_mpris_player_get_player (PulseaudioMprisPlayer *player)
{
return player->player;
}
+
+
const gchar *
pulseaudio_mpris_player_get_player_title (PulseaudioMprisPlayer *player)
{
return player->player_label;
}
+
+
const gchar *
pulseaudio_mpris_player_get_icon_name (PulseaudioMprisPlayer *player)
{
return player->icon_name;
}
+
+
const gchar *
pulseaudio_mpris_player_get_title (PulseaudioMprisPlayer *player)
{
return player->title;
}
+
+
const gchar *
pulseaudio_mpris_player_get_artist (PulseaudioMprisPlayer *player)
{
return player->artist;
}
+
+
gboolean
pulseaudio_mpris_player_is_connected (PulseaudioMprisPlayer *player)
{
return player->connected;
}
+
+
gboolean
pulseaudio_mpris_player_is_playing (PulseaudioMprisPlayer *player)
{
return player->playback_status == PLAYING;
}
+
+
gboolean
pulseaudio_mpris_player_is_stopped (PulseaudioMprisPlayer *player)
{
return player->playback_status == STOPPED;
}
+
+
gboolean
pulseaudio_mpris_player_can_play (PulseaudioMprisPlayer *player)
{
return player->can_play;
}
+
+
gboolean
pulseaudio_mpris_player_can_pause (PulseaudioMprisPlayer *player)
{
return player->can_pause;
}
+
+
gboolean
pulseaudio_mpris_player_can_go_previous (PulseaudioMprisPlayer *player)
{
return player->can_go_previous;
}
+
+
gboolean
pulseaudio_mpris_player_can_go_next (PulseaudioMprisPlayer *player)
{
return player->can_go_next;
}
+
+
gboolean
pulseaudio_mpris_player_can_raise (PulseaudioMprisPlayer *player)
{
return player->can_raise;
}
+
+
gboolean
pulseaudio_mpris_player_is_equal (PulseaudioMprisPlayer *a,
PulseaudioMprisPlayer *b)
{
- return g_strcmp0 (pulseaudio_mpris_player_get_player_title (a), pulseaudio_mpris_player_get_player_title (b)) == 0;
+ return g_strcmp0 (pulseaudio_mpris_player_get_player_title (a), pulseaudio_mpris_player_get_player_title (b)) == 0;
}
+
+
static void
pulseaudio_mpris_player_init (PulseaudioMprisPlayer *player)
{
@@ -700,6 +768,7 @@ pulseaudio_mpris_player_init (PulseaudioMprisPlayer *player)
}
+
static void
pulseaudio_mpris_player_finalize (GObject *object)
{
@@ -729,6 +798,8 @@ pulseaudio_mpris_player_finalize (GObject *object)
(*G_OBJECT_CLASS (pulseaudio_mpris_player_parent_class)->finalize) (object);
}
+
+
PulseaudioMprisPlayer *
pulseaudio_mpris_player_new (gchar *name)
{
diff --git a/panel-plugin/pulseaudio-mpris.c b/panel-plugin/pulseaudio-mpris.c
index 495d123..269f286 100644
--- a/panel-plugin/pulseaudio-mpris.c
+++ b/panel-plugin/pulseaudio-mpris.c
@@ -28,6 +28,8 @@
#include "pulseaudio-mpris.h"
#include "pulseaudio-mpris-player.h"
+
+
struct _PulseaudioMpris
{
GObject __parent__;
@@ -46,9 +48,11 @@ struct _PulseaudioMprisClass
};
+
static void pulseaudio_mpris_finalize (GObject *object);
+
enum
{
UPDATE,
@@ -57,8 +61,11 @@ enum
static int signals[LAST_SIGNAL] = { 0 };
+
G_DEFINE_TYPE (PulseaudioMpris, pulseaudio_mpris, G_TYPE_OBJECT)
+
+
static void
pulseaudio_mpris_class_init (PulseaudioMprisClass *klass)
{
@@ -78,6 +85,7 @@ pulseaudio_mpris_class_init (PulseaudioMprisClass *klass)
}
+
gchar **
pulseaudio_mpris_get_available_players (PulseaudioMpris *mpris)
{
@@ -131,6 +139,8 @@ pulseaudio_mpris_get_available_players (PulseaudioMpris *mpris)
return res;
}
+
+
static void
pulseaudio_mpris_player_update_cb (PulseaudioMprisPlayer *player,
gchar *sender_name,
@@ -143,6 +153,8 @@ pulseaudio_mpris_player_update_cb (PulseaudioMprisPlayer *player,
g_signal_emit (mpris, signals[UPDATE], 0, pulseaudio_mpris_player_get_player (player));
}
+
+
static void
pulseaudio_mpris_player_metadata_cb (PulseaudioMprisPlayer *player,
gpointer user_data)
@@ -154,6 +166,8 @@ pulseaudio_mpris_player_metadata_cb (PulseaudioMprisPlayer *player,
g_signal_emit (mpris, signals[UPDATE], 0, pulseaudio_mpris_player_get_player (player));
}
+
+
static gboolean
pulseaudio_mpris_tick_cb (gpointer user_data)
{
@@ -184,6 +198,8 @@ pulseaudio_mpris_tick_cb (gpointer user_data)
return TRUE;
}
+
+
gboolean
pulseaudio_mpris_get_player_snapshot (PulseaudioMpris *mpris,
const gchar *name,
@@ -239,6 +255,8 @@ pulseaudio_mpris_get_player_snapshot (PulseaudioMpris *mpris,
return FALSE;
}
+
+
gboolean
pulseaudio_mpris_notify_player (PulseaudioMpris *mpris,
const gchar *name,
@@ -277,20 +295,22 @@ pulseaudio_mpris_notify_any_player (PulseaudioMpris *mpris,
g_hash_table_iter_init (&iter, mpris->players);
while (g_hash_table_iter_next(&iter, (gpointer *) &key, (gpointer) &player))
- {
- if (player != NULL)
{
- if (pulseaudio_mpris_player_is_connected(player))
- {
- pulseaudio_mpris_player_call_player_method(player, message);
- found = TRUE;
- }
+ if (player != NULL)
+ {
+ if (pulseaudio_mpris_player_is_connected(player))
+ {
+ pulseaudio_mpris_player_call_player_method(player, message);
+ found = TRUE;
+ }
+ }
}
- }
return found;
}
+
+
static void
pulseaudio_mpris_init (PulseaudioMpris *mpris)
{
@@ -298,6 +318,8 @@ pulseaudio_mpris_init (PulseaudioMpris *mpris)
mpris->dbus_connection = NULL;
}
+
+
static void
pulseaudio_mpris_finalize (GObject *object)
{
@@ -311,6 +333,8 @@ pulseaudio_mpris_finalize (GObject *object)
(*G_OBJECT_CLASS (pulseaudio_mpris_parent_class)->finalize) (object);
}
+
+
PulseaudioMpris *
pulseaudio_mpris_new (PulseaudioConfig *config)
{
diff --git a/panel-plugin/pulseaudio-mpris.h b/panel-plugin/pulseaudio-mpris.h
index 500f0aa..2e354a0 100644
--- a/panel-plugin/pulseaudio-mpris.h
+++ b/panel-plugin/pulseaudio-mpris.h
@@ -61,6 +61,6 @@ gboolean pulseaudio_mpris_notify_player (PulseaudioMpris
gboolean pulseaudio_mpris_notify_any_player (PulseaudioMpris *mpris,
const gchar *message);
- G_END_DECLS
+G_END_DECLS
#endif /* !__PULSEAUDIO_MPRIS_H__ */
diff --git a/panel-plugin/pulseaudio-notify.c b/panel-plugin/pulseaudio-notify.c
index b47ca00..b508fc9 100644
--- a/panel-plugin/pulseaudio-notify.c
+++ b/panel-plugin/pulseaudio-notify.c
@@ -50,6 +50,7 @@
#define V_HIGH 3
+
/* Icons for different volume levels */
static const char *icons[] = {
"audio-volume-muted-symbolic",
@@ -59,7 +60,6 @@ static const char *icons[] = {
NULL
};
-
/* Icons for different mic volume levels */
static const char *icons_mic[] = {
"microphone-sensitivity-muted-symbolic",
@@ -70,9 +70,11 @@ static const char *icons_mic[] = {
};
+
static void pulseaudio_notify_finalize (GObject *object);
+
struct _PulseaudioNotify
{
GObject __parent__;
@@ -96,9 +98,10 @@ struct _PulseaudioNotifyClass
-
G_DEFINE_TYPE (PulseaudioNotify, pulseaudio_notify, G_TYPE_OBJECT)
+
+
static void
pulseaudio_notify_class_init (PulseaudioNotifyClass *klass)
{
@@ -212,21 +215,21 @@ pulseaudio_notify_notify (PulseaudioNotify *notify, gboolean mic)
else
icon = icons_array[V_HIGH];
-
notify_notification_update (notification,
title,
NULL,
icon);
g_free (title);
- if (notify->gauge_notifications) {
- notify_notification_set_hint (notification,
- "value",
- g_variant_new_int32(volume_i));
- notify_notification_set_hint (notification,
- "x-canonical-private-synchronous",
- g_variant_new_string(""));
- }
+ if (notify->gauge_notifications)
+ {
+ notify_notification_set_hint (notification,
+ "value",
+ g_variant_new_int32(volume_i));
+ notify_notification_set_hint (notification,
+ "x-canonical-private-synchronous",
+ g_variant_new_string(""));
+ }
if (!notify_notification_show (notification, &error))
{
@@ -289,5 +292,4 @@ pulseaudio_notify_new (PulseaudioConfig *config,
return notify;
}
-
#endif /* HAVE_LIBNOTIFY */
diff --git a/panel-plugin/pulseaudio-plugin.c b/panel-plugin/pulseaudio-plugin.c
index 18bb342..cd6f316 100644
--- a/panel-plugin/pulseaudio-plugin.c
+++ b/panel-plugin/pulseaudio-plugin.c
@@ -101,6 +101,8 @@ static void pulseaudio_plugin_next_key_pressed (cons
void *user_data);
#endif
+
+
struct _PulseaudioPluginClass
{
XfcePanelPluginClass __parent__;
@@ -129,12 +131,12 @@ struct _PulseaudioPlugin
};
+
/* define the plugin */
XFCE_PANEL_DEFINE_PLUGIN (PulseaudioPlugin, pulseaudio_plugin)
-
static void
pulseaudio_plugin_class_init (PulseaudioPluginClass *klass)
{
@@ -178,6 +180,7 @@ pulseaudio_plugin_free_data (XfcePanelPlugin *plugin)
#ifdef HAVE_KEYBINDER
/* release keybindings */
pulseaudio_plugin_unbind_keys (pulseaudio_plugin);
+ pulseaudio_plugin_unbind_multimedia_keys (pulseaudio_plugin);
#endif
}
@@ -262,7 +265,6 @@ pulseaudio_plugin_configure_plugin (XfcePanelPlugin *plugin)
-
static gboolean
pulseaudio_plugin_size_changed (XfcePanelPlugin *plugin,
gint size)
diff --git a/panel-plugin/pulseaudio-volume.c b/panel-plugin/pulseaudio-volume.c
index b4f6597..328d452 100644
--- a/panel-plugin/pulseaudio-volume.c
+++ b/panel-plugin/pulseaudio-volume.c
@@ -55,6 +55,7 @@ static void pulseaudio_volume_get_source_list_cb (pa_context
void *userdata);
+
struct _PulseaudioVolume
{
GObject __parent__;
@@ -93,7 +94,6 @@ struct _PulseaudioVolumeClass
-
enum
{
VOLUME_CHANGED,
@@ -105,9 +105,10 @@ static guint pulseaudio_volume_signals[LAST_SIGNAL] = { 0, };
-
G_DEFINE_TYPE (PulseaudioVolume, pulseaudio_volume, G_TYPE_OBJECT)
+
+
static void
pulseaudio_volume_class_init (PulseaudioVolumeClass *klass)
{
@@ -181,7 +182,6 @@ pulseaudio_volume_finalize (GObject *object)
-
/* sink event callbacks */
static void
pulseaudio_volume_sink_info_cb (pa_context *context,
@@ -193,7 +193,10 @@ pulseaudio_volume_sink_info_cb (pa_context *context,
gdouble vol;
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
+
+ if (i == NULL)
+ return;
+
pulseaudio_debug ("sink info: %s, %s", i->name, i->description);
volume->sink_index = (guint)i->index;
@@ -225,7 +228,6 @@ pulseaudio_volume_sink_info_cb (pa_context *context,
-
static void
pulseaudio_volume_source_info_cb (pa_context *context,
const pa_source_info *i,
@@ -236,7 +238,10 @@ pulseaudio_volume_source_info_cb (pa_context *context,
gdouble vol_mic;
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
+
+ if (i == NULL)
+ return;
+
pulseaudio_debug ("source info: %s, %s", i->name, i->description);
volume->source_index = (guint)i->index;
@@ -274,7 +279,9 @@ pulseaudio_volume_server_info_cb (pa_context *context,
void *userdata)
{
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
+
+ if (i == NULL)
+ return;
pulseaudio_volume_set_default_input (volume, i->default_source_name);
pulseaudio_volume_set_default_output (volume, i->default_sink_name);
@@ -286,7 +293,6 @@ pulseaudio_volume_server_info_cb (pa_context *context,
-
static void
pulseaudio_volume_sink_source_check (PulseaudioVolume *volume,
pa_context *context)
@@ -304,7 +310,6 @@ pulseaudio_volume_sink_source_check (PulseaudioVolume *volume,
-
static void
pulseaudio_volume_subscribe_cb (pa_context *context,
pa_subscription_event_type_t t,
@@ -348,9 +353,6 @@ pulseaudio_volume_subscribe_cb (pa_context *context,
-
-
-
static void
pulseaudio_volume_get_sink_list_cb (pa_context *context,
const pa_sink_info *i,
@@ -361,9 +363,12 @@ pulseaudio_volume_get_sink_list_cb (pa_context *context,
gchar *description = NULL;
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
- if (eol > 0) return;
+ if (i == NULL)
+ return;
+
+ if (eol > 0)
+ return;
name = g_strdup (i->name);
description = g_strdup (i->description);
@@ -383,12 +388,16 @@ pulseaudio_volume_get_source_list_cb (pa_context *context,
gchar *description = NULL;
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
- if (eol > 0) return;
+ if (i == NULL)
+ return;
+
+ if (eol > 0)
+ return;
/* Ignore sink monitors, not relevant for users */
- if (i->monitor_of_sink != PA_INVALID_INDEX) return;
+ if (i->monitor_of_sink != PA_INVALID_INDEX)
+ return;
name = g_strdup (i->name);
description = g_strdup (i->description);
@@ -404,7 +413,9 @@ pulseaudio_volume_get_server_info_cb (pa_context *context,
void *userdata)
{
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
+
+ if (i == NULL)
+ return;
g_free (volume->default_sink_name);
g_free (volume->default_source_name);
@@ -514,7 +525,6 @@ pulseaudio_volume_connect (PulseaudioVolume *volume)
-
static gboolean
pulseaudio_volume_reconnect_timeout (gpointer userdata)
{
@@ -528,8 +538,6 @@ pulseaudio_volume_reconnect_timeout (gpointer userdata)
-
-
gboolean
pulseaudio_volume_get_connected (PulseaudioVolume *volume)
{
@@ -577,7 +585,6 @@ pulseaudio_volume_d2v (PulseaudioVolume *volume,
-
gboolean
pulseaudio_volume_get_muted (PulseaudioVolume *volume)
{
@@ -630,7 +637,6 @@ pulseaudio_volume_toggle_muted (PulseaudioVolume *volume)
-
gboolean
pulseaudio_volume_get_muted_mic (PulseaudioVolume *volume)
{
@@ -702,7 +708,9 @@ pulseaudio_volume_set_volume_cb2 (pa_context *context,
void *userdata)
{
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
+
+ if (i == NULL)
+ return;
pa_cvolume_set ((pa_cvolume *)&i->volume, 1, pulseaudio_volume_d2v (volume, volume->volume));
pa_context_set_sink_volume_by_index (context, i->index, &i->volume, pulseaudio_volume_sink_volume_changed, volume);
@@ -717,7 +725,9 @@ pulseaudio_volume_set_volume_cb1 (pa_context *context,
void *userdata)
{
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
+
+ if (i == NULL)
+ return;
pa_context_get_sink_info_by_name (context, i->default_sink_name, pulseaudio_volume_set_volume_cb2, volume);
}
@@ -766,7 +776,9 @@ pulseaudio_volume_set_volume_mic_cb2 (pa_context *context,
void *userdata)
{
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
+
+ if (i == NULL)
+ return;
pa_cvolume_set ((pa_cvolume *)&i->volume, 1, pulseaudio_volume_d2v (volume, volume->volume_mic));
pa_context_set_source_volume_by_index (context, i->index, &i->volume, pulseaudio_volume_source_volume_changed, volume);
@@ -899,7 +911,9 @@ pulseaudio_volume_default_sink_changed_info_cb (pa_context *context,
void *userdata)
{
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
+
+ if (i == NULL)
+ return;
pa_context_move_sink_input_by_index (context, volume->sink_index, i->index, NULL, NULL);
volume->sink_index = (guint)i->index;
@@ -942,7 +956,9 @@ pulseaudio_volume_default_source_changed_info_cb (pa_context *context,
void *userdata)
{
PulseaudioVolume *volume = PULSEAUDIO_VOLUME (userdata);
- if (i == NULL) return;
+
+ if (i == NULL)
+ return;
pa_context_move_source_output_by_index (context, volume->source_index, i->index, NULL, NULL);
volume->source_index = (guint)i->index;
diff --git a/panel-plugin/scalemenuitem.c b/panel-plugin/scalemenuitem.c
index 5b014cf..bdc252a 100644
--- a/panel-plugin/scalemenuitem.c
+++ b/panel-plugin/scalemenuitem.c
@@ -63,10 +63,14 @@ enum {
static guint signals[LAST_SIGNAL] = { 0 };
+
+
G_GNUC_BEGIN_IGNORE_DEPRECATIONS
G_DEFINE_TYPE (ScaleMenuItem, scale_menu_item, GTK_TYPE_IMAGE_MENU_ITEM)
G_GNUC_END_IGNORE_DEPRECATIONS
+
+
#define GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE ((o), TYPE_SCALE_MENU_ITEM, ScaleMenuItemPrivate))
@@ -352,21 +356,13 @@ scale_menu_item_update_icon (ScaleMenuItem *self)
/* Update the menuitem icon */
if (scale_menu_item_get_muted (self) || value <= 0.0)
- {
- icon_name = g_strconcat(priv->icon_name, "-muted-symbolic", NULL);
- }
+ icon_name = g_strconcat(priv->icon_name, "-muted-symbolic", NULL);
else if (value < 30.0)
- {
- icon_name = g_strconcat(priv->icon_name, "-low-symbolic", NULL);
- }
+ icon_name = g_strconcat(priv->icon_name, "-low-symbolic", NULL);
else if (value < 70.0)
- {
- icon_name = g_strconcat(priv->icon_name, "-medium-symbolic", NULL);
- }
+ icon_name = g_strconcat(priv->icon_name, "-medium-symbolic", NULL);
else
- {
- icon_name = g_strconcat(priv->icon_name, "-high-symbolic", NULL);
- }
+ icon_name = g_strconcat(priv->icon_name, "-high-symbolic", NULL);
gtk_image_set_from_icon_name (GTK_IMAGE (priv->image), icon_name, GTK_ICON_SIZE_MENU);
g_free (icon_name);
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list