mirrors/alsa-lib
1
0
Fork 0
mirror of https://github.com/alsa-project/alsa-lib.git synced 2025-10-29 05:40:25 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Big renaming - from sound to asound...

Browse source
This commit is contained in:
Jaroslav Kysela 1998-08-30 21:08:44 +00:00
parent 254d52fc84
commit 2ae16fb30d
20 changed files with 59 additions and 57 deletions
Download patch file Download diff file Expand all files Collapse all files

2
CHANGELOG
View file

@ -1,5 +1,7 @@
0.0.9 -> 0.1.0
* renamed soundlib.h to asoundlib.h
* renamed libraries from libsound to libasound
* big API changes
- added switches interfaces
* added RawMIDI API

18
Makefile
View file

@ -13,26 +13,26 @@ dummy:
endif
all: include/soundlib.h
all: include/asoundlib.h
$(MAKE) -C src
$(MAKE) -C doc
@echo
@echo "ALSA library were sucessfully compiled."
@echo
include/soundlib.h: include/header.h include/version.h include/error.h include/footer.h \
include/asoundlib.h: include/header.h include/version.h include/error.h include/footer.h \
include/control.h include/mixer.h include/pcm.h include/rawmidi.h
cat include/header.h include/version.h include/error.h \
include/control.h include/mixer.h \
include/pcm.h include/rawmidi.h \
include/footer.h > include/soundlib.h
include/footer.h > include/asoundlib.h
install: all
$(INSTALL) -m 644 -o root -g root include/soundlib.h ${includedir}/sys
$(INSTALL) -m 644 -o root -g root lib/libsound.a ${libdir}
$(LN_S) -f libsound.so.${SND_LIB_VERSION} ${libdir}/libsound.so
$(LN_S) -f libsound.so.${SND_LIB_VERSION} ${libdir}/libsound.so.${SND_LIB_MAJOR}
$(INSTALL) -m 644 -o root -g root lib/libsound.so.${SND_LIB_VERSION} ${libdir}
$(INSTALL) -m 644 -o root -g root include/asoundlib.h ${includedir}/sys
$(INSTALL) -m 644 -o root -g root lib/libasound.a ${libdir}
$(LN_S) -f libasound.so.${SND_LIB_VERSION} ${libdir}/libasound.so
$(LN_S) -f libasound.so.${SND_LIB_VERSION} ${libdir}/libasound.so.${SND_LIB_MAJOR}
$(INSTALL) -m 644 -o root -g root lib/libasound.so.${SND_LIB_VERSION} ${libdir}
/sbin/ldconfig
clean:
@ -46,7 +46,7 @@ clean:
cvsclean: clean
rm -f configure config.cache config.log config.status Makefile.conf \
utils/alsa-lib.spec include/config.h include/soundlib.h include/version.h
utils/alsa-lib.spec include/config.h include/asoundlib.h include/version.h
pack: cvsclean
chown -R root.root ../alsa-lib

4
configure.in
View file

@ -12,7 +12,7 @@ AC_PROG_LN_S
dnl Checks for header files.
AC_HEADER_STDC
AC_CONFIG_HEADER(include/config.h)
AC_CHECK_HEADERS(linux/sound.h)
AC_CHECK_HEADERS(linux/asound.h)
dnl Checks for typedefs, structures, and compiler characteristics.
AC_C_CONST
@ -32,7 +32,7 @@ CFLAGS="-I$myprefix/include"
#echo "CFLAGS=$CFLAGS"
AC_MSG_CHECKING(for alsa-driver package)
AC_TRY_RUN([
#include <linux/sound.h>
#include <linux/asound.h>
void main(void)
{
#if !defined( SND_PROTOCOL_VERSION ) || !defined( SND_PROTOCOL_UNCOMPATIBLE )

6
doc/soundapi-1.html
View file

@ -20,9 +20,9 @@ may be placed in the library code instead of the kernel driver.</P>
<P>For a complete list of all variables and functions in the API you should look
at the following header files:
<OL>
<LI>/usr/include/sys/soundlib.h</LI>
<LI>/usr/include/linux/sound.h</LI>
<LI>/usr/include/linux/sounddetect.h</LI>
<LI>/usr/include/sys/asoundlib.h</LI>
<LI>/usr/include/linux/asound.h</LI>
<LI>/usr/include/linux/asoundid.h</LI>
</OL>
</P>

4
doc/soundapi-3.html
View file

@ -134,11 +134,11 @@ int card = 0, err;
void *handle;
stuct snd_ctl_hw_info info;
if ( (err = snd_ctl_open( &amp;handle, card )) &lt; 0 ) {
if ( (err = snd_ctl_open( &handle, card )) &lt; 0 ) {
fprintf( stderr, &quot;open failed: %s\n&quot;, snd_strerror( err ) );
return;
}
if ( (err = snd_ctl_hw_info( handle, &amp;info )) &lt; 0 ) {
if ( (err = snd_ctl_hw_info( handle, &info )) &lt; 0 ) {
fprintf( stderr, &quot;hw info failed: %s\n&quot;, snd_strerror( err ) );
snd_ctl_close( handle );
return;

8
doc/soundapi-4.html
View file

@ -228,11 +228,11 @@ void *handle;
snd_mixer_info_t info;
snd_mixer_channel_t channel;
if ( (err = snd_mixer_open( &amp;handle, card, device )) &lt; 0 ) {
if ( (err = snd_mixer_open( &handle, card, device )) &lt; 0 ) {
fprintf( stderr, &quot;open failed: %s\n&quot;, snd_strerror( err ) );
return;
}
if ( (err = snd_mixer_info( handle, &amp;info )) &lt; 0 ) {
if ( (err = snd_mixer_info( handle, &info )) &lt; 0 ) {
fprintf( stderr, &quot;info failed: %s\n&quot;, snd_strerror( err ) );
snd_mixer_close( handle );
return;
@ -241,13 +241,13 @@ printf( &quot;Installed MIXER channels for card #i and device %i: %i\n&quot;,
card + 1, device, info.channels );
master = snd_mixer_channel( handle, SND_MIXER_ID_MASTER );
if ( master &gt;= 0 ) {
if ( (err = snd_mixer_read( handle, master, &amp;channel )) &lt; 0 ) {
if ( (err = snd_mixer_read( handle, master, &channel )) &lt; 0 ) {
fprintf( stderr, &quot;master read failed: %s\n&quot;, snd_strerror( err ) );
snd_mixer_close( handle );
return;
}
channel -&gt; left = channel -&gt; right = 50;
if ( (err = snd_mixer_write( handle, master, &amp;channel )) &lt; 0 ) {
if ( (err = snd_mixer_write( handle, master, &channel )) &lt; 0 ) {
fprintf( stderr, &quot;master write failed: %s\n&quot;, snd_strerror( err ) );
snd_mixer_close( handle );
return;

14
doc/soundapi-5.html
View file

@ -394,7 +394,7 @@ should not be equal to <I>count</I>.</P>
of <I>snd_pcm_playback_status</I>.</P>
<DT><B>time</B><DD><P>Delay till played of the first sample from next write. This value should
be used for time synchronization. Returned value is in the same format as
returned from the standard C function <I>gettimeofday( &amp;time, NULL )</I>.
returned from the standard C function <I>gettimeofday( &time, NULL )</I>.
This variable contains right value only if playback time mode is enabled
(look to <I>snd_pcm_playback_time</I> function).</P>
<DT><B>stime</B><DD><P>Time when playback was started.
@ -434,7 +434,7 @@ should not be equal to <I>count</I>.</P>
to <I>snd_pcm_record_status</I>.</P>
<DT><B>time</B><DD><P>Lag since the next sample read was recorded. This value should be used for time
synchronization. Returned value is in the same format as returned by the
from standard C function <I>gettimeofday( &amp;time, NULL )</I>. This
from standard C function <I>gettimeofday( &time, NULL )</I>. This
variable contains right value only if record time mode is enabled (look to
<I>snd_pcm_record_time</I> function).</P>
<DT><B>stime</B><DD><P>Time when record was started. This variable contains right value only if
@ -503,19 +503,19 @@ char *buffer;
buffer = (char *)malloc( 512 * 1024 );
if ( !buffer ) return;
if ( (err = snd_pcm_open( &amp;handle, card, device, SND_PCM_OPEN_PLAYBACK )) &lt; 0 ) {
if ( (err = snd_pcm_open( &handle, card, device, SND_PCM_OPEN_PLAYBACK )) &lt; 0 ) {
fprintf( stderr, &quot;open failed: %s\n&quot;, snd_strerror( err ) );
return;
}
format.format = SND_PCM_SFMT_MU_LAW;
format.rate = 8000;
format.voices = 1;
if ( (err = snd_pcm_playback_format( handle, &amp;format )) &lt; 0 ) {
format.channels = 1;
if ( (err = snd_pcm_playback_format( handle, &format )) &lt; 0 ) {
fprintf( stderr, &quot;format setup failed: %s\n&quot;, snd_strerror( err ) );
snd_pcm_close( handle );
return;
}
fd = open( &quot;/tmp/test.au&quot; );
fd = open( &quot;/tmp/test.au&quot;, O_RDONLY );
if ( fd &lt; 0 ) {
perror( &quot;open file&quot; );
snd_pcm_close( handle );
@ -534,7 +534,7 @@ if ( !memcmp( buffer, &quot;.snd&quot;, 4 ) ) {
if ( idx &gt; 128 ) idx = 128;
if ( idx &gt; count ) idx = count;
}
size = snd_pcm_write( handle, &amp;buffer[ idx ], count - idx );
size = snd_pcm_write( handle, &buffer[ idx ], count - idx );
printf( &quot;Bytes written %i from %i...\n&quot;, size, count - idx );
snd_pcm_close( handle );
free( buffer );

10
doc/soundapi.sgml
View file

@ -35,9 +35,9 @@ may be placed in the library code instead of the kernel driver.
For a complete list of all variables and functions in the API you should look
at the following header files:
<enum>
<item>/usr/include/sys/soundlib.h
<item>/usr/include/linux/sound.h
<item>/usr/include/linux/sounddetect.h
<item>/usr/include/sys/asoundlib.h
<item>/usr/include/linux/asound.h
<item>/usr/include/linux/asoundid.h
</enum>
<sect>Error Codes
@ -922,13 +922,13 @@ if ( (err = snd_pcm_open( &ero;handle, card, device, SND_PCM_OPEN_PLAYBACK )) <
}
format.format = SND_PCM_SFMT_MU_LAW;
format.rate = 8000;
format.voices = 1;
format.channels = 1;
if ( (err = snd_pcm_playback_format( handle, &ero;format )) < 0 ) {
fprintf( stderr, "format setup failed: %s\n", snd_strerror( err ) );
snd_pcm_close( handle );
return;
}
fd = open( "/tmp/test.au" );
fd = open( "/tmp/test.au", O_RDONLY );
if ( fd < 0 ) {
perror( "open file" );
snd_pcm_close( handle );

10
doc/soundapi.txt
View file

@ -163,11 +163,11 @@
For a complete list of all variables and functions in the API you
should look at the following header files:
1. /usr/include/sys/soundlib.h
1. /usr/include/sys/asoundlib.h
2. /usr/include/linux/sound.h
2. /usr/include/linux/asound.h
3. /usr/include/linux/sounddetect.h
3. /usr/include/linux/asoundid.h
22.. EErrrroorr CCooddeess
@ -1197,13 +1197,13 @@
}
format.format = SND_PCM_SFMT_MU_LAW;
format.rate = 8000;
format.voices = 1;
format.channels = 1;
if ( (err = snd_pcm_playback_format( handle, &format )) < 0 ) {
fprintf( stderr, "format setup failed: %s\n", snd_strerror( err ) );
snd_pcm_close( handle );
return;
}
fd = open( "/tmp/test.au" );
fd = open( "/tmp/test.au", O_RDONLY );
if ( fd < 0 ) {
perror( "open file" );
snd_pcm_close( handle );

2
include/header.h
View file

@ -22,7 +22,7 @@
#ifndef __SOUNDLIB_H
#define __SOUNDLIB_H
#include <linux/sound.h>
#include <linux/asound.h>
#include <unistd.h>
#include <fcntl.h>

20
src/Makefile
View file

@ -5,10 +5,10 @@
include ../Makefile.conf
TARGET=../lib/libsound.a
STARGET=../lib/libsound.so
STARGETX=../lib/libsound.so.$(SND_LIB_VERSION)
STARGETO=../lib/libsound.so.$(SND_LIB_MAJOR)
TARGET=../lib/libasound.a
STARGET=../lib/libasound.so
STARGETX=../lib/libasound.so.$(SND_LIB_VERSION)
STARGETO=../lib/libasound.so.$(SND_LIB_MAJOR)
TARGETS=$(TARGET) $(STARGET)
STATIC_LIBS= control/libcontrol.a \
@ -34,14 +34,14 @@ SOBJECTS=error.So
all: $(TARGETS)
$(TARGET): .depend $(OBJECTS) $(STATIC_LIBS)
rm -f ../lib/libsound.a
rm -f ../lib/libasound.a
$(LINKER) -r -o $(TARGET) $(STATIC_LIBS) $(OBJECTS)
$(STARGET): .depend $(SOBJECTS) $(DYNAMIC_LIBS)
rm -f ../lib/libsound*.so*
$(CC) -shared -Wl,-soname,libsound.so.$(SND_LIB_MAJOR) $(DYNAMIC_LIBS) $(SOBJECTS) -o $(STARGETX)
ln -s libsound.so.$(SND_LIB_VERSION) $(STARGET)
ln -s libsound.so.$(SND_LIB_VERSION) $(STARGETO)
rm -f ../lib/libasound*.so*
$(CC) -shared -Wl,-soname,libasound.so.$(SND_LIB_MAJOR) $(DYNAMIC_LIBS) $(SOBJECTS) -o $(STARGETX)
ln -s libasound.so.$(SND_LIB_VERSION) $(STARGET)
ln -s libasound.so.$(SND_LIB_VERSION) $(STARGETO)
control/libcontrol.a:
$(MAKE) -C control
@ -69,7 +69,7 @@ clean:
$(MAKE) -C mixer clean
$(MAKE) -C rawmidi clean
rm -f core .depend *.o *.So *.orig *~
rm -f ../lib/libsound.*
rm -f ../lib/libasound.*
.depend:
$(CPP) $(COPTS) $(INCLUDE) -M *.c > .depend

2
src/control/cards.c
View file

@ -26,7 +26,7 @@
#include <ctype.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include "soundlib.h"
#include "asoundlib.h"
#define SND_FILE_CONTROL "/dev/sndcontrol%i"

2
src/control/control.c
View file

@ -26,7 +26,7 @@
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include "soundlib.h"
#include "asoundlib.h"
#define SND_FILE_CONTROL "/dev/snd/control%i"
#define SND_CTL_VERSION_MAX SND_PROTOCOL_VERSION( 1, 0, 0 )

2
src/error.c
View file

@ -24,7 +24,7 @@
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
#include "soundlib.h"
#include "asoundlib.h"
static const char *snd_error_codes[] = {
"Sound protocol isn't compatible"

2
src/mixer/mixer.c
View file

@ -26,7 +26,7 @@
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include "soundlib.h"
#include "asoundlib.h"
#define SND_FILE_MIXER "/dev/snd/mixer%i%i"
#define SND_MIXER_VERSION_MAX SND_PROTOCOL_VERSION( 1, 0, 1 )

2
src/pcm/pcm.c
View file

@ -26,7 +26,7 @@
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include "soundlib.h"
#include "asoundlib.h"
#define SND_FILE_PCM "/dev/snd/pcm%i%i"
#define SND_PCM_VERSION_MAX SND_PROTOCOL_VERSION( 1, 0, 0 )

2
src/rawmidi/rawmidi.c
View file

@ -26,7 +26,7 @@
#include <errno.h>
#include <fcntl.h>
#include <sys/ioctl.h>
#include "soundlib.h"
#include "asoundlib.h"
#define SND_FILE_RAWMIDI "/dev/snd/midi%i%i"
#define SND_PCM_VERSION_MAX SND_PROTOCOL_VERSION( 1, 0, 0 )

2
test/control.c
View file

@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
#include "../include/soundlib.h"
#include "../include/asoundlib.h"
void main( void )
{

2
test/mixer.c
View file

@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
#include "../include/soundlib.h"
#include "../include/asoundlib.h"
static void mixer_test( int card, int device )
{

2
test/switches.c
View file

@ -1,6 +1,6 @@
#include <stdio.h>
#include <string.h>
#include "../include/soundlib.h"
#include "../include/asoundlib.h"
const char *get_type( unsigned int type )
{