aboutsummaryrefslogtreecommitdiff
path: root/src/volume-control.vala
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 /src/volume-control.vala
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
Diffstat (limited to 'src/volume-control.vala')
-rw-r--r--src/volume-control.vala7
1 files changed, 4 insertions, 3 deletions
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);
}