Merge lp:~tintou/wingpanel-indicator-sound/no-custom-binding into lp:~wingpanel-devs/wingpanel-indicator-sound/trunk

[Corentin Noël]

Unmerged revisions

138. By Corentin Noël on 2016-12-22

Use the vapi directly

=== modified file 'src/Services/Volume-control.vala'
--- src/Services/Volume-control.vala	2016-09-09 21:03:14 +0000
+++ src/Services/Volume-control.vala	2016-12-22 19:13:11 +0000
@@ -21,7 +21,7 @@
  *      Ted Gould <[e-mail]>
  */
 
- public abstract class Sound.Services.VolumeControl : Object {
+public abstract class Sound.Services.VolumeControl : Object {
     public enum VolumeReasons {
         PULSE_CHANGE,
         ACCOUNTS_SERVICE_SET,
@@ -49,10 +49,7 @@
     public bool headphone_plugged { get; protected set; default = false; }
 
     public abstract void set_mute (bool mute);
- }
-
-[CCode(cname="pa_cvolume_set", cheader_filename = "pulse/volume.h")]
-extern unowned PulseAudio.CVolume? vol_set (PulseAudio.CVolume? cv, uint channels, PulseAudio.Volume v);
+}
 
 public class Sound.Services.VolumeControlPulse : VolumeControl {
     /* this is static to ensure it being freed after @context (loop does not have ref counting) */
@@ -643,7 +640,7 @@
     void set_mic_volume_get_server_info_cb (PulseAudio.Context c, PulseAudio.ServerInfo? i) {
         if (i != null) {
             unowned PulseAudio.CVolume cvol = PulseAudio.CVolume ();
-            cvol = vol_set (cvol, 1, double_to_volume (_mic_volume));
+            cvol = cvol.set (1, double_to_volume (_mic_volume));
             c.set_source_volume_by_name (i.default_source_name, cvol, set_mic_volume_success_cb);
         }
     }
@@ -833,4 +830,4 @@
         }
         return false; // G_SOURCE_REMOVE
     }
-}
 \ No newline at end of file
+}