aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2014-10-08 13:17:29 -0500
committerTed Gould <ted@gould.cx>2014-10-08 13:17:29 -0500
commit01f7666daad3f238bc413211322c77a347cdf202 (patch)
treef0e54275d06e36b4c0eb5f876da2ae63d8fb1bdd
parentbd962c434155346e4875258f181bb55f6f3aa856 (diff)
parentdbcb55e3fb48831124a3210abe36f049262bb22d (diff)
downloadayatana-indicator-sound-01f7666daad3f238bc413211322c77a347cdf202.tar.gz
ayatana-indicator-sound-01f7666daad3f238bc413211322c77a347cdf202.tar.bz2
ayatana-indicator-sound-01f7666daad3f238bc413211322c77a347cdf202.zip
Grabbing the rest of trunk
-rw-r--r--debian/changelog19
-rw-r--r--src/sound-menu.vala8
-rw-r--r--src/volume-control.vala7
3 files changed, 27 insertions, 7 deletions
diff --git a/debian/changelog b/debian/changelog
index b6f24dd..e472d77 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+indicator-sound (12.10.2+14.10.20141007-0ubuntu1) utopic; urgency=low
+
+ [ Ted Gould ]
+ * Merge trunk into older branches to resolve conflicts.
+
+ [ Nick Dedekind ]
+ * Use label for Volume sliders.
+
+ [ Mirco Müller ]
+ * Merge trunk into older branches to resolve conflicts.
+
+ [ CI bot ]
+ * Added use of synchronous notifications for volume-changes. (LP:
+ #1232633)
+ * Volume control: properly scale channels when setting the volume (LP:
+ #1374249)
+
+ -- Ubuntu daily release <ps-jenkins@lists.canonical.com> Tue, 07 Oct 2014 02:51:42 +0000
+
indicator-sound (12.10.2+14.10.20141001-0ubuntu2) utopic; urgency=medium
* debian/control: adjusting libpulse-dev version deps
diff --git a/src/sound-menu.vala b/src/sound-menu.vala
index e37c4e9..03faa89 100644
--- a/src/sound-menu.vala
+++ b/src/sound-menu.vala
@@ -35,7 +35,7 @@ public class SoundMenu: Object
this.volume_section = new Menu ();
if ((flags & DisplayFlags.SHOW_MUTE) != 0)
volume_section.append (_("Mute"), "indicator.mute");
- volume_section.append_item (this.create_slider_menu_item ("indicator.volume(0)", 0.0, 1.0, 0.01,
+ volume_section.append_item (this.create_slider_menu_item (_("Volume"), "indicator.volume(0)", 0.0, 1.0, 0.01,
"audio-volume-low-zero-panel",
"audio-volume-high-panel"));
@@ -75,7 +75,7 @@ public class SoundMenu: Object
}
set {
if (value && !this.mic_volume_shown) {
- var slider = this.create_slider_menu_item ("indicator.mic-volume", 0.0, 1.0, 0.01,
+ var slider = this.create_slider_menu_item (_("Microphone Volume"), "indicator.mic-volume", 0.0, 1.0, 0.01,
"audio-input-microphone-low-zero-panel",
"audio-input-microphone-high-panel");
volume_section.append_item (slider);
@@ -227,11 +227,11 @@ public class SoundMenu: Object
player_section.append_submenu (_("Choose Playlist"), submenu);
}
- MenuItem create_slider_menu_item (string action, double min, double max, double step, string min_icon_name, string max_icon_name) {
+ MenuItem create_slider_menu_item (string label, string action, double min, double max, double step, string min_icon_name, string max_icon_name) {
var min_icon = new ThemedIcon.with_default_fallbacks (min_icon_name);
var max_icon = new ThemedIcon.with_default_fallbacks (max_icon_name);
- var slider = new MenuItem (null, action);
+ var slider = new MenuItem (label, action);
slider.set_attribute ("x-canonical-type", "s", "com.canonical.unity.slider");
slider.set_attribute_value ("min-icon", min_icon.serialize ());
slider.set_attribute_value ("max-icon", max_icon.serialize ());
diff --git a/src/volume-control.vala b/src/volume-control.vala
index 7f8b55b..ba87de5 100644
--- a/src/volume-control.vala
+++ b/src/volume-control.vala
@@ -166,9 +166,9 @@ public class VolumeControl : Object
}
if (_pulse_use_stream_restore == false &&
- _volume != volume_to_double (i.volume.values[0]))
+ _volume != volume_to_double (i.volume.max ()))
{
- _volume = volume_to_double (i.volume.values[0]);
+ _volume = volume_to_double (i.volume.max ());
volume_changed (_volume);
}
}
@@ -503,7 +503,8 @@ public class VolumeControl : Object
if (i == null)
return;
- unowned CVolume cvol = vol_set (i.volume, 1, double_to_volume (_volume));
+ unowned CVolume cvol = i.volume;
+ cvol.scale (double_to_volume (_volume));
c.set_sink_volume_by_index (i.index, cvol, set_volume_success_cb);
}