summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog6
-rw-r--r--sys/oss/gstosselement.c4
2 files changed, 9 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 9ac77165..854a6854 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,11 @@
2004-03-30 Benjamin Otte <in7y118@public.uni-hamburg.de>
+ * sys/oss/gstosselement.c: (gst_osselement_probe_caps),
+ (gst_osselement_rate_check_rate):
+ probe caps correctly for sound cards that only support one format
+
+2004-03-30 Benjamin Otte <in7y118@public.uni-hamburg.de>
+
* ext/kio/kiosrc.cpp: (process_events):
update handling event processing if inside KDE - untested
diff --git a/sys/oss/gstosselement.c b/sys/oss/gstosselement.c
index 78215d57..03539825 100644
--- a/sys/oss/gstosselement.c
+++ b/sys/oss/gstosselement.c
@@ -1038,7 +1038,7 @@ gst_osselement_probe_caps (GstOssElement * oss)
caps = gst_caps_new_empty ();
/* assume that the most significant bit of format_mask is 0 */
- for (format_bit = 1; format_bit < format_mask; format_bit <<= 1) {
+ for (format_bit = 1; format_bit <= format_mask; format_bit <<= 1) {
if (format_bit & format_mask) {
GValue rate_value = { 0 };
@@ -1257,6 +1257,8 @@ gst_osselement_rate_check_rate (GstOssProbe * probe, int irate)
format = probe->format;
n_channels = probe->n_channels;
+ GST_LOG ("checking format %d, channels %d, rate %d",
+ format, n_channels, rate);
ret = ioctl (probe->fd, SNDCTL_DSP_SETFMT, &format);
if (ret < 0)
return -1;