aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xconfigure20
-rw-r--r--configure.ac4
-rw-r--r--src/Makefile.am2
-rw-r--r--src/Makefile.in7
-rw-r--r--src/metadata-widget.c27
-rw-r--r--src/pulseaudio-mgr.c1
-rw-r--r--src/slider-menu-item.c30
-rw-r--r--src/transport-widget.c1
8 files changed, 52 insertions, 40 deletions
diff --git a/configure b/configure
index d5aca28..bc752e4 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.68 for indicator-sound 0.8.1.0.
+# Generated by GNU Autoconf 2.68 for indicator-sound 0.8.2.0.
#
# Report bugs to <conor.curran@canonical.com>.
#
@@ -630,8 +630,8 @@ MAKEFLAGS=
# Identity of this package.
PACKAGE_NAME='indicator-sound'
PACKAGE_TARNAME='indicator-sound'
-PACKAGE_VERSION='0.8.1.0'
-PACKAGE_STRING='indicator-sound 0.8.1.0'
+PACKAGE_VERSION='0.8.2.0'
+PACKAGE_STRING='indicator-sound 0.8.2.0'
PACKAGE_BUGREPORT='conor.curran@canonical.com'
PACKAGE_URL=''
@@ -1443,7 +1443,7 @@ if test "$ac_init_help" = "long"; then
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures indicator-sound 0.8.1.0 to adapt to many kinds of systems.
+\`configure' configures indicator-sound 0.8.2.0 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1513,7 +1513,7 @@ fi
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of indicator-sound 0.8.1.0:";;
+ short | recursive ) echo "Configuration of indicator-sound 0.8.2.0:";;
esac
cat <<\_ACEOF
@@ -1642,7 +1642,7 @@ fi
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-indicator-sound configure 0.8.1.0
+indicator-sound configure 0.8.2.0
generated by GNU Autoconf 2.68
Copyright (C) 2010 Free Software Foundation, Inc.
@@ -2011,7 +2011,7 @@ cat >config.log <<_ACEOF
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by indicator-sound $as_me 0.8.1.0, which was
+It was created by indicator-sound $as_me 0.8.2.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
$ $0 $@
@@ -2831,7 +2831,7 @@ fi
# Define the identity of the package.
PACKAGE=indicator-sound
- VERSION=0.8.1.0
+ VERSION=0.8.2.0
cat >>confdefs.h <<_ACEOF
@@ -15666,7 +15666,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by indicator-sound $as_me 0.8.1.0, which was
+This file was extended by indicator-sound $as_me 0.8.2.0, which was
generated by GNU Autoconf 2.68. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15732,7 +15732,7 @@ _ACEOF
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-indicator-sound config.status 0.8.1.0
+indicator-sound config.status 0.8.2.0
configured by $0, generated by GNU Autoconf 2.68,
with options \\"\$ac_cs_config\\"
diff --git a/configure.ac b/configure.ac
index 014cd1d..8bb0a28 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,10 +1,10 @@
-AC_INIT(indicator-sound, 0.8.1.0, conor.curran@canonical.com)
+AC_INIT(indicator-sound, 0.8.2.0, conor.curran@canonical.com)
AC_PREREQ(2.53)
AM_CONFIG_HEADER(config.h)
-AM_INIT_AUTOMAKE(indicator-sound, 0.8.1.0)
+AM_INIT_AUTOMAKE(indicator-sound, 0.8.2.0)
AM_MAINTAINER_MODE
diff --git a/src/Makefile.am b/src/Makefile.am
index 36fe490..5a36822 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -33,7 +33,7 @@ libsoundmenu_la_CFLAGS = \
$(COVERAGE_CFLAGS) \
-Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\"
libsoundmenu_la_LIBADD = $(APPLET_LIBS) -lm
-libsoundmenu_la_LDFLAGS =
+libsoundmenu_la_LDFLAGS = \
$(COVERAGE_LDFLAGS) \
-module -avoid-version
diff --git a/src/Makefile.in b/src/Makefile.in
index 68da6e0..ca34bba 100644
--- a/src/Makefile.in
+++ b/src/Makefile.in
@@ -383,7 +383,10 @@ libsoundmenu_la_CFLAGS = \
-Wall -Werror -DG_LOG_DOMAIN=\"Indicator-Sound\"
libsoundmenu_la_LIBADD = $(APPLET_LIBS) -lm
-libsoundmenu_la_LDFLAGS =
+libsoundmenu_la_LDFLAGS = \
+ $(COVERAGE_LDFLAGS) \
+ -module -avoid-version
+
####################################################################
# Sound Service
@@ -1264,8 +1267,6 @@ uninstall-am: uninstall-libexecPROGRAMS \
pdf pdf-am ps ps-am tags uninstall uninstall-am \
uninstall-libexecPROGRAMS uninstall-soundmenulibLTLIBRARIES
- $(COVERAGE_LDFLAGS) \
- -module -avoid-version
checkxml: $(srcdir)/sound-service.xml
@xmllint -valid -noout $<
diff --git a/src/metadata-widget.c b/src/metadata-widget.c
index a3383df..36b48f8 100644
--- a/src/metadata-widget.c
+++ b/src/metadata-widget.c
@@ -129,13 +129,13 @@ metadata_widget_init (MetadataWidget *self)
priv->icon_buf = NULL;
#if GTK_CHECK_VERSION(3, 0, 0)
- outer_v_box = gtk_box_new (FALSE, 0);
+ outer_v_box = gtk_box_new (GTK_ORIENTATION_VERTICAL, 0);
#else
outer_v_box = gtk_vbox_new (FALSE, 0);
#endif
#if GTK_CHECK_VERSION(3, 0, 0)
- hbox = gtk_box_new(FALSE, 0);
+ hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 0);
#else
hbox = gtk_hbox_new(FALSE, 0);
#endif
@@ -174,7 +174,7 @@ metadata_widget_init (MetadataWidget *self)
priv->theme_change_occured = FALSE;
#if GTK_CHECK_VERSION(3, 0, 0)
- GtkWidget* vbox = gtk_box_new(FALSE, 0);
+ GtkWidget* vbox = gtk_box_new(GTK_ORIENTATION_VERTICAL, 0);
#else
GtkWidget* vbox = gtk_vbox_new(FALSE, 0);
#endif
@@ -227,16 +227,15 @@ metadata_widget_init (MetadataWidget *self)
// player label
GtkWidget* player_label;
- player_label = gtk_label_new("");
- gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0.5);
- gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)0);
- gtk_widget_set_size_request (player_label, 200, 24);
+ player_label = gtk_label_new ("");
+ gtk_misc_set_alignment(GTK_MISC(player_label), (gfloat)0, (gfloat)0);
+ gtk_misc_set_padding (GTK_MISC(player_label), (gfloat)1, (gfloat)0);
+ gtk_widget_set_size_request (player_label, 150, 24);
priv->player_label = player_label;
gtk_box_pack_start (GTK_BOX(outer_v_box), priv->player_label, FALSE, FALSE, 0);
-
gtk_box_pack_start (GTK_BOX(outer_v_box), priv->meta_data_h_box, FALSE, FALSE, 0);
-
+
gtk_container_add (GTK_CONTAINER (self), outer_v_box);
gtk_widget_show_all (priv->meta_data_h_box);
@@ -282,7 +281,7 @@ metadata_widget_get_preferred_width (GtkWidget* self,
}
/**
* We override the expose method to enable primitive drawing of the
- * empty album art image and rounded rectangles on the album art.
+ * empty album art image.
*/
static gboolean
metadata_image_expose_gtk_3 (GtkWidget *metadata,
@@ -299,8 +298,6 @@ metadata_image_expose_gtk_3 (GtkWidget *metadata,
return FALSE;
}
- draw_album_border (metadata, FALSE);
-
if(priv->image_path->len > 0){
if(g_string_equal(priv->image_path, priv->old_image_path) == FALSE ||
priv->theme_change_occured == TRUE){
@@ -311,6 +308,7 @@ metadata_image_expose_gtk_3 (GtkWidget *metadata,
if(GDK_IS_PIXBUF(pixbuf) == FALSE){
gtk_image_clear ( GTK_IMAGE(priv->album_art));
gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60);
+ draw_album_border (metadata, FALSE);
draw_album_art_placeholder(metadata);
return FALSE;
}
@@ -320,6 +318,7 @@ metadata_image_expose_gtk_3 (GtkWidget *metadata,
gdk_pixbuf_get_width(pixbuf),
gdk_pixbuf_get_height(pixbuf));
+ draw_album_border (metadata, FALSE);
g_string_erase (priv->old_image_path, 0, -1);
g_string_overwrite (priv->old_image_path, 0, priv->image_path->str);
g_object_unref(pixbuf);
@@ -328,6 +327,7 @@ metadata_image_expose_gtk_3 (GtkWidget *metadata,
}
gtk_image_clear (GTK_IMAGE(priv->album_art));
gtk_widget_set_size_request(GTK_WIDGET(priv->album_art), 60, 60);
+ draw_album_border (metadata, FALSE);
draw_album_art_placeholder(metadata);
return FALSE;
}
@@ -500,7 +500,8 @@ metadata_widget_icon_triangle_draw_cb (GtkWidget *widget,
#endif
static void
-draw_album_border(GtkWidget *metadata, gboolean selected)
+draw_album_border(GtkWidget *metadata,
+ gboolean selected)
{
cairo_t *cr;
cr = gdk_cairo_create (gtk_widget_get_window (metadata));
diff --git a/src/pulseaudio-mgr.c b/src/pulseaudio-mgr.c
index ba83c71..3a80cbd 100644
--- a/src/pulseaudio-mgr.c
+++ b/src/pulseaudio-mgr.c
@@ -174,7 +174,6 @@ reconnect_to_pulse (gpointer user_data)
void
pm_update_volume (gint sink_index, pa_cvolume new_volume)
{
- // LP: #850662
if (sink_index < 0 || pulse_context == NULL){
return;
}
diff --git a/src/slider-menu-item.c b/src/slider-menu-item.c
index 165c3d5..dc0671c 100644
--- a/src/slider-menu-item.c
+++ b/src/slider-menu-item.c
@@ -147,21 +147,31 @@ slider_menu_item_populate (SliderMenuItem* self, const pa_sink_info* update)
static void
slider_menu_item_update_volume (SliderMenuItem* self, gdouble percent)
{
+ g_return_if_fail (IS_SLIDER_MENU_ITEM (self));
-/*
- g_debug ("slider menu item update volume - about to set the volume to %f", percent);
-*/
-
- pa_cvolume new_volume;
- pa_cvolume_init(&new_volume);
- new_volume.channels = 1;
+ pa_cvolume mono_new_volume;
+ pa_cvolume_init(&mono_new_volume);
+ mono_new_volume.channels = 1;
pa_volume_t new_volume_value = (pa_volume_t) ((percent * PA_VOLUME_NORM) / 100);
- pa_cvolume_set(&new_volume, 1, new_volume_value);
+
+ if (new_volume_value == PA_VOLUME_INVALID || new_volume_value >= PA_VOLUME_MAX){
+ g_warning ("slider_menu_item_update_volume - volume is out of range !");
+ return;
+ }
+
+ pa_cvolume_set(&mono_new_volume, 1, new_volume_value);
SliderMenuItemPrivate* priv = SLIDER_MENU_ITEM_GET_PRIVATE (self);
-
+ if (!pa_cvolume_valid (&mono_new_volume)){
+ g_warning ("Invalid volume - ignore it!");
+ return;
+ }
+ if (!pa_channel_map_valid(&priv->channel_map)){
+ g_warning ("Invalid channel map - ignore update volume!");
+ return;
+ }
pa_cvolume_set(&priv->volume, priv->channel_map.channels, new_volume_value);
- pm_update_volume (priv->index, new_volume);
+ pm_update_volume (priv->index, mono_new_volume);
}
// To the UI
diff --git a/src/transport-widget.c b/src/transport-widget.c
index 08e4ba9..09bb302 100644
--- a/src/transport-widget.c
+++ b/src/transport-widget.c
@@ -309,6 +309,7 @@ transport_widget_expose (GtkWidget *button, GdkEventExpose *event)
gboolean
transport_widget_is_selected ( TransportWidget* widget )
{
+ g_return_val_if_fail (IS_TRANSPORT_WIDGET (widget), FALSE);
TransportWidgetPrivate* priv = TRANSPORT_WIDGET_GET_PRIVATE(widget);
return priv->has_focus;
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-16 15:46:00 +0000