diff options
| author | Andy Wingo <wingo@pobox.com> | 2002-03-29 00:23:16 +0000 |
|---|---|---|
| committer | Andy Wingo <wingo@pobox.com> | 2002-03-29 00:23:16 +0000 |
| commit | afb7bcab51f43db1ce9147a6343ecfd369ba36b9 (patch) | |
| tree | 9a00578aefd44bf827c0fb4d8d31a2e96a394707 | |
| parent | 983feed7a10aa11b6f761e25412860358c6b92eb (diff) | |
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 <rehankhwaja@yahoo.com>, with some
consistency-with-the-rest-of-gst adjustments
| -rw-r--r-- | configure.ac | 7 | ||||
| -rw-r--r-- | sys/Makefile.am | 10 | ||||
| -rw-r--r-- | sys/oss/gstosssrc.c | 4 |
3 files changed, 17 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac index bea6e4ab..d8fe94ab 100644 --- a/configure.ac +++ b/configure.ac @@ -190,6 +190,12 @@ dnl ============================= sys plugins ================================ dnl ========================================================================== +dnl *** DXR3 card *** +translit(dnm, m, l) AM_CONDITIONAL(USE_DXR3, true) +GST_CHECK_FEATURE(DXR3, [DXR3 hardware mpeg video decoder], dxr3videosink, [ + AC_CHECK_HEADER(linux/em8000.h, HAVE_DXR3="yes", HAVE_DXR3="no") +]) + dnl *** OSS audio *** translit(dnm, m, l) AM_CONDITIONAL(USE_OSS, true) GST_CHECK_FEATURE(OSS, [OSS audio], osssrc osssink, [ @@ -762,6 +768,7 @@ gst/vumeter/Makefile gst/wavparse/Makefile gst/y4m/Makefile sys/Makefile +sys/dxr3/Makefile sys/oss/Makefile sys/qcam/Makefile sys/v4l/Makefile 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); |