diff -p ./Makefile ../flash-0.4.10-openbsd/Makefile --- ./Makefile Mon Jun 12 10:19:14 2000 +++ ../flash-0.4.10-openbsd/Makefile Sat Dec 18 14:55:19 2004 @@ -1,4 +1,4 @@ -SUBDIRS= Jpeg Zlib Lib Player Plugin Kflash +SUBDIRS= Jpeg Zlib Lib Plugin all: for subdir in $(SUBDIRS); do (cd $$subdir; $(MAKE)); done diff -p ./Plugin/Makefile ../flash-0.4.10-openbsd/Plugin/Makefile --- ./Plugin/Makefile Tue Sep 28 14:13:38 1999 +++ ../flash-0.4.10-openbsd/Plugin/Makefile Sat Dec 18 16:27:32 2004 @@ -19,6 +19,7 @@ # api gets control. # +RM=rm PLUGIN_DEFINES= -DXP_UNIX OPTIMIZER= FLASH=../Lib @@ -36,7 +37,8 @@ LIBCXX= SHARED=-shared CFLAGS= $(OPTIMIZER) $(PLUGIN_DEFINES) -I$(FLASH) -I/usr/X11R6/include -LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a +LDFLAGS= $(FLASH)/libflash.a $(LIBCXX) ../Jpeg/libjpeg.a ../Zlib/libz.a \ + -lossaudio SRC= plugin.c npunix.c OBJ= plugin.o npunix.o diff -p ./Plugin/plugin.c ../flash-0.4.10-openbsd/Plugin/plugin.c --- ./Plugin/plugin.c Mon Jun 12 10:24:09 2000 +++ ../flash-0.4.10-openbsd/Plugin/plugin.c Sat Dec 18 15:29:35 2004 @@ -162,7 +162,7 @@ NPP_New(NPMIMEType pluginType, FlashSetCursorOnOffMethod(This->fh, cursorOnOff, (void*)instance); - FlashSoundInit(This->fh, "/dev/dsp"); + FlashSoundInit(This->fh, "/dev/audio"); return NPERR_NO_ERROR; } diff -p ./Lib/sound.cc ../flash-0.4.10-openbsd/Lib/sound.cc --- ./Lib/sound.cc Wed Sep 1 17:10:03 1999 +++ ../flash-0.4.10-openbsd/Lib/sound.cc Sat Dec 18 16:30:14 2004 @@ -26,7 +26,7 @@ #include #include #ifndef NOSOUND -#include +#include #endif #ifdef RCSID @@ -157,6 +157,7 @@ SoundMixer::SoundMixer(char *device) dsp = open(device,O_WRONLY); if (dsp < 0) { + printf("error opening %s\n", device); perror("open dsp"); return; } @@ -187,7 +188,7 @@ SoundMixer::SoundMixer(char *device) } // Set sound rate in Hertz - soundRate = 11000; + soundRate = 44000; status = ioctl(dsp, SNDCTL_DSP_SPEED, &soundRate); if (status < 0) perror("ioctl SNDCTL_DSP_SPEED");