[xiph-cvs] cvs commit: speex/src speexdec.1 speexdec.c speexenc.1 speexenc.c
Jean-Marc Valin
jm at xiph.org
Fri Sep 19 22:41:25 PDT 2003
jm 03/09/20 01:41:25
Modified: . Tag: rel-1-0-branch configure.in
src Tag: rel-1-0-branch speexdec.1 speexdec.c
speexenc.1 speexenc.c
Log:
soundcard support for Solaris/*BSD, misc stuff for 1.0.2
Revision Changes Path
No revision
<p>No revision
<p>1.50.2.3 +4 -4 speex/configure.in
Index: configure.in
===================================================================
RCS file: /usr/local/cvsroot/speex/configure.in,v
retrieving revision 1.50.2.2
retrieving revision 1.50.2.3
diff -u -r1.50.2.2 -r1.50.2.3
--- configure.in 1 Aug 2003 19:28:37 -0000 1.50.2.2
+++ configure.in 20 Sep 2003 05:41:25 -0000 1.50.2.3
@@ -4,11 +4,11 @@
SPEEX_MAJOR_VERSION=1
SPEEX_MINOR_VERSION=0
-SPEEX_MICRO_VERSION=1
-SPEEX_VERSION=1.0.1
+SPEEX_MICRO_VERSION=2
+SPEEX_VERSION=1.0.2
SPEEX_LT_CURRENT=2
-SPEEX_LT_REVISION=0
+SPEEX_LT_REVISION=1
SPEEX_LT_AGE=1
AC_SUBST(SPEEX_LT_CURRENT)
@@ -26,7 +26,7 @@
AM_PROG_LIBTOOL
AC_C_BIGENDIAN
-AC_CHECK_HEADERS(sys/soundcard.h)
+AC_CHECK_HEADERS(sys/soundcard.h sys/audioio.h)
AC_ARG_ENABLE(ogg,
[ --enable-ogg=[yes/no] Turn on or off the use of ogg
<p><p>No revision
<p>No revision
<p>1.12.2.1 +2 -2 speex/src/speexdec.1
Index: speexdec.1
===================================================================
RCS file: /usr/local/cvsroot/speex/src/speexdec.1,v
retrieving revision 1.12
retrieving revision 1.12.2.1
diff -u -r1.12 -r1.12.2.1
--- speexdec.1 23 Mar 2003 22:39:05 -0000 1.12
+++ speexdec.1 20 Sep 2003 05:41:25 -0000 1.12.2.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29.
-.TH SPEEXDEC "1" "December 2002" "speexdec version 1.0" "User Commands"
+.TH SPEEXDEC "1" "September 2003" "speexdec version 1.0.2" "User Commands"
.SH NAME
-speexdec \- manual page for speexdec version 1.0
+speexdec \- manual page for speexdec version 1.0.2
.SH SYNOPSIS
.B speexdec
[\fIoptions\fR] \fIinput_file.spx \fR[\fIoutput_file\fR]
<p><p>1.74.2.4 +35 -0 speex/src/speexdec.c
Index: speexdec.c
===================================================================
RCS file: /usr/local/cvsroot/speex/src/speexdec.c,v
retrieving revision 1.74.2.3
retrieving revision 1.74.2.4
diff -u -r1.74.2.3 -r1.74.2.4
--- speexdec.c 1 Jun 2003 05:59:17 -0000 1.74.2.3
+++ speexdec.c 20 Sep 2003 05:41:25 -0000 1.74.2.4
@@ -56,6 +56,16 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <sys/ioctl.h>
+
+#elif defined HAVE_SYS_AUDIOIO_H
+#include <sys/types.h>
+#include <fcntl.h>
+#include <sys/ioctl.h>
+#include <sys/audioio.h>
+#ifndef AUDIO_ENCODING_SLINEAR
+#define AUDIO_ENCODING_SLINEAR AUDIO_ENCODING_LINEAR /* Solaris */
+#endif
+
#endif
#include <string.h>
@@ -167,6 +177,31 @@
exit(1);
}
fout = fdopen(audio_fd, "w");
+#elif defined HAVE_SYS_AUDIOIO_H
+ audio_info_t info;
+ int audio_fd;
+
+ audio_fd = open("/dev/audio", O_WRONLY);
+ if (audio_fd<0)
+ {
+ perror("Cannot open /dev/audio");
+ exit(1);
+ }
+
+ AUDIO_INITINFO(&info);
+#ifdef AUMODE_PLAY /* NetBSD/OpenBSD */
+ info.mode = AUMODE_PLAY;
+#endif
+ info.play.encoding = AUDIO_ENCODING_SLINEAR;
+ info.play.precision = 16;
+ info.play.channels = *channels;
+
+ if (ioctl(audio_fd, AUDIO_SETINFO, &info) < 0)
+ {
+ perror ("AUDIO_SETINFO");
+ exit(1);
+ }
+ fout = fdopen(audio_fd, "w");
#elif defined WIN32 || defined _WIN32
{
unsigned int speex_channels = *channels;
<p><p>1.9.2.1 +5 -5 speex/src/speexenc.1
Index: speexenc.1
===================================================================
RCS file: /usr/local/cvsroot/speex/src/speexenc.1,v
retrieving revision 1.9
retrieving revision 1.9.2.1
diff -u -r1.9 -r1.9.2.1
--- speexenc.1 22 Mar 2003 19:19:48 -0000 1.9
+++ speexenc.1 20 Sep 2003 05:41:25 -0000 1.9.2.1
@@ -1,7 +1,7 @@
.\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.29.
-.TH SPEEXENC "1" "December 2002" "speexenc version 1.0" "User Commands"
+.TH SPEEXENC "1" "September 2003" "speexenc version 1.0.2" "User Commands"
.SH NAME
-speexenc \- manual page for speexenc version 1.0
+speexenc \- manual page for speexenc version 1.0.2
.SH SYNOPSIS
.B speexenc
[\fIoptions\fR] \fIinput_file output_file\fR
@@ -60,13 +60,13 @@
.TP
\fB\-\-comment\fR
Add the given string as an extra comment. This may be
-used multiple times.
+used multiple times
.TP
\fB\-\-author\fR
-Author of this track.
+Author of this track
.TP
\fB\-\-title\fR
-Title for this track.
+Title for this track
.TP
\fB\-h\fR, \fB\-\-help\fR
This help
<p><p>1.76.2.4 +3 -3 speex/src/speexenc.c
Index: speexenc.c
===================================================================
RCS file: /usr/local/cvsroot/speex/src/speexenc.c,v
retrieving revision 1.76.2.3
retrieving revision 1.76.2.4
diff -u -r1.76.2.3 -r1.76.2.4
--- speexenc.c 4 Jun 2003 19:06:01 -0000 1.76.2.3
+++ speexenc.c 20 Sep 2003 05:41:25 -0000 1.76.2.4
@@ -176,9 +176,9 @@
printf (" --comp n Set encoding complexity (0-10), default 3\n");
printf (" --nframes n Number of frames per Ogg packet (1-10), default 1\n");
printf (" --comment Add the given string as an extra comment. This may be\n");
- printf (" used multiple times.\n");
- printf (" --author Author of this track.\n");
- printf (" --title Title for this track.\n");
+ printf (" used multiple times\n");
+ printf (" --author Author of this track\n");
+ printf (" --title Title for this track\n");
printf (" -h, --help This help\n");
printf (" -v, --version Version information\n");
printf (" -V Verbose mode (show bit-rate)\n");
<p><p>--- >8 ----
List archives: http://www.xiph.org/archives/
Ogg project homepage: http://www.xiph.org/ogg/
To unsubscribe from this list, send a message to 'cvs-request at xiph.org'
containing only the word 'unsubscribe' in the body. No subject is needed.
Unsubscribe messages sent to the list will be ignored/filtered.
More information about the commits
mailing list