[Xfce4-commits] r25632 - xfce4-mixer/trunk/lib
Author: dannym
Date: 2007-04-24 21:36:07 + (Tue, 24 Apr 2007)
New Revision: 25632
Modified:
xfce4-mixer/trunk/lib/vc_alsa.c
Log:
remove magic Master selection, an artifact from the past (since everywhere, the
master control can be chosen now, might as well leave the user guessing which
it is)
Modified: xfce4-mixer/trunk/lib/vc_alsa.c
===
--- xfce4-mixer/trunk/lib/vc_alsa.c 2007-04-24 10:38:25 UTC (rev 25631)
+++ xfce4-mixer/trunk/lib/vc_alsa.c 2007-04-24 21:36:07 UTC (rev 25632)
@@ -65,7 +65,6 @@
#endif
static snd_mixer_t *handle = NULL;
-static snd_mixer_elem_t *elem = NULL;
static char card[64] = default;
#define MAX_MASTERS 10
@@ -125,14 +124,12 @@
snd_mixer_selem_id_t* master_selectors[MAX_MASTERS] = { NULL };
- elem = NULL;
-
if (handle != NULL) {
snd_mixer_close(handle);
handle = NULL;
}
- if ((err = snd_mixer_open(handle, 0)) 0 || !handle) {
+ if ((err = snd_mixer_open(handle, 0)) 0 || handle == NULL) {
error(_(alsa: Mixer %s open error: %s\n), card,
snd_strerror(err));
return;
}
@@ -141,7 +138,6 @@
error(_(alsa: Mixer attach %s error: %s\n), card,
snd_strerror(err));
snd_mixer_close(handle); /* -- alsa 0.9.3a fails assert(hctl)
if I do that... wird... */
handle = NULL;
- elem = NULL; /* just to be sure */
return;
}
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) 0) {
@@ -161,38 +157,6 @@
handle = NULL;
return;
}
-
-
- for (i = 0; elem == NULL i MAX_MASTERS master_ids[i] != NULL;
i++) {
- snd_mixer_selem_id_alloca(master_selectors[i]);
- snd_mixer_selem_id_set_index(master_selectors[i], 0);
- snd_mixer_selem_id_set_name(master_selectors[i], master_ids[i]);
-
- elem = snd_mixer_find_selem(handle, master_selectors[i]);
-
- if (elem != NULL) {
- if (!snd_mixer_selem_has_common_volume(elem)
- !snd_mixer_selem_has_playback_volume(elem)
- ) { /* no playback device */
- elem = NULL;
- }
- }
-
-
-
-#ifdef TRACE
- error(_(alsa: Unable to find simple control '%s',%i\n),
- snd_mixer_selem_id_get_name(master_selectors[i]),
snd_mixer_selem_id_get_index(master_selectors[i]));
-#endif
- }
-
- if (elem == NULL) {
- show_developer_hint ();
-
- snd_mixer_close(handle);
- handle = NULL;
- return;
- }
}
static void vc_set_device(char const *name)
@@ -214,7 +178,9 @@
static int vc_reinit_device(void)
{
find_master();
- if (!elem) return -1;
+ if (handle == NULL) {
+ return -1;
+ }
return 0;
}
@@ -284,11 +250,7 @@
return 0;
}
- if (which != NULL) {
- xelem = find_control (which);
- } else {
- xelem = elem;
- }
+ xelem = (which != NULL) ? find_control (which) : NULL;
if (xelem == NULL) {
return 0;
@@ -365,11 +327,7 @@
return;
}
- if (which != NULL) {
- xelem = find_control (which);
- } else {
- xelem = elem;
- }
+ xelem = (which != NULL) ? find_control (which) : NULL;
if (xelem == NULL) {
return;
@@ -466,7 +424,7 @@
if (!g) return NULL;
#endif
- if (!handle) {
+ if (handle == NULL) {
return NULL;
}
@@ -539,7 +497,9 @@
{
/* supports 1 (ONE) callback */
- if (!handle) return;
+ if (handle == NULL) {
+ return;
+ }
mycb = cb;
mydata = data;
@@ -550,12 +510,12 @@
static void vc_close_device()
{
- if (!handle) return;
+ if (handle == NULL) {
+ return;
+ }
snd_mixer_close (handle); /* FIXME does this close all related stuff? */
handle = NULL;
-
- elem = NULL;
}
static GList *vc_get_device_list()
@@ -630,15 +590,16 @@
gint i;
gchar *s;
snd_mixer_elem_t *xelem = NULL;
- if (!handle) return;
- if (which) {
- xelem = find_control (which);
- } else {
- xelem = elem;
+
+ if (handle == NULL) {
+ return;
}
- if (!xelem) return;
+ xelem = (which != NULL) ? find_control (which) : NULL;
+ if (xelem == NULL) {
+ return;
+ }
g = vc_get_choices (xelem);
if (!g || !v)
@@ -663,14 +624,15 @@
GList *g;
gchar *s;
[Xfce4-commits] r25633 - xfce4-mixer/branches/xfce_4_4/lib
Author: dannym
Date: 2007-04-24 21:36:42 + (Tue, 24 Apr 2007)
New Revision: 25633
Modified:
xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
Log:
remove magic Master selection, an artifact from the past (since everywhere, the
master control can be chosen now)
Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c
===
--- xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2007-04-24 21:36:07 UTC (rev
25632)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_alsa.c 2007-04-24 21:36:42 UTC (rev
25633)
@@ -65,7 +65,6 @@
#endif
static snd_mixer_t *handle = NULL;
-static snd_mixer_elem_t *elem = NULL;
static char card[64] = default;
#define MAX_MASTERS 10
@@ -125,14 +124,12 @@
snd_mixer_selem_id_t* master_selectors[MAX_MASTERS] = { NULL };
- elem = NULL;
-
if (handle != NULL) {
snd_mixer_close(handle);
handle = NULL;
}
- if ((err = snd_mixer_open(handle, 0)) 0 || !handle) {
+ if ((err = snd_mixer_open(handle, 0)) 0 || handle == NULL) {
error(_(alsa: Mixer %s open error: %s\n), card,
snd_strerror(err));
return;
}
@@ -141,7 +138,6 @@
error(_(alsa: Mixer attach %s error: %s\n), card,
snd_strerror(err));
snd_mixer_close(handle); /* -- alsa 0.9.3a fails assert(hctl)
if I do that... wird... */
handle = NULL;
- elem = NULL; /* just to be sure */
return;
}
if ((err = snd_mixer_selem_register(handle, NULL, NULL)) 0) {
@@ -161,38 +157,6 @@
handle = NULL;
return;
}
-
-
- for (i = 0; elem == NULL i MAX_MASTERS master_ids[i] != NULL;
i++) {
- snd_mixer_selem_id_alloca(master_selectors[i]);
- snd_mixer_selem_id_set_index(master_selectors[i], 0);
- snd_mixer_selem_id_set_name(master_selectors[i], master_ids[i]);
-
- elem = snd_mixer_find_selem(handle, master_selectors[i]);
-
- if (elem != NULL) {
- if (!snd_mixer_selem_has_common_volume(elem)
- !snd_mixer_selem_has_playback_volume(elem)
- ) { /* no playback device */
- elem = NULL;
- }
- }
-
-
-
-#ifdef TRACE
- error(_(alsa: Unable to find simple control '%s',%i\n),
- snd_mixer_selem_id_get_name(master_selectors[i]),
snd_mixer_selem_id_get_index(master_selectors[i]));
-#endif
- }
-
- if (elem == NULL) {
- show_developer_hint ();
-
- snd_mixer_close(handle);
- handle = NULL;
- return;
- }
}
static void vc_set_device(char const *name)
@@ -214,7 +178,9 @@
static int vc_reinit_device(void)
{
find_master();
- if (!elem) return -1;
+ if (handle == NULL) {
+ return -1;
+ }
return 0;
}
@@ -284,11 +250,7 @@
return 0;
}
- if (which != NULL) {
- xelem = find_control (which);
- } else {
- xelem = elem;
- }
+ xelem = (which != NULL) ? find_control (which) : NULL;
if (xelem == NULL) {
return 0;
@@ -365,11 +327,7 @@
return;
}
- if (which != NULL) {
- xelem = find_control (which);
- } else {
- xelem = elem;
- }
+ xelem = (which != NULL) ? find_control (which) : NULL;
if (xelem == NULL) {
return;
@@ -466,7 +424,7 @@
if (!g) return NULL;
#endif
- if (!handle) {
+ if (handle == NULL) {
return NULL;
}
@@ -539,7 +497,9 @@
{
/* supports 1 (ONE) callback */
- if (!handle) return;
+ if (handle == NULL) {
+ return;
+ }
mycb = cb;
mydata = data;
@@ -550,12 +510,12 @@
static void vc_close_device()
{
- if (!handle) return;
+ if (handle == NULL) {
+ return;
+ }
snd_mixer_close (handle); /* FIXME does this close all related stuff? */
handle = NULL;
-
- elem = NULL;
}
static GList *vc_get_device_list()
@@ -630,15 +590,16 @@
gint i;
gchar *s;
snd_mixer_elem_t *xelem = NULL;
- if (!handle) return;
- if (which) {
- xelem = find_control (which);
- } else {
- xelem = elem;
+
+ if (handle == NULL) {
+ return;
}
- if (!xelem) return;
+ xelem = (which != NULL) ? find_control (which) : NULL;
+ if (xelem == NULL) {
+ return;
+ }
g = vc_get_choices (xelem);
if (!g || !v)
@@ -663,14 +624,15 @@
GList *g;
gchar *s;
[Xfce4-commits] r25634 - xfce4-mixer/trunk/lib
Author: dannym
Date: 2007-04-24 21:51:59 + (Tue, 24 Apr 2007)
New Revision: 25634
Modified:
xfce4-mixer/trunk/lib/vc_oss.c
Log:
remove magic Master selection, an artifact from the past (since everywhere, the
master control can be chosen now)
Modified: xfce4-mixer/trunk/lib/vc_oss.c
===
--- xfce4-mixer/trunk/lib/vc_oss.c 2007-04-24 21:36:42 UTC (rev 25633)
+++ xfce4-mixer/trunk/lib/vc_oss.c 2007-04-24 21:51:59 UTC (rev 25634)
@@ -83,7 +83,6 @@
static int mixer_handle = -1;
static int devmask = 0;/* Bitmask for supported mixer devices
*/
static int avail_recmask = 0; /* available recording devices */
-static int master_i = -1;
static int has_recselector = 0;
static char *label[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
@@ -103,7 +102,6 @@
g_return_if_fail(mixer_handle != -1);
devmask = 0;
- master_i = -1;
avail_recmask = 0;
has_recselector = 0;
@@ -126,13 +124,7 @@
for (i = 0; i SOUND_MIXER_NRDEVICES; i++) {
if (devmask (1 i)) {
- /* if in doubt, choose the first */
- if (master_i == -1)
- master_i = i;
-
- if ((!strcasecmp(label[i], Master))
-|| (!strncasecmp(label[i], Vol, 3)))
- master_i = i;
+ /* label[i] */
}
}
}
@@ -154,11 +146,6 @@
{
find_master();
- if (master_i == -1) {
- g_warning(_(oss: No master volume));
- return -1;
- }
-
return 0;
}
@@ -208,11 +195,7 @@
g_return_if_fail(mixer_handle != -1);
- if (!which) {
- i = master_i;
- } else {
- i = find_control (which);
- }
+ i = (which != NULL) ? find_control (which) : (-1);
g_return_if_fail(i != -1);
vol = (percent * MAX_AMP) / 100;
@@ -236,11 +219,7 @@
g_return_val_if_fail(mixer_handle != -1, 0);
- if (!which) {
- i = master_i;
- } else {
- i = find_control (which);
- }
+ i = (which != NULL) ? find_control (which) : (-1);
g_return_val_if_fail(i != -1, 0);
@@ -335,7 +314,6 @@
static void vc_close_device()
{
- master_i = -1;
if (mixer_handle != -1) {
close (mixer_handle);
mixer_handle = -1;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25636 - squeeze/branches/squeeze_0_2
Author: stephan Date: 2007-04-24 21:53:24 + (Tue, 24 Apr 2007) New Revision: 25636 Modified: squeeze/branches/squeeze_0_2/configure.in.in Log: version bump Modified: squeeze/branches/squeeze_0_2/configure.in.in === --- squeeze/branches/squeeze_0_2/configure.in.in2007-04-24 21:53:01 UTC (rev 25635) +++ squeeze/branches/squeeze_0_2/configure.in.in2007-04-24 21:53:24 UTC (rev 25636) @@ -16,7 +16,7 @@ m4_define([squeeze_version_micro], [1]) m4_define([squeeze_version_nano], []) # Leave empty for no nano version m4_define([squeeze_version_build], [EMAIL PROTECTED]@]) -m4_define([squeeze_version_tag], [svn]) # Leave empty for releases +m4_define([squeeze_version_tag], []) # Leave empty for releases m4_define([squeeze_version], [ifelse(squeeze_version_branch(), [], [squeeze_version_major().squeeze_version_minor().squeeze_version_micro()ifelse(squeeze_version_nano(), [], [], [.squeeze_version_nano()])], [squeeze_version_branch()])ifelse(squeeze_version_tag(),[],[], [-ifelse(squeeze_version_tag(), [svn], [squeeze_version_tag()-squeeze_version_build()], [squeeze_version_tag()])])]) dnl *** ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25637 - xfce4-mixer/branches/xfce_4_4/lib
Author: dannym
Date: 2007-04-24 21:54:38 + (Tue, 24 Apr 2007)
New Revision: 25637
Modified:
xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c
Log:
remove magic Master selection, an artifact from the past (since everywhere, the
master control can be chosen now)
Modified: xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c
===
--- xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c 2007-04-24 21:53:24 UTC (rev
25636)
+++ xfce4-mixer/branches/xfce_4_4/lib/vc_oss.c 2007-04-24 21:54:38 UTC (rev
25637)
@@ -83,7 +83,6 @@
static int mixer_handle = -1;
static int devmask = 0;/* Bitmask for supported mixer devices
*/
static int avail_recmask = 0; /* available recording devices */
-static int master_i = -1;
static int has_recselector = 0;
static char *label[SOUND_MIXER_NRDEVICES] = SOUND_DEVICE_LABELS;
@@ -103,7 +102,6 @@
g_return_if_fail(mixer_handle != -1);
devmask = 0;
- master_i = -1;
avail_recmask = 0;
has_recselector = 0;
@@ -126,13 +124,7 @@
for (i = 0; i SOUND_MIXER_NRDEVICES; i++) {
if (devmask (1 i)) {
- /* if in doubt, choose the first */
- if (master_i == -1)
- master_i = i;
-
- if ((!strcasecmp(label[i], Master))
-|| (!strncasecmp(label[i], Vol, 3)))
- master_i = i;
+ /* label[i] */
}
}
}
@@ -154,11 +146,6 @@
{
find_master();
- if (master_i == -1) {
- g_warning(_(oss: No master volume));
- return -1;
- }
-
return 0;
}
@@ -208,11 +195,7 @@
g_return_if_fail(mixer_handle != -1);
- if (!which) {
- i = master_i;
- } else {
- i = find_control (which);
- }
+ i = (which != NULL) ? find_control (which) : (-1);
g_return_if_fail(i != -1);
vol = (percent * MAX_AMP) / 100;
@@ -236,11 +219,7 @@
g_return_val_if_fail(mixer_handle != -1, 0);
- if (!which) {
- i = master_i;
- } else {
- i = find_control (which);
- }
+ i = (which != NULL) ? find_control (which) : (-1);
g_return_val_if_fail(i != -1, 0);
@@ -335,7 +314,6 @@
static void vc_close_device()
{
- master_i = -1;
if (mixer_handle != -1) {
close (mixer_handle);
mixer_handle = -1;
___
Xfce4-commits mailing list
Xfce4-commits@xfce.org
http://foo-projects.org/mailman/listinfo/xfce4-commits
[Xfce4-commits] r25638 - squeeze/tags
Author: stephan Date: 2007-04-24 22:00:05 + (Tue, 24 Apr 2007) New Revision: 25638 Added: squeeze/tags/squeeze-0.2.1/ Log: Tag 0.2.1 release Copied: squeeze/tags/squeeze-0.2.1 (from rev 25637, squeeze/branches/squeeze_0_2) ___ Xfce4-commits mailing list Xfce4-commits@xfce.org http://foo-projects.org/mailman/listinfo/xfce4-commits
