[Xfce4-commits] r29166 - in xfce4-mixer/branches/xfce_4_4: . include lib

[Danny Milosavljevic]

Author: dannym
Date: 2009-01-11 16:59:20 +0000 (Sun, 11 Jan 2009)
New Revision: 29166

Modified:
   xfce4-mixer/branches/xfce_4_4/ChangeLog
   xfce4-mixer/branches/xfce_4_4/include/vc.h
   xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
Log:
fix 'vc_alsa' API usage.

Modified: xfce4-mixer/branches/xfce_4_4/ChangeLog
===================================================================
--- xfce4-mixer/branches/xfce_4_4/ChangeLog	2009-01-11 16:55:19 UTC (rev 29165)
+++ xfce4-mixer/branches/xfce_4_4/ChangeLog	2009-01-11 16:59:20 UTC (rev 29166)
@@ -1,3 +1,11 @@
+2009-01-11 18:00  dannym
+
+	* support IRIX64.
+
+2009-01-11 17:30  dannym
+
+	* fix "libxfce4mixer" library.
+
 2009-01-11 17:02  dannym
 
 	* apply patch to honor left/right balance.

Modified: xfce4-mixer/branches/xfce_4_4/include/vc.h
===================================================================
--- xfce4-mixer/branches/xfce_4_4/include/vc.h	2009-01-11 16:55:19 UTC (rev 29165)
+++ xfce4-mixer/branches/xfce_4_4/include/vc.h	2009-01-11 16:59:20 UTC (rev 29166)
@@ -82,6 +82,7 @@
 volchanger_t **first_vc();
 volchanger_t **next_vc(volchanger_t **);
 
+void vc_free_choices(GList* choices);
 #ifndef VC_PLUGIN
 /* these operate on the selected_vc: */
 int vc_get_volume(char const *which);
@@ -96,7 +97,6 @@
 GList *vc_get_control_list();
 
 void vc_free_control_list(GList *g);
-void vc_free_choices(GList* choices);
 volchoice_t* vc_choice_dup(const volchoice_t *choice);
 
 void vc_set_volume_callback (volchanger_callback_t cb, void *data);

Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
===================================================================
--- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c	2009-01-11 16:55:19 UTC (rev 29165)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c	2009-01-11 16:59:20 UTC (rev 29166)
@@ -643,6 +643,7 @@
 	unsigned int jj;
 	GList *g;
 	volchoice_t* item;
+	char* s;
 
 	snd_mixer_elem_t *xelem = NULL;
 	if (handle == NULL) {