zymon/PortAudio.jl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'master' into render_tasks

Browse source
This commit is contained in:
Spencer Russell 2013-12-22 12:48:09 -05:00
commit c2d771d952
3 changed files with 10 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.gitignore vendored
View file

@ -2,3 +2,4 @@
*.so *.so
*.o *.o
deps/usr deps/usr
deps/deps.jl

12
deps/src/Makefile vendored
View file

@ -16,7 +16,9 @@ endif
#INC =-I"$(JULIA_INC)" #INC =-I"$(JULIA_INC)"
FLAGS =-Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fPIC FLAGS =-Wall -Wno-strict-aliasing -fno-omit-frame-pointer -fPIC
CFLAGS =-g CFLAGS =-g
LIBS =-lportaudio -lrt LIBS =-lportaudio
LINUX_LIBS =-lrt
LINUX_LDFLAGS =-rdynamic
OBJS = shim.o OBJS = shim.o
@ -26,22 +28,24 @@ ifeq ($(OS), MINGW32_NT-6.1)
OS=WINNT OS=WINNT
endif endif
# file extensions # file extensions and platform-specific libs
ifeq ($(OS), WINNT) ifeq ($(OS), WINNT)
SHLIB_EXT = dll SHLIB_EXT = dll
else ifeq ($(OS), Darwin) else ifeq ($(OS), Darwin)
SHLIB_EXT = dylib SHLIB_EXT = dylib
else else
LIBS += $(LINUX_LIBS)
LDFLAGS += $(LINUX_LDFLAGS)
SHLIB_EXT = so SHLIB_EXT = so
endif endif
default: libportaudio_shim.$(SHLIB_EXT) default: libportaudio_shim.$(SHLIB_EXT)
%.o: %.c %.o: %.c Makefile
$(CC) $< -fPIC -c -o $@ $(INC) $(CFLAGS) $(FLAGS) $(CC) $< -fPIC -c -o $@ $(INC) $(CFLAGS) $(FLAGS)
libportaudio_shim.$(SHLIB_EXT): $(OBJS) libportaudio_shim.$(SHLIB_EXT): $(OBJS)
$(CC) $(OBJS) -rdynamic -shared -o $@ $(LDFLAGS) $(LIBS) $(CC) $(OBJS) -shared -o $@ $(LDFLAGS) $(LIBS)
clean: clean:
rm -f *.o *.$(SHLIB_EXT) rm -f *.o *.$(SHLIB_EXT)

2
src/PortAudio.jl
View file

@ -87,7 +87,7 @@ function audio_task(jl_filedesc)
# have processed our last frame of data). At some point we should do # have processed our last frame of data). At some point we should do
# something with the data we get from the callback # something with the data we get from the callback
wait(jl_rawfd, readable=true) wait(jl_rawfd, readable=true)
ccall((:read, ""), Clong, (Cint, Ptr{Void}, Culong), jl_filedesc, desc_bytes, 1) ccall(:read, Clong, (Cint, Ptr{Void}, Culong), jl_filedesc, desc_bytes, 1)
end end
end end