Changeset 578

Timestamp:

Feb 26, 2014, 7:41:15 PM (11 years ago)

Author:

David Azarewicz

Message:

API updates

Location:

contrib/API

Files:

• Makefile (added)
• include (added)
• include/uniaud.h (added)
• include/unidef.h (added)
• lib/Makefile (modified) (3 diffs)
• lib/internal.h (modified) (1 diff)
• lib/pcmmulti.c (modified) (1 diff)
• lib/uniaud.h (deleted)
• lib/unidef.h (deleted)
• tools (added)
• tools/Makefile (added)
• tools/asound1.h (added)
• tools/closepcm.c (added)
• tools/debug.wav (added)
• tools/mixing.asm (added)
• tools/pcmconv.c (added)
• tools/pcmread.c (added)
• tools/pcmunlock.c (added)
• tools/rwtest.c (added)
• tools/testpcm.c (added)
• tools/testspdf.c (added)
• tools/tstmulti.c (added)
• tools/unierrno.h (added)
• tools/unimix.c (added)
• tools/unimix.h (added)
• tools/unimix.txt (added)

contrib/API/lib/Makefile

@@ -2 +2 @@
 #    OpenWatcom
 #
+# Copyright (C) 2010 David Azarewicz <david@88watts.net>
 # 07-Sep-2010 David Azarewicz Makefile changed to use Watcom tools
 
-WATCOM=E:\Watcom
+!ifndef %WATCOM
+!error WATCOM must be defined in the environment.
+!endif
+
+WATCOM=$(%WATCOM)
+%PATH=$(WATCOM)\BINP;$(WATCOM)\BINW;$(%PATH)
+%INCLUDE=.;..\include;$(WATCOM)\H;$(WATCOM)\H\OS2;
 
 .ERASE
@@ -44 +51 @@
 OBJ=unilib.obj unictl.obj unipcm.obj uniaud.obj pcmmulti.obj cputest.obj fast_memcpy.obj fastmemcpy.obj resample.obj resample2.obj
 
-.before:
-        @set WATCOM=$(WATCOM)
-        @set PATH=$(WATCOM)\BINP;$(WATCOM)\BINW;$(%PATH)
-        @set EDPATH=$(WATCOM)\EDDAT
-        @set INCLUDE=.;$(WATCOM)\H;$(WATCOM)\H\OS2;
-
 .c.obj: .AUTODEPEND
-        $(CC) $(CFLAGS) $*.c
+    $(CC) $(CFLAGS) $*.c
 
 .asm.obj: .AUTODEPEND
-        $(ASM) $(AFLAGS) $*.asm
+    $(ASM) $(AFLAGS) $*.asm
 
 
@@ -60 +61 @@
 
 uniaud.dll: $(OBJ) uniaud.def
-        @%create $^*.lrf
-        @%append $^*.lrf system os2v2_dll initinstance terminstance
-        @%append $^*.lrf option quiet
-        @%append $^*.lrf option manyautodata
-        @%append $^*.lrf option map
-        @%append $^*.lrf name $^.
-        @for %i in ($(OBJ)) do @%append $^*.lrf file %i
-        @%append $^*.lrf export=uniaud.def
-        $(LINK) @$^*.lrf
-        @%erase $^*.lrf
+    @%create $^*.lrf
+    @%append $^*.lrf system os2v2_dll initinstance terminstance
+    @%append $^*.lrf option quiet
+    @%append $^*.lrf option manyautodata
+    @%append $^*.lrf option map
+    @%append $^*.lrf name $^.
+    @for %i in ($(OBJ)) do @%append $^*.lrf file %i
+    @%append $^*.lrf export=uniaud.def
+    $(LINK) @$^*.lrf
+    @%erase $^*.lrf
 
 uniaud_static.lib: $(OBJ)
-        @%create $^*.lbc
-        @for %i in ($(OBJ)) do @%append $^*.lbc +%i
-        wlib -n -b -q $^@ @$^*.lbc
-        @%erase $^*.lbc
+    @%create $^*.lbc
+    @for %i in ($(OBJ)) do @%append $^*.lbc +%i
+    wlib -n -b -q $^@ @$^*.lbc
+    @%erase $^*.lbc
 
 uniaud.lib: uniaud.dll
-        wlib -n -b -q -iro -p=16 uniaud.lib +uniaud.dll
+    wlib -n -b -q -iro -p=16 uniaud.lib +uniaud.dll
 
 clean: .SYMBOLIC
-        @rm *.obj *.lib *.exe *.dll *.map *.lst
+    @rm *.obj *.lib *.exe *.dll *.map *.lst
 
 xfast_memcpy.obj: fast_memcpy.c
-        $(CC) $(CFLAGS) -DFASTMEMCPY_TEST $*.c
+    $(CC) $(CFLAGS) -DFASTMEMCPY_TEST $*.c
 
 fast_memcpy.exe: fast_memcpy.obj fastmemcpy.obj cputest.obj
-        @%create $^*.lrf
-        @%append $^*.lrf system os2v2
-        @%append $^*.lrf option quiet
-        @%append $^*.lrf name $^.
-        @%append $^*.lrf file fast_memcpy.obj
-        @%append $^*.lrf file fastmemcpy.obj
-        @%append $^*.lrf file cputest.obj
-        $(LINK) @$^*.lrf
-        @%erase $^*.lrf
+    @%create $^*.lrf
+    @%append $^*.lrf system os2v2
+    @%append $^*.lrf option quiet
+    @%append $^*.lrf name $^.
+    @%append $^*.lrf file fast_memcpy.obj
+    @%append $^*.lrf file fastmemcpy.obj
+    @%append $^*.lrf file cputest.obj
+    $(LINK) @$^*.lrf
+    @%erase $^*.lrf
 
 

contrib/API/lib/internal.h

@@ -91 +91 @@
 } ioctl_pcm;
 #pragma pack ()
+
+int _uniaud_pcm_prepare(uniaud_pcm *pcm);
+int _uniaud_pcm_start(uniaud_pcm *pcm);
+int _uniaud_pcm_drop(uniaud_pcm *pcm);
+int _uniaud_pcm_pause(uniaud_pcm *pcm);
+int _uniaud_pcm_resume(uniaud_pcm *pcm);
+int _uniaud_pcm_close(uniaud_pcm *pcm);
+int _uniaud_pcm_wait(uniaud_pcm *pcm, int timeout);
+int _uniaud_pcm_write(uniaud_pcm *pcm, char* buffer, int size);
+int _uniaud_pcm_open(int card_id, int type, int pcm_instance, int access_flag,
+                                         int sample_rate, int channels, int pcm_format, uniaud_pcm **pcm);
+int _uniaud_mixer_get_ctls_number(int card_id);
+UniaudControl *  _uniaud_mixer_get_ctl_list(int card_id);
+int mm_support(void);
+
 #endif //  __UNIAUD_INTERNAL__

contrib/API/lib/pcmmulti.c

@@ -33 +33 @@
 #include "unidef.h"
 #include "errno.h"
+#include "internal.h"