[Xfce4-commits] [apps/xfce4-volumed-pulse] 30/62: Port XvdInstance to libpulse

[noreply at xfce.org]

This is an automated email from the git hooks/post-receive script.

ochosi pushed a commit to branch master
in repository apps/xfce4-volumed-pulse.

commit d95b2839f4014467e3f5654ea3a158f0ce67d634
Author: Lionel Le Folgoc <lionel at lefolgoc.net>
Date:   Thu May 24 20:19:52 2012 +0200

    Port XvdInstance to libpulse
---
 src/xvd_data_types.h | 33 +++++++++++----------------------
 1 file changed, 11 insertions(+), 22 deletions(-)

diff --git a/src/xvd_data_types.h b/src/xvd_data_types.h
index 16e5e1b..6c2c35e 100644
--- a/src/xvd_data_types.h
+++ b/src/xvd_data_types.h
@@ -25,9 +25,6 @@
 #endif
 
 #define XFCONF_MIXER_CHANNEL_NAME "xfce4-mixer"
-#define XFCONF_MIXER_ACTIVECARD "/active-card"
-#define XFCONF_MIXER_ACTIVECARD_LEGACY "/sound-card"
-#define XFCONF_MIXER_ACTIVETRACK "/active-track"
 #define XFCONF_MIXER_VOL_STEP "/volume-step-size"
 #define VOL_STEP_DEFAULT_VAL 5
 
@@ -38,7 +35,9 @@
 
 #include <xfconf/xfconf.h>
 
-#include <gst/audio/mixerutils.h>
+#include <pulse/glib-mainloop.h>
+#include <pulse/context.h>
+#include <pulse/volume.h>
 
 #include <keybinder.h>
 #ifdef HAVE_LIBNOTIFY
@@ -46,36 +45,26 @@
 #endif
 
 typedef struct {
-	/* Sound card being used and list of cards */
-	GList     			*mixers;
-	GstElement      	*card;
-	gchar				*card_name;
-	gint				nameless_cards_count;
+	/* PA data */
+	pa_glib_mainloop *pa_main_loop;
+	pa_context       *pulse_context;
+	guint32           sink_index;
+	pa_cvolume        volume;
+	int               mute;
 	
-	/* Tracks for the card */
-	GstMixerTrack   	*track;
-	gchar           	*track_label;
-
 	/* Xfconf vars */
 	GError     			*error;
 	XfconfChannel		*chan;
-	gchar				*xfconf_card_name;
-	gchar           	*xfconf_track_label;
-	gchar				*previously_set_track_label;
-
-	/* Gstreamer bus vars */
-	GstBus				*bus;
-	guint				bus_id;
 
 	/* Volume vars */
-	guint				current_vol;
 	guint				vol_step;
-	gboolean        	muted;
   
   #ifdef HAVE_LIBNOTIFY
     /* Libnotify vars */
 	gboolean			gauge_notifications;
 	NotifyNotification* notification;
+	guint                           current_vol;
+	guint                           new_vol;
 	#endif
 
 	/* Other Xvd vars */

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.