diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-21 15:16:58 +0200 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-10-21 15:16:58 +0200 |
| commit | 4dbdcf30a0ed10019d3350293c4ac52040393640 (patch) | |
| tree | fa01e697dee299506a91d1d9f41c2a61f429fcc9 /src/volume-control.vala | |
| parent | 6ee23e401d3847e609f1ef50e1736f69e6253608 (diff) | |
| parent | 86c449a7125f3ff90dcac353c8a4ad5a8c2cc46e (diff) | |
| download | ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.gz ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.tar.bz2 ayatana-indicator-sound-4dbdcf30a0ed10019d3350293c4ac52040393640.zip | |
Fixed conflict. Updated changelog to be in sync with trunk
Diffstat (limited to 'src/volume-control.vala')
| -rw-r--r-- | src/volume-control.vala | 14 |
1 files changed, 14 insertions, 0 deletions
diff --git a/src/volume-control.vala b/src/volume-control.vala index 6efac35..8e615ea 100644 --- a/src/volume-control.vala +++ b/src/volume-control.vala @@ -28,6 +28,17 @@ public abstract class VolumeControl : Object VOLUME_STREAM_CHANGE } + public enum ActiveOutput { + SPEAKERS, + HEADPHONES, + BLUETOOTH_HEADPHONES, + BLUETOOTH_SPEAKER, + USB_SPEAKER, + USB_HEADPHONES, + HDMI_SPEAKER, + HDMI_HEADPHONES + } + public class Volume : Object { public double volume; public VolumeReasons reason; @@ -39,6 +50,7 @@ public abstract class VolumeControl : Object public virtual bool high_volume { get { return false; } protected set { } } public virtual bool mute { get { return false; } } public virtual bool is_playing { get { return false; } } + public virtual VolumeControl.ActiveOutput active_output { get { return VolumeControl.ActiveOutput.SPEAKERS; } } private Volume _volume; public virtual Volume volume { get { return _volume; } set { } } public virtual double mic_volume { get { return 0.0; } set { } } @@ -56,4 +68,6 @@ public abstract class VolumeControl : Object v.reason = reason; this.volume = v; } + + public signal void active_output_changed (VolumeControl.ActiveOutput active_output); } |