Author: piumarta Date: 2009-09-14 14:25:16 -0700 (Mon, 14 Sep 2009) New Revision: 2132

Modified: trunk/platforms/unix/ChangeLog trunk/platforms/unix/vm-sound-pulse/config.cmake trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c trunk/platforms/unix/vm/sqUnixMain.c Log: add vm-sound-pulse to autoloaded drivers

Modified: trunk/platforms/unix/ChangeLog =================================================================== --- trunk/platforms/unix/ChangeLog 2009-09-14 21:00:51 UTC (rev 2131) +++ trunk/platforms/unix/ChangeLog 2009-09-14 21:25:16 UTC (rev 2132) @@ -3,6 +3,15 @@ * vm-sound-pulse: Pulse Audio driver added, thanks to Derek O'Connell.

+ * vm-sound-pulse/sqUnixSoundPulseAudio.c: Driver interface + structure is called "pulse". + + * vm-sound-pulse/config.cmake: Require libpulse-simple rather than + libpulse. + + * vm/sqUnixMain.c (moduleDescriptions): Add vm-sound-pulse to list + of auto-loaded sound drivers. + 2009-09-10 piumarta@ubuntu.piumarta.com

* plugins/SqueakFFIPrims/x86-sysv-asm.S (ffiCallAddressOf): Pop a

Modified: trunk/platforms/unix/vm/sqUnixMain.c =================================================================== --- trunk/platforms/unix/vm/sqUnixMain.c 2009-09-14 21:00:51 UTC (rev 2131) +++ trunk/platforms/unix/vm/sqUnixMain.c 2009-09-14 21:25:16 UTC (rev 2132) @@ -27,7 +27,7 @@

/* Author: Ian Piumarta ian.piumarta@squeakland.org * - * Last edited: 2009-09-02 15:08:53 by piumarta on ubuntu.piumarta.com + * Last edited: 2009-09-14 14:03:15 by piumarta on ubuntu.piumarta.com */

#include "sq.h" @@ -702,6 +702,7 @@ { &soundModule, "sound", "OSS" }, { &soundModule, "sound", "MacOSX" }, { &soundModule, "sound", "Sun" }, + { &soundModule, "sound", "pulse" }, { &soundModule, "sound", "ALSA" }, { &soundModule, "sound", "null" }, { 0, 0, 0 }

Modified: trunk/platforms/unix/vm-sound-pulse/config.cmake =================================================================== --- trunk/platforms/unix/vm-sound-pulse/config.cmake 2009-09-14 21:00:51 UTC (rev 2131) +++ trunk/platforms/unix/vm-sound-pulse/config.cmake 2009-09-14 21:25:16 UTC (rev 2132) @@ -1 +1 @@ -PLUGIN_REQUIRE_PACKAGE (LIBPULSE libpulse) +PLUGIN_REQUIRE_LIBRARY (PULSE pulse-simple)

Modified: trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c =================================================================== --- trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c 2009-09-14 21:00:51 UTC (rev 2131) +++ trunk/platforms/unix/vm-sound-pulse/sqUnixSoundPulseAudio.c 2009-09-14 21:25:16 UTC (rev 2132) @@ -25,7 +25,7 @@ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER * DEALINGS IN THE SOFTWARE. * - * Last edited: 2009-09-14 13:59:33 by piumarta on ubuntu.piumarta.com + * Last edited: 2009-09-14 14:15:05 by piumarta on ubuntu.piumarta.com */

/* ========== */ @@ -1189,7 +1189,7 @@

#include "SqSound.h"

-SqSoundDefine(PA); +SqSoundDefine(pulse);

#include "SqModule.h"

@@ -1248,8 +1248,7 @@ ioInit(); - return &sound_PA_itf; + return &sound_pulse_itf; }

-SqModuleDefine(sound, PA); - +SqModuleDefine(sound, pulse);