From afb7bcab51f43db1ce9147a6343ecfd369ba36b9 Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 29 Mar 2002 00:23:16 +0000 Subject: some s/KHz/Hz/ fixes in osssrc consistency-with-the-rest-of-gst adjustments Original commit message from CVS: * some s/KHz/Hz/ fixes in osssrc * added dxr3 plugin from rehan khwaja , with some consistency-with-the-rest-of-gst adjustments --- sys/Makefile.am | 10 ++++++++-- sys/oss/gstosssrc.c | 4 ++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'sys') diff --git a/sys/Makefile.am b/sys/Makefile.am index c915c897..8c6db9af 100644 --- a/sys/Makefile.am +++ b/sys/Makefile.am @@ -1,3 +1,9 @@ +if USE_DXR3 +DXR3_DIR=dxr3 +else +DXR3_DIR= +endif + if USE_OSS OSS_DIR=oss else @@ -34,8 +40,8 @@ else XVIDEO_DIR= endif -SUBDIRS=$(OSS_DIR) $(QCAM_DIR) $(V4L_DIR) $(VCD_DIR) \ +SUBDIRS=$(OSS_DIR) $(DXR3_DIR) $(QCAM_DIR) $(V4L_DIR) $(VCD_DIR) \ $(VGA_DIR) $(XVIDEO_DIR) -DIST_SUBDIRS=oss qcam v4l vcd vga xvideo videosink +DIST_SUBDIRS=oss dxr3 qcam v4l vcd vga xvideo videosink diff --git a/sys/oss/gstosssrc.c b/sys/oss/gstosssrc.c index b499c750..4b8da32d 100644 --- a/sys/oss/gstosssrc.c +++ b/sys/oss/gstosssrc.c @@ -384,7 +384,7 @@ gst_osssrc_sync_parms (GstOssSrc *osssrc) audio_buf_info ispace; gint frag; /* remember : ioctl on samplerate returns the sample rate the card - * is actually set to ! Setting it to 44101 KHz could cause it to + * is actually set to ! Setting it to 44101 Hz could cause it to * be set to 44101, for example */ @@ -409,7 +409,7 @@ gst_osssrc_sync_parms (GstOssSrc *osssrc) ioctl(osssrc->fd, SNDCTL_DSP_GETISPACE, &ispace); ioctl(osssrc->fd, SNDCTL_DSP_GETBLKSIZE, &frag); - g_print("setting sound card to %dKHz %d bit %s (%d bytes buffer, %d fragment)\n", + g_print("setting sound card to %dHz %d bit %s (%d bytes buffer, %d fragment)\n", osssrc->frequency, osssrc->format, (osssrc->channels == 2) ? "stereo" : "mono", ispace.bytes, frag); -- cgit