diff -Nru fmodex-4.34.15/debian/changelog fmodex-4.34.20/debian/changelog --- fmodex-4.34.15/debian/changelog 2011-11-18 09:45:34.000000000 +0000 +++ fmodex-4.34.20/debian/changelog 2012-06-06 07:32:02.000000000 +0000 @@ -1,11 +1,11 @@ -fmodex (4.34.15-1) oneiric; urgency=low +fmodex (4.34.20-1~oneiric) oneiric; urgency=low - * Update to latest on this branch + * Backport to oneiric - -- Reinier de Blois Fri, 18 Nov 2011 04:45:01 -0500 + -- Reinier de Blois Wed, 06 Jun 2012 03:31:52 -0400 -fmodex (4.34.12-1) oneiric; urgency=low +fmodex (4.34.20-1) precise; urgency=low - * Initial, without examples packages + * Initial - -- Reinier de Blois Mon, 17 Oct 2011 07:46:20 -0400 + -- Reinier de Blois Wed, 06 Jun 2012 03:18:38 -0400 Binary files /tmp/jserMF5WMm/fmodex-4.34.15/fmodapi43415linux64.tar.gz and /tmp/h_ptIaYkFF/fmodex-4.34.20/fmodapi43415linux64.tar.gz differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/fmodapi43415linux.tar.gz and /tmp/h_ptIaYkFF/fmodex-4.34.20/fmodapi43415linux.tar.gz differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/fmodapi43420linux64.tar.gz and /tmp/h_ptIaYkFF/fmodex-4.34.20/fmodapi43420linux64.tar.gz differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/fmodapi43420linux.tar.gz and /tmp/h_ptIaYkFF/fmodex-4.34.20/fmodapi43420linux.tar.gz differ diff -Nru fmodex-4.34.15/=unpacked-tar1=/api/inc/fmod_dsp.h fmodex-4.34.20/=unpacked-tar1=/api/inc/fmod_dsp.h --- fmodex-4.34.15/=unpacked-tar1=/api/inc/fmod_dsp.h 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/api/inc/fmod_dsp.h 2012-01-17 23:05:57.000000000 +0000 @@ -81,13 +81,6 @@ [REMARKS] Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value.
Members marked with [w] mean the variable can be written to. The user can set the value.
-
- The step parameter tells the gui or application that the parameter has a certain granularity.
- For example in the example of cutoff frequency with a range from 100.0 to 22050.0 you might only want the selection to be in 10hz increments. For this you would simply use 10.0 as the step value.
- For a boolean, you can use min = 0.0, max = 1.0, step = 1.0. This way the only possible values are 0.0 and 1.0.
- Some applications may detect min = 0.0, max = 1.0, step = 1.0 and replace a graphical slider bar with a checkbox instead.
- A step value of 1.0 would simulate integer values only.
- A step value of 0.0 would mean the full floating point range is accessable.
[PLATFORMS] Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlayStation Portable, PlayStation 3, Wii, iPhone diff -Nru fmodex-4.34.15/=unpacked-tar1=/api/inc/fmod.h fmodex-4.34.20/=unpacked-tar1=/api/inc/fmod.h --- fmodex-4.34.15/=unpacked-tar1=/api/inc/fmod.h 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/api/inc/fmod.h 2012-01-17 23:05:57.000000000 +0000 @@ -16,7 +16,7 @@ 0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number. */ -#define FMOD_VERSION 0x00043415 +#define FMOD_VERSION 0x00043420 /* Compiler specific settings. @@ -27,25 +27,25 @@ #define F_STDCALL __stdcall #define F_DECLSPEC __declspec #define F_DLLEXPORT ( dllexport ) -#elif (defined(WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(_XBOX)) +#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) #define F_CDECL _cdecl #define F_STDCALL _stdcall #define F_DECLSPEC __declspec #define F_DLLEXPORT ( dllexport ) -#elif defined(__MACH__) || defined (ANDROID) +#elif defined(__MACH__) || defined (ANDROID) || defined(__linux__) #define F_CDECL #define F_STDCALL #define F_DECLSPEC #define F_DLLEXPORT __attribute__ ((visibility("default"))) #else - #define F_STDCALL #define F_CDECL + #define F_STDCALL #define F_DECLSPEC #define F_DLLEXPORT #endif #ifdef DLL_EXPORTS - #if defined(__MACH__) || defined(ANDROID) + #if defined(__MACH__) || defined(ANDROID) || defined(__linux__) #define F_API __attribute__ ((visibility("default"))) #else #define F_API __declspec(dllexport) F_STDCALL Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/api/lib/libfmodex-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/api/lib/libfmodex-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/api/lib/libfmodex64-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/api/lib/libfmodex64-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/api/lib/libfmodex64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/api/lib/libfmodex64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/api/lib/libfmodexL-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/api/lib/libfmodexL-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/api/lib/libfmodexL64-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/api/lib/libfmodexL64-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/api/lib/libfmodexL64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/api/lib/libfmodexL64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/api/lib/libfmodexL.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/api/lib/libfmodexL.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/api/lib/libfmodex.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/api/lib/libfmodex.so differ diff -Nru fmodex-4.34.15/=unpacked-tar1=/documentation/revision.txt fmodex-4.34.20/=unpacked-tar1=/documentation/revision.txt --- fmodex-4.34.15/=unpacked-tar1=/documentation/revision.txt 2011-11-17 04:51:03.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/documentation/revision.txt 2012-01-17 23:06:00.000000000 +0000 @@ -10,6 +10,40 @@ ! Important - Take note! =============================================================================== +18/01/12 4.34.20 - Stable branch update +---------------------------------------------------- + +- Fixed memory leak when using Channel::setSpeakerLevels. + +- Linux - Fixed missing symbol at runtime when using older distros. + +- Event API - Fixed event playback bugs when virtual channel count is exceeded + + +28/12/11 4.34.19 - Stable branch update +---------------------------------------------------- + +* Xbox 360 - Now built with XDK 21076.6 + +14/12/11 4.34.18 - Stable branch update +---------------------------------------------------- + +- Fixed MPEG FSB seeking accuracy issues. + +- Xbox 360 - Fix XMA seeking seeking/looping to the wrong position for streams. + +12/12/11 4.34.17 - Stable branch update +---------------------------------------------------- + +- Linux - Fixed dynamic linker error that would cause some distros to fail loading. + +28/11/11 4.34.16 - Stable branch update +---------------------------------------------------- + +- Fixed MIDI pan not working in .MID playback. +- Fixed certain speaker levels in DSPConnection and Channel not being correctly + applied. + 17/11/11 4.34.15 - Stable branch update ---------------------------------------------------- diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/3d/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/3d/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/3d/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/3d/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ 3d_cpp: main.cpp - g++ -O3 -o 3d main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o 3d main.cpp ../../api/lib/libfmodex64.so -pthread 3d_c: main.c - g++ -O3 -o 3d main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o 3d main.c ../../api/lib/libfmodex64.so -pthread run: ./3d diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/cdplayer/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/cdplayer/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/cdplayer/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/cdplayer/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ cdplayer_cpp: main.cpp - g++ -O3 -o cdplayer main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o cdplayer main.cpp ../../api/lib/libfmodex64.so -pthread cdplayer_c: main.c - g++ -O3 -o cdplayer main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o cdplayer main.c ../../api/lib/libfmodex64.so -pthread run: ./cdplayer diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/channelgroups/main.c fmodex-4.34.20/=unpacked-tar1=/examples/channelgroups/main.c --- fmodex-4.34.15/=unpacked-tar1=/examples/channelgroups/main.c 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/channelgroups/main.c 2012-01-17 23:05:56.000000000 +0000 @@ -71,9 +71,9 @@ result = FMOD_System_GetMasterChannelGroup(system, &masterGroup); ERRCHECK(result); - printf("=======================================================================\n"); + printf("===================================================================\n"); printf("ChannelGroups Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("=======================================================================\n"); + printf("===================================================================\n"); printf("\n"); printf("Group A : drumloop.wav, jaguar.wav, swish.wav\n"); printf("Group B : c.ogg, d.ogg, e.ogg\n"); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/channelgroups/main.cpp fmodex-4.34.20/=unpacked-tar1=/examples/channelgroups/main.cpp --- fmodex-4.34.15/=unpacked-tar1=/examples/channelgroups/main.cpp 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/channelgroups/main.cpp 2012-01-17 23:05:56.000000000 +0000 @@ -71,9 +71,9 @@ result = system->getMasterChannelGroup(&masterGroup); ERRCHECK(result); - printf("=======================================================================\n"); + printf("===================================================================\n"); printf("ChannelGroups Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("=======================================================================\n"); + printf("===================================================================\n"); printf("\n"); printf("Group A : drumloop.wav, jaguar.wav, swish.wav\n"); printf("Group B : c.ogg, d.ogg, e.ogg\n"); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/channelgroups/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/channelgroups/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/channelgroups/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/channelgroups/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,8 +1,8 @@ channelgroups_cpp: main.cpp - g++ -O3 -o channelgroups main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o channelgroups main.cpp ../../api/lib/libfmodex64.so -pthread channelgroups_c: main.c - g++ -O3 -o channelgroups main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o channelgroups main.c ../../api/lib/libfmodex64.so -pthread run: ./channelgroups diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/dsp_custom/main.cpp fmodex-4.34.20/=unpacked-tar1=/examples/dsp_custom/main.cpp --- fmodex-4.34.15/=unpacked-tar1=/examples/dsp_custom/main.cpp 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/dsp_custom/main.cpp 2012-01-17 23:05:57.000000000 +0000 @@ -95,9 +95,9 @@ result = system->createSound("../media/drumloop.wav", FMOD_SOFTWARE | FMOD_LOOP_NORMAL, 0, &sound); ERRCHECK(result); - printf("===================================================================\n"); + printf("===============================================================================\n"); printf("Custom DSP example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("===================================================================\n"); + printf("===============================================================================\n"); printf("Press 'f' to activate, deactivate user filter\n"); printf("Press 'Esc' to quit\n"); printf("\n"); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/dsp_custom/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/dsp_custom/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/dsp_custom/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/dsp_custom/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ dsp_custom_cpp: main.cpp - g++ -O3 -o dsp_custom main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o dsp_custom main.cpp ../../api/lib/libfmodex64.so -pthread dsp_custom_c: main.c - g++ -O3 -o dsp_custom main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o dsp_custom main.c ../../api/lib/libfmodex64.so -pthread run: ./dsp_custom diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/dsp_effectperspeaker/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/dsp_effectperspeaker/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/dsp_effectperspeaker/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/dsp_effectperspeaker/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,8 +1,8 @@ dsp_effectperspeaker_cpp: main.cpp - g++ -O3 -o dsp_effectperspeaker main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o dsp_effectperspeaker main.cpp ../../api/lib/libfmodex64.so -pthread dsp_effectperspeaker_c: main.c - g++ -O3 -o dsp_effectperspeaker main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o dsp_effectperspeaker main.c ../../api/lib/libfmodex64.so -pthread run: ./dsp_effectperspeaker diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/effects/main.c fmodex-4.34.20/=unpacked-tar1=/examples/effects/main.c --- fmodex-4.34.15/=unpacked-tar1=/examples/effects/main.c 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/effects/main.c 2012-01-17 23:05:56.000000000 +0000 @@ -63,9 +63,9 @@ result = FMOD_System_CreateSound(system, "../media/drumloop.wav", FMOD_SOFTWARE, 0, &sound); ERRCHECK(result); - printf("=================================================================\n"); + printf("===================================================================\n"); printf("Effects Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("=================================================================\n"); + printf("===================================================================\n"); printf("\n"); printf("Press SPACE to paused/unpause sound.\n"); printf("Press 1 to toggle dsplowpass effect.\n"); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/effects/main.cpp fmodex-4.34.20/=unpacked-tar1=/examples/effects/main.cpp --- fmodex-4.34.15/=unpacked-tar1=/examples/effects/main.cpp 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/effects/main.cpp 2012-01-17 23:05:56.000000000 +0000 @@ -63,9 +63,9 @@ result = system->createSound("../media/drumloop.wav", FMOD_SOFTWARE, 0, &sound); ERRCHECK(result); - printf("=================================================================\n"); + printf("===================================================================\n"); printf("Effects Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("=================================================================\n"); + printf("===================================================================\n"); printf("\n"); printf("Press SPACE to paused/unpause sound.\n"); printf("Press 1 to toggle dsplowpass effect.\n"); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/effects/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/effects/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/effects/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/effects/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,8 +1,8 @@ effects_cpp: main.cpp - g++ -O3 -o effects main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o effects main.cpp ../../api/lib/libfmodex64.so -pthread effects_c: main.c - g++ -O3 -o effects main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o effects main.c ../../api/lib/libfmodex64.so -pthread run: ./effects diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/filecallbacks/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/filecallbacks/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/filecallbacks/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/filecallbacks/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,8 +1,8 @@ filecallbacks_cpp: main.cpp - g++ -O3 -o filecallbacks main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o filecallbacks main.cpp ../../api/lib/libfmodex64.so -pthread filecallbacks_c: main.c - g++ -O3 -o filecallbacks main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o filecallbacks main.c ../../api/lib/libfmodex64.so -pthread run: ./filecallbacks diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/generatetone/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/generatetone/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/generatetone/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/generatetone/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ generatetone_cpp: main.cpp - g++ -O3 -o generatetone main.cpp ../../api/lib/libfmodex.so + g++ -O3 -o generatetone main.cpp ../../api/lib/libfmodex64.so generatetone_c: main.c - g++ -O3 -o generatetone main.c ../../api/lib/libfmodex.so + g++ -O3 -o generatetone main.c ../../api/lib/libfmodex64.so run: ./generatetone diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/loadfrommemory/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/loadfrommemory/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/loadfrommemory/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/loadfrommemory/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ loadfrommemory_cpp: main.cpp - g++ -O3 -o loadfrommemory main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o loadfrommemory main.cpp ../../api/lib/libfmodex64.so -pthread loadfrommemory_c: main.c - g++ -O3 -o loadfrommemory main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o loadfrommemory main.c ../../api/lib/libfmodex64.so -pthread run: ./loadfrommemory diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/media/playlist.m3u fmodex-4.34.20/=unpacked-tar1=/examples/media/playlist.m3u --- fmodex-4.34.15/=unpacked-tar1=/examples/media/playlist.m3u 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/media/playlist.m3u 1970-01-01 00:00:00.000000000 +0000 @@ -1,11 +0,0 @@ -#EXTM3U -#EXTINF:11,Unknown - FMOD example wave -wave.mp3 -#EXTINF:1,swish -swish.wav -#EXTINF:2,stereo -stereo.ogg -#EXTINF:1,jaguar -jaguar.wav -#EXTINF:0,drumloop -drumloop.wav diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/multiplesoundcard/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/multiplesoundcard/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/multiplesoundcard/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/multiplesoundcard/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ multiplesoundcard_cpp: main.cpp - g++ -O3 -o multiplesoundcard main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o multiplesoundcard main.cpp ../../api/lib/libfmodex64.so -pthread multiplesoundcard_c: main.c - g++ -O3 -o multiplesoundcard main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o multiplesoundcard main.c ../../api/lib/libfmodex64.so -pthread run: ./multiplesoundcard diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/multispeakeroutput/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/multispeakeroutput/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/multispeakeroutput/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/multispeakeroutput/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,8 +1,8 @@ multispeakeroutput_cpp: main.cpp - g++ -O3 -o multispeakeroutput main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o multispeakeroutput main.cpp ../../api/lib/libfmodex64.so -pthread multispeakeroutput_c: main.c - g++ -O3 -o multispeakeroutput main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o multispeakeroutput main.c ../../api/lib/libfmodex64.so -pthread run: ./multispeakeroutput diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/netstream/main.cpp fmodex-4.34.20/=unpacked-tar1=/examples/netstream/main.cpp --- fmodex-4.34.15/=unpacked-tar1=/examples/netstream/main.cpp 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/netstream/main.cpp 2012-01-17 23:05:57.000000000 +0000 @@ -116,7 +116,7 @@ } if (tag.datatype == FMOD_TAGDATATYPE_STRING) { - printf("%s = %s (%d bytes)\n", tag.name, (char *)tag.data, tag.datalen); + printf("%s = %s (%d bytes)\n", tag.name, tag.data, tag.datalen); } } @@ -134,8 +134,7 @@ channel->setMute(starving); ERRCHECK(result); - printf("Time %02d:%02d:%02d : %s : (%3d%%) %s \r", ms / 1000 / 60, ms / 1000 % 60, ms / 10 % 100, openstate == FMOD_OPENSTATE_BUFFERING ? "Buffering..." : openstate == FMOD_OPENSTATE_CONNECTING ? "Connecting..." : paused ? "Paused " : playing ? "Playing " : "Stopped ", percent, starving ? "STARVING" : " "); - fflush(stdout); + printf("Time %02d:%02d:%02d : %s : (%3d%%%) %s \r", ms / 1000 / 60, ms / 1000 % 60, ms / 10 % 100, openstate == FMOD_OPENSTATE_BUFFERING ? "Buffering..." : openstate == FMOD_OPENSTATE_CONNECTING ? "Connecting..." : paused ? "Paused " : playing ? "Playing " : "Stopped ", percent, starving ? "STARVING" : " "); Sleep(10); @@ -145,12 +144,6 @@ printf("Shutting down.\n"); - if (channel) - { - result = channel->stop(); - ERRCHECK(result); - } - /* If we pressed escape before it is ready, wait for it to finish opening before we release it. */ @@ -167,7 +160,6 @@ } printf("Waiting for sound to finish opening before trying to release it....\r"); - fflush(stdout); Sleep(10); } while (1); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/netstream/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/netstream/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/netstream/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/netstream/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ netstream_cpp: main.cpp - g++ -O3 -o netstream main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o netstream main.cpp ../../api/lib/libfmodex64.so -pthread netstream_c: main.c - g++ -O3 -o netstream main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o netstream main.c ../../api/lib/libfmodex64.so -pthread run: ./netstream diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/offlinedecoding/main.c fmodex-4.34.20/=unpacked-tar1=/examples/offlinedecoding/main.c --- fmodex-4.34.15/=unpacked-tar1=/examples/offlinedecoding/main.c 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/offlinedecoding/main.c 2012-01-17 23:05:57.000000000 +0000 @@ -52,9 +52,9 @@ result = FMOD_System_CreateStream(system, "../media/wave.mp3", FMOD_OPENONLY | FMOD_ACCURATETIME, 0, &sound); ERRCHECK(result); - printf("==========================================================================\n"); + printf("===============================================================================\n"); printf("Offline Decoding Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("==========================================================================\n"); + printf("===============================================================================\n"); printf("\n"); printf("This program will open wave.mp3 and decode it into wave.raw using the\n"); printf("FMOD_Sound_ReadData function.\n"); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/offlinedecoding/main.cpp fmodex-4.34.20/=unpacked-tar1=/examples/offlinedecoding/main.cpp --- fmodex-4.34.15/=unpacked-tar1=/examples/offlinedecoding/main.cpp 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/offlinedecoding/main.cpp 2012-01-17 23:05:56.000000000 +0000 @@ -52,9 +52,9 @@ result = system->createStream("../media/wave.mp3", FMOD_OPENONLY | FMOD_ACCURATETIME, 0, &sound); ERRCHECK(result); - printf("==========================================================================\n"); + printf("===============================================================================\n"); printf("Offline Decoding Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("==========================================================================\n"); + printf("===============================================================================\n"); printf("\n"); printf("This program will open wave.mp3 and decode it into wave.raw using the\n"); printf("Sound::readData function.\n"); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/offlinedecoding/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/offlinedecoding/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/offlinedecoding/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/offlinedecoding/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,8 +1,8 @@ offlinedecoding_cpp: main.cpp - g++ -O3 -o offlinedecoding main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o offlinedecoding main.cpp ../../api/lib/libfmodex64.so -pthread offlinedecoding_c: main.c - g++ -O3 -o offlinedecoding main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o offlinedecoding main.c ../../api/lib/libfmodex64.so -pthread run: ./offlinedecoding diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/pitchdetection/main.c fmodex-4.34.20/=unpacked-tar1=/examples/pitchdetection/main.c --- fmodex-4.34.15/=unpacked-tar1=/examples/pitchdetection/main.c 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/pitchdetection/main.c 2012-01-17 23:05:57.000000000 +0000 @@ -87,10 +87,9 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); - printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -107,8 +106,6 @@ break; case '3' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_ESD); break; - case '4' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_PULSEAUDIO); - break; default : return 1; } ERRCHECK(result); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/pitchdetection/main.cpp fmodex-4.34.20/=unpacked-tar1=/examples/pitchdetection/main.cpp --- fmodex-4.34.15/=unpacked-tar1=/examples/pitchdetection/main.cpp 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/pitchdetection/main.cpp 2012-01-17 23:05:57.000000000 +0000 @@ -87,10 +87,9 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); - printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -107,8 +106,6 @@ break; case '3' : result = system->setOutput(FMOD_OUTPUTTYPE_ESD); break; - case '4' : result = system->setOutput(FMOD_OUTPUTTYPE_PULSEAUDIO); - break; default : return 1; } ERRCHECK(result); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/pitchdetection/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/pitchdetection/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/pitchdetection/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/pitchdetection/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ pitchdetection_cpp: main.cpp - g++ -O3 -o pitchdetection main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o pitchdetection main.cpp ../../api/lib/libfmodex64.so -pthread pitchdetection_c: main.c - g++ -O3 -o pitchdetection main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o pitchdetection main.c ../../api/lib/libfmodex64.so -pthread run: ./pitchdetection diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/playlist/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/playlist/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/playlist/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/playlist/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ playlist_cpp: main.cpp - g++ -O3 -o playlist main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o playlist main.cpp ../../api/lib/libfmodex64.so -pthread playlist_c: main.c - g++ -O3 -o playlist main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o playlist main.c ../../api/lib/libfmodex64.so -pthread run: ./playlist diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/playsound/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/playsound/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/playsound/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/playsound/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ playsound_cpp: main.cpp - g++ -O3 -o playsound main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o playsound main.cpp ../../api/lib/libfmodex64.so -pthread playsound_c: main.c - gcc -O3 -o playsound main.c ../../api/lib/libfmodex.so -pthread + gcc -O3 -o playsound main.c ../../api/lib/libfmodex64.so -pthread run: ./playsound diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/playstream/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/playstream/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/playstream/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/playstream/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ playstream_cpp: main.cpp - g++ -O3 -o playstream main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o playstream main.cpp ../../api/lib/libfmodex64.so -pthread playstream_c: main.c - g++ -O3 -o playstream main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o playstream main.c ../../api/lib/libfmodex64.so -pthread run: ./playstream diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/readtags/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/readtags/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/readtags/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/readtags/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ readtags_cpp: main.cpp - g++ -O3 -o readtags main.cpp ../../api/lib/libfmodex.so + g++ -O3 -o readtags main.cpp ../../api/lib/libfmodex64.so readtags_c: main.c - g++ -O3 -o readtags main.c ../../api/lib/libfmodex.so + g++ -O3 -o readtags main.c ../../api/lib/libfmodex64.so run: ./readtags diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/realtimestitching/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/realtimestitching/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/realtimestitching/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/realtimestitching/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ realtimestitching_cpp: main.cpp - g++ -O3 -o realtimestitching main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o realtimestitching main.cpp ../../api/lib/libfmodex64.so -pthread realtimestitching_c: main.c - g++ -O3 -o realtimestitching main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o realtimestitching main.c ../../api/lib/libfmodex64.so -pthread run: ./realtimestitching diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/recording/main.c fmodex-4.34.20/=unpacked-tar1=/examples/recording/main.c --- fmodex-4.34.15/=unpacked-tar1=/examples/recording/main.c 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/recording/main.c 2012-01-17 23:05:57.000000000 +0000 @@ -158,10 +158,9 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); - printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -178,8 +177,6 @@ break; case '3' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_ESD); break; - case '4' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_PULSEAUDIO); - break; default : return 1; } ERRCHECK(result); @@ -254,16 +251,13 @@ printf("\n"); - result = FMOD_System_SetRecordDriver(system, recorddriver, driver); - ERRCHECK(result); - result = FMOD_System_Init(system, 32, FMOD_INIT_NORMAL, NULL); ERRCHECK(result); memset(&exinfo, 0, sizeof(FMOD_CREATESOUNDEXINFO)); exinfo.cbsize = sizeof(FMOD_CREATESOUNDEXINFO); - exinfo.numchannels = 2; + exinfo.numchannels = 1; exinfo.format = FMOD_SOUND_FORMAT_PCM16; exinfo.defaultfrequency = 44100; exinfo.length = exinfo.defaultfrequency * sizeof(short) * exinfo.numchannels * 5; @@ -379,7 +373,6 @@ FMOD_System_Update(system); - fflush(stdout); Sleep(10); } while (key != 27); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/recording/main.cpp fmodex-4.34.20/=unpacked-tar1=/examples/recording/main.cpp --- fmodex-4.34.15/=unpacked-tar1=/examples/recording/main.cpp 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/recording/main.cpp 2012-01-17 23:05:57.000000000 +0000 @@ -158,10 +158,9 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); - printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -178,8 +177,6 @@ break; case '3' : result = system->setOutput(FMOD_OUTPUTTYPE_ESD); break; - case '4' : result = system->setOutput(FMOD_OUTPUTTYPE_PULSEAUDIO); - break; default : return 1; } ERRCHECK(result); @@ -260,7 +257,7 @@ memset(&exinfo, 0, sizeof(FMOD_CREATESOUNDEXINFO)); exinfo.cbsize = sizeof(FMOD_CREATESOUNDEXINFO); - exinfo.numchannels = 2; + exinfo.numchannels = 1; exinfo.format = FMOD_SOUND_FORMAT_PCM16; exinfo.defaultfrequency = 44100; exinfo.length = exinfo.defaultfrequency * sizeof(short) * exinfo.numchannels * 5; @@ -375,7 +372,6 @@ system->update(); - fflush(stdout); Sleep(10); } while (key != 27); diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/recording/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/recording/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/recording/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/recording/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ recording_cpp: main.cpp - g++ -O3 -o recording main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o recording main.cpp ../../api/lib/libfmodex64.so -pthread recording_c: main.c - g++ -O3 -o recording main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o recording main.c ../../api/lib/libfmodex64.so -pthread run: ./recording diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/recordtodisk/main.c fmodex-4.34.20/=unpacked-tar1=/examples/recordtodisk/main.c --- fmodex-4.34.15/=unpacked-tar1=/examples/recordtodisk/main.c 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/recordtodisk/main.c 2012-01-17 23:05:57.000000000 +0000 @@ -109,7 +109,7 @@ FMOD_SOUND *sound = 0; FMOD_RESULT result; FMOD_CREATESOUNDEXINFO exinfo; - int key, recorddriver, numdrivers, count; + int key, driver, numdrivers, count; unsigned int version; FILE *fp; unsigned int datalength = 0, soundlength; @@ -135,10 +135,9 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); - printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -155,8 +154,6 @@ break; case '3' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_ESD); break; - case '4' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_PULSEAUDIO); - break; default : return 1; } ERRCHECK(result); @@ -183,7 +180,6 @@ printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); - recorddriver = 0; do { key = getch(); @@ -191,11 +187,11 @@ { return 0; } - recorddriver = key - '1'; - } while (recorddriver < 0 || recorddriver >= numdrivers); + driver = key - '1'; + } while (driver < 0 || driver >= numdrivers); printf("\n"); - + result = FMOD_System_Init(system, 32, FMOD_INIT_NORMAL, 0); ERRCHECK(result); @@ -219,7 +215,7 @@ getch(); - result = FMOD_System_RecordStart(system, recorddriver, sound, TRUE); + result = FMOD_System_RecordStart(system, driver, sound, TRUE); ERRCHECK(result); printf("Press 'Esc' to quit\n"); @@ -253,7 +249,7 @@ key = getch(); } - FMOD_System_GetRecordPosition(system, recorddriver, &recordpos); + FMOD_System_GetRecordPosition(system, driver, &recordpos); ERRCHECK(result); if (recordpos != lastrecordpos) diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/recordtodisk/main.cpp fmodex-4.34.20/=unpacked-tar1=/examples/recordtodisk/main.cpp --- fmodex-4.34.15/=unpacked-tar1=/examples/recordtodisk/main.cpp 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/recordtodisk/main.cpp 2012-01-17 23:05:57.000000000 +0000 @@ -109,7 +109,7 @@ FMOD::Sound *sound = 0; FMOD_RESULT result; FMOD_CREATESOUNDEXINFO exinfo; - int key, recorddriver, numdrivers, count; + int key, driver, numdrivers, count; unsigned int version; FILE *fp; unsigned int datalength = 0, soundlength; @@ -135,10 +135,9 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); - printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -155,8 +154,6 @@ break; case '3' : result = system->setOutput(FMOD_OUTPUTTYPE_ESD); break; - case '4' : result = system->setOutput(FMOD_OUTPUTTYPE_PULSEAUDIO); - break; default : return 1; } ERRCHECK(result); @@ -183,7 +180,6 @@ printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); - recorddriver = 0; do { key = getch(); @@ -191,8 +187,8 @@ { return 0; } - recorddriver = key - '1'; - } while (recorddriver < 0 || recorddriver >= numdrivers); + driver = key - '1'; + } while (driver < 0 || driver >= numdrivers); printf("\n"); @@ -219,7 +215,7 @@ getch(); - result = system->recordStart(recorddriver, sound, true); + result = system->recordStart(driver, sound, true); ERRCHECK(result); printf("Press 'Esc' to quit\n"); @@ -253,7 +249,7 @@ key = getch(); } - system->getRecordPosition(recorddriver, &recordpos); + system->getRecordPosition(driver, &recordpos); ERRCHECK(result); if (recordpos != lastrecordpos) diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/recordtodisk/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/recordtodisk/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/recordtodisk/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/recordtodisk/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ recordtodisk_cpp: main.cpp - g++ -O3 -o recordtodisk main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o recordtodisk main.cpp ../../api/lib/libfmodex64.so -pthread recordtodisk_c: main.c - g++ -O3 -o recordtodisk main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o recordtodisk main.c ../../api/lib/libfmodex64.so -pthread run: ./recordtodisk diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/ripnetstream/main.c fmodex-4.34.20/=unpacked-tar1=/examples/ripnetstream/main.c --- fmodex-4.34.15/=unpacked-tar1=/examples/ripnetstream/main.c 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/ripnetstream/main.c 2012-01-17 23:05:57.000000000 +0000 @@ -293,7 +293,7 @@ { FMOD_OPENSTATE openstate = FMOD_OPENSTATE_READY; - FMOD_Sound_GetOpenState(sound, &openstate, 0, 0, 0); + FMOD_Sound_GetOpenState(sound, &openstate, 0, 0); if (openstate == FMOD_OPENSTATE_ERROR) { diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/ripnetstream/main.cpp fmodex-4.34.20/=unpacked-tar1=/examples/ripnetstream/main.cpp --- fmodex-4.34.15/=unpacked-tar1=/examples/ripnetstream/main.cpp 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/ripnetstream/main.cpp 2012-01-17 23:05:57.000000000 +0000 @@ -293,7 +293,7 @@ { FMOD_OPENSTATE openstate = FMOD_OPENSTATE_READY; - sound->getOpenState(&openstate, 0, 0, 0); + sound->getOpenState(&openstate, 0, 0); if (openstate == FMOD_OPENSTATE_ERROR) { diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/ripnetstream/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/ripnetstream/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/ripnetstream/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/ripnetstream/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ ripnetstream_cpp: main.cpp - g++ -O3 -o ripnetstream main.cpp ../../api/lib/libfmodex.so + g++ -O3 -o ripnetstream main.cpp ../../api/lib/libfmodex64.so ripnetstream_c: main.c - g++ -O3 -o ripnetstream main.c ../../api/lib/libfmodex.so + g++ -O3 -o ripnetstream main.c ../../api/lib/libfmodex64.so run: ./ripnetstream diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/submixing/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/submixing/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/submixing/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/submixing/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,8 +1,8 @@ submixing_cpp: main.cpp - g++ -O3 -o submixing main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o submixing main.cpp ../../api/lib/libfmodex64.so -pthread submixing_c: main.c - g++ -O3 -o submixing main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o submixing main.c ../../api/lib/libfmodex64.so -pthread run: ./submixing diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/useplugins/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/useplugins/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/useplugins/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/useplugins/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,8 +1,8 @@ useplugins_cpp: main.cpp - g++ -O3 -o useplugins main.cpp ../../api/lib/libfmodex.so -pthread + g++ -O3 -o useplugins main.cpp ../../api/lib/libfmodexp64.so -pthread useplugins_c: main.c - g++ -O3 -o useplugins main.c ../../api/lib/libfmodex.so -pthread + g++ -O3 -o useplugins main.c ../../api/lib/libfmodexp64.so -pthread run: ./useplugins diff -Nru fmodex-4.34.15/=unpacked-tar1=/examples/usercreatedsound/Makefile fmodex-4.34.20/=unpacked-tar1=/examples/usercreatedsound/Makefile --- fmodex-4.34.15/=unpacked-tar1=/examples/usercreatedsound/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/examples/usercreatedsound/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,8 +1,8 @@ usercreatedsound_cpp: main.cpp - g++ -O3 -o usercreatedsound main.cpp ../../api/lib/libfmodex.so + g++ -O3 -o usercreatedsound main.cpp ../../api/lib/libfmodex64.so usercreatedsound_c: main.c - g++ -O3 -o usercreatedsound main.c ../../api/lib/libfmodex.so + g++ -O3 -o usercreatedsound main.c ../../api/lib/libfmodex64.so run: ./usercreatedsound diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/inc/fmod_event.h fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/inc/fmod_event.h --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/inc/fmod_event.h 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/inc/fmod_event.h 2012-01-17 23:05:57.000000000 +0000 @@ -21,7 +21,7 @@ 0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number. */ -#define FMOD_EVENT_VERSION 0x00043415 +#define FMOD_EVENT_VERSION 0x00043420 /* FMOD event types diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/inc/fmod_event_net.h fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/inc/fmod_event_net.h --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/inc/fmod_event_net.h 2011-11-17 04:51:03.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/inc/fmod_event_net.h 2012-01-17 23:06:00.000000000 +0000 @@ -18,7 +18,7 @@ FMOD NetEventSystem version number. Check this against NetEventSystem_GetVersion. 0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number. */ -#define FMOD_EVENT_NET_VERSION 0x00043415 +#define FMOD_EVENT_NET_VERSION 0x00043420 /* Default port that the target (game) will listen on Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodevent-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodevent-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodevent64-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodevent64-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodevent64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodevent64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventL-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventL-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventL64-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventL64-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventL64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventL64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventL.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventL.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnet-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnet-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnet64-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnet64-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnet64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnet64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnetL-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnetL-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnetL64-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnetL64-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnetL64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnetL64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnetL.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnetL.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnet.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodeventnet.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodevent.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/api/lib/libfmodevent.so differ diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/effects/Makefile fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/effects/Makefile --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/effects/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/effects/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o effects -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib + g++ -O3 -o effects -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib run: ./effects diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/info_only/Makefile fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/info_only/Makefile --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/info_only/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/info_only/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o info_only -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib + g++ -O3 -o info_only -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib run: ./info_only diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/load_data/Makefile fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/load_data/Makefile --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/load_data/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/load_data/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o load_data -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib + g++ -O3 -o load_data -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib run: ./load_data diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/max_playbacks/Makefile fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/max_playbacks/Makefile --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/max_playbacks/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/max_playbacks/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o max_playbacks -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib + g++ -O3 -o max_playbacks -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib run: ./max_playbacks diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/parameters/Makefile fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/parameters/Makefile --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/parameters/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/parameters/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o parameters -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib + g++ -O3 -o parameters -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib run: ./parameters diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/programmer_selected/Makefile fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/programmer_selected/Makefile --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/programmer_selected/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/programmer_selected/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o programmer_selected -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib + g++ -O3 -o programmer_selected -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib run: ./programmer_selected diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/programmer_sound/Makefile fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/programmer_sound/Makefile --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/programmer_sound/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/programmer_sound/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o programmer_sound -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib + g++ -O3 -o programmer_sound -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib run: ./programmer_sound diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/realtime_tweaking/Makefile fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/realtime_tweaking/Makefile --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/realtime_tweaking/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/realtime_tweaking/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o realtime_tweaking -I../../../api/inc main.cpp ../../api/lib/libfmodeventnet.so -Wl,-rpath ../../../api/lib -Wl,-rpath ../../api/lib + g++ -O3 -o realtime_tweaking -I../../../api/inc main.cpp ../../api/lib/libfmodeventnet64.so -Wl,-rpath ../../../api/lib -Wl,-rpath ../../api/lib run: ./realtime_tweaking diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/RUN_BUILD_MEDIA_FILES.txt fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/RUN_BUILD_MEDIA_FILES.txt --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/RUN_BUILD_MEDIA_FILES.txt 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/RUN_BUILD_MEDIA_FILES.txt 1970-01-01 00:00:00.000000000 +0000 @@ -1 +0,0 @@ -Run the build_media_files.sh shell script (in the media directory ./media) to build the media files required for these examples. diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/simple_event/Makefile fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/simple_event/Makefile --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/examples/simple_event/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/examples/simple_event/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o simple_event -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib + g++ -O3 -o simple_event -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib run: ./simple_event diff -Nru fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/README.TXT fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/README.TXT --- fmodex-4.34.15/=unpacked-tar1=/fmoddesignerapi/README.TXT 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/fmoddesignerapi/README.TXT 2012-01-17 23:05:57.000000000 +0000 @@ -1,5 +1,5 @@ ---------------------------------------------------------------------------- - FMOD Designer 4.34.15 + FMOD Designer 4.34.20 Copyright (c) Firelight Technologies Pty, Ltd, 2004-2011 ---------------------------------------------------------------------------- diff -Nru fmodex-4.34.15/=unpacked-tar1=/Makefile fmodex-4.34.20/=unpacked-tar1=/Makefile --- fmodex-4.34.15/=unpacked-tar1=/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/Makefile 2012-01-17 23:05:57.000000000 +0000 @@ -1,4 +1,4 @@ -VERSION = 4.34.15 +VERSION = 4.34.20 LIBDIR = api/lib HDRDIR = api/inc DESTLIBDIR = /usr/local/lib @@ -49,8 +49,8 @@ install: @echo "Installing FMOD Ex libraries and headers..." - cp -f ${LIBDIR}/libfmodex-${VERSION}.so ${DESTLIBDIR} - cp -f ${LIBDIR}/libfmodexL-${VERSION}.so ${DESTLIBDIR} + cp -f ${LIBDIR}/libfmodex64-${VERSION}.so ${DESTLIBDIR} + cp -f ${LIBDIR}/libfmodexL64-${VERSION}.so ${DESTLIBDIR} ldconfig -n ${DESTLIBDIR} mkdir -p ${DESTHDRDIR} cp -f ${HDRDIR}/*.h* ${DESTHDRDIR} @@ -58,8 +58,8 @@ uninstall: @echo "Uninstalling FMOD Ex libraries..." - rm -f ${DESTLIBDIR}/libfmodex-${VERSION}.so - rm -f ${DESTLIBDIR}/libfmodexL-${VERSION}.so + rm -f ${DESTLIBDIR}/libfmodex64-${VERSION}.so + rm -f ${DESTLIBDIR}/libfmodexL64-${VERSION}.so ldconfig -n ${DESTLIBDIR} rm -rf ${DESTHDRDIR} @echo "done." Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/tools/fsbanklib/celt_encoder.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/tools/fsbanklib/celt_encoder.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/tools/fsbanklib/example and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/tools/fsbanklib/example differ diff -Nru fmodex-4.34.15/=unpacked-tar1=/tools/fsbanklib/fsbank.h fmodex-4.34.20/=unpacked-tar1=/tools/fsbanklib/fsbank.h --- fmodex-4.34.15/=unpacked-tar1=/tools/fsbanklib/fsbank.h 2011-11-17 04:55:29.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/tools/fsbanklib/fsbank.h 2012-01-17 23:13:18.000000000 +0000 @@ -3,6 +3,8 @@ #if defined(_WIN32) #define FB_API __declspec(dllexport) _stdcall +#elif defined(__linux__) + #define FB_API __attribute__ ((visibility("default"))) #else #define FB_API #endif Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/tools/fsbanklib/libfsbankex64.a and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/tools/fsbanklib/libfsbankex64.a differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/tools/fsbanklib/libfsbankex.a and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/tools/fsbanklib/libfsbankex.a differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/tools/fsbanklib/libmp3lame.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/tools/fsbanklib/libmp3lame.so differ diff -Nru fmodex-4.34.15/=unpacked-tar1=/tools/fsbanklib/Makefile fmodex-4.34.20/=unpacked-tar1=/tools/fsbanklib/Makefile --- fmodex-4.34.15/=unpacked-tar1=/tools/fsbanklib/Makefile 2011-11-17 04:51:02.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar1=/tools/fsbanklib/Makefile 2012-01-17 23:05:56.000000000 +0000 @@ -1,5 +1,5 @@ all: example.cpp - g++ -O3 -o example example.cpp libfsbankex.a ../../api/lib/libfmodex.so + g++ -O3 -o example example.cpp libfsbankex64.a ../../api/lib/libfmodex64.so clean: rm -f example Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar1=/tools/fsbanklib/twolame.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar1=/tools/fsbanklib/twolame.so differ diff -Nru fmodex-4.34.15/=unpacked-tar2=/api/inc/fmod_dsp.h fmodex-4.34.20/=unpacked-tar2=/api/inc/fmod_dsp.h --- fmodex-4.34.15/=unpacked-tar2=/api/inc/fmod_dsp.h 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/api/inc/fmod_dsp.h 2012-01-17 23:06:05.000000000 +0000 @@ -81,13 +81,6 @@ [REMARKS] Members marked with [r] mean the variable is modified by FMOD and is for reading purposes only. Do not change this value.
Members marked with [w] mean the variable can be written to. The user can set the value.
-
- The step parameter tells the gui or application that the parameter has a certain granularity.
- For example in the example of cutoff frequency with a range from 100.0 to 22050.0 you might only want the selection to be in 10hz increments. For this you would simply use 10.0 as the step value.
- For a boolean, you can use min = 0.0, max = 1.0, step = 1.0. This way the only possible values are 0.0 and 1.0.
- Some applications may detect min = 0.0, max = 1.0, step = 1.0 and replace a graphical slider bar with a checkbox instead.
- A step value of 1.0 would simulate integer values only.
- A step value of 0.0 would mean the full floating point range is accessable.
[PLATFORMS] Win32, Win64, Linux, Linux64, Macintosh, Xbox360, PlayStation 2, PlayStation Portable, PlayStation 3, Wii, iPhone diff -Nru fmodex-4.34.15/=unpacked-tar2=/api/inc/fmod.h fmodex-4.34.20/=unpacked-tar2=/api/inc/fmod.h --- fmodex-4.34.15/=unpacked-tar2=/api/inc/fmod.h 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/api/inc/fmod.h 2012-01-17 23:06:05.000000000 +0000 @@ -16,7 +16,7 @@ 0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number. */ -#define FMOD_VERSION 0x00043415 +#define FMOD_VERSION 0x00043420 /* Compiler specific settings. @@ -27,25 +27,25 @@ #define F_STDCALL __stdcall #define F_DECLSPEC __declspec #define F_DLLEXPORT ( dllexport ) -#elif (defined(WIN32) || defined(__WIN32__) || defined(_WIN64) || defined(_XBOX)) +#elif defined(WIN32) || defined(_WIN32) || defined(__WIN32__) || defined(_WIN64) #define F_CDECL _cdecl #define F_STDCALL _stdcall #define F_DECLSPEC __declspec #define F_DLLEXPORT ( dllexport ) -#elif defined(__MACH__) || defined (ANDROID) +#elif defined(__MACH__) || defined (ANDROID) || defined(__linux__) #define F_CDECL #define F_STDCALL #define F_DECLSPEC #define F_DLLEXPORT __attribute__ ((visibility("default"))) #else - #define F_STDCALL #define F_CDECL + #define F_STDCALL #define F_DECLSPEC #define F_DLLEXPORT #endif #ifdef DLL_EXPORTS - #if defined(__MACH__) || defined(ANDROID) + #if defined(__MACH__) || defined(ANDROID) || defined(__linux__) #define F_API __attribute__ ((visibility("default"))) #else #define F_API __declspec(dllexport) F_STDCALL Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/api/lib/libfmodex-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/api/lib/libfmodex-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/api/lib/libfmodex64-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/api/lib/libfmodex64-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/api/lib/libfmodex64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/api/lib/libfmodex64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/api/lib/libfmodexL-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/api/lib/libfmodexL-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/api/lib/libfmodexL64-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/api/lib/libfmodexL64-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/api/lib/libfmodexL64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/api/lib/libfmodexL64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/api/lib/libfmodexL.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/api/lib/libfmodexL.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/api/lib/libfmodex.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/api/lib/libfmodex.so differ diff -Nru fmodex-4.34.15/=unpacked-tar2=/documentation/revision.txt fmodex-4.34.20/=unpacked-tar2=/documentation/revision.txt --- fmodex-4.34.15/=unpacked-tar2=/documentation/revision.txt 2011-11-17 04:26:03.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/documentation/revision.txt 2012-01-17 23:06:07.000000000 +0000 @@ -10,6 +10,40 @@ ! Important - Take note! =============================================================================== +18/01/12 4.34.20 - Stable branch update +---------------------------------------------------- + +- Fixed memory leak when using Channel::setSpeakerLevels. + +- Linux - Fixed missing symbol at runtime when using older distros. + +- Event API - Fixed event playback bugs when virtual channel count is exceeded + + +28/12/11 4.34.19 - Stable branch update +---------------------------------------------------- + +* Xbox 360 - Now built with XDK 21076.6 + +14/12/11 4.34.18 - Stable branch update +---------------------------------------------------- + +- Fixed MPEG FSB seeking accuracy issues. + +- Xbox 360 - Fix XMA seeking seeking/looping to the wrong position for streams. + +12/12/11 4.34.17 - Stable branch update +---------------------------------------------------- + +- Linux - Fixed dynamic linker error that would cause some distros to fail loading. + +28/11/11 4.34.16 - Stable branch update +---------------------------------------------------- + +- Fixed MIDI pan not working in .MID playback. +- Fixed certain speaker levels in DSPConnection and Channel not being correctly + applied. + 17/11/11 4.34.15 - Stable branch update ---------------------------------------------------- diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/3d/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/3d/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/3d/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/3d/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ 3d_cpp: main.cpp - g++ -O3 -o 3d main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o 3d main.cpp ../../api/lib/libfmodex.so -pthread -ldl 3d_c: main.c - g++ -O3 -o 3d main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o 3d main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./3d diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/cdplayer/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/cdplayer/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/cdplayer/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/cdplayer/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ cdplayer_cpp: main.cpp - g++ -O3 -o cdplayer main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o cdplayer main.cpp ../../api/lib/libfmodex.so -pthread -ldl cdplayer_c: main.c - g++ -O3 -o cdplayer main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o cdplayer main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./cdplayer diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/channelgroups/main.c fmodex-4.34.20/=unpacked-tar2=/examples/channelgroups/main.c --- fmodex-4.34.15/=unpacked-tar2=/examples/channelgroups/main.c 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/channelgroups/main.c 2012-01-17 23:06:05.000000000 +0000 @@ -71,9 +71,9 @@ result = FMOD_System_GetMasterChannelGroup(system, &masterGroup); ERRCHECK(result); - printf("===================================================================\n"); + printf("=======================================================================\n"); printf("ChannelGroups Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("===================================================================\n"); + printf("=======================================================================\n"); printf("\n"); printf("Group A : drumloop.wav, jaguar.wav, swish.wav\n"); printf("Group B : c.ogg, d.ogg, e.ogg\n"); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/channelgroups/main.cpp fmodex-4.34.20/=unpacked-tar2=/examples/channelgroups/main.cpp --- fmodex-4.34.15/=unpacked-tar2=/examples/channelgroups/main.cpp 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/channelgroups/main.cpp 2012-01-17 23:06:05.000000000 +0000 @@ -71,9 +71,9 @@ result = system->getMasterChannelGroup(&masterGroup); ERRCHECK(result); - printf("===================================================================\n"); + printf("=======================================================================\n"); printf("ChannelGroups Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("===================================================================\n"); + printf("=======================================================================\n"); printf("\n"); printf("Group A : drumloop.wav, jaguar.wav, swish.wav\n"); printf("Group B : c.ogg, d.ogg, e.ogg\n"); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/channelgroups/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/channelgroups/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/channelgroups/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/channelgroups/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ channelgroups_cpp: main.cpp - g++ -O3 -o channelgroups main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o channelgroups main.cpp ../../api/lib/libfmodex.so -pthread -ldl channelgroups_c: main.c - g++ -O3 -o channelgroups main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o channelgroups main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./channelgroups diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/dsp_custom/main.cpp fmodex-4.34.20/=unpacked-tar2=/examples/dsp_custom/main.cpp --- fmodex-4.34.15/=unpacked-tar2=/examples/dsp_custom/main.cpp 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/dsp_custom/main.cpp 2012-01-17 23:06:05.000000000 +0000 @@ -95,9 +95,9 @@ result = system->createSound("../media/drumloop.wav", FMOD_SOFTWARE | FMOD_LOOP_NORMAL, 0, &sound); ERRCHECK(result); - printf("===============================================================================\n"); + printf("===================================================================\n"); printf("Custom DSP example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("===============================================================================\n"); + printf("===================================================================\n"); printf("Press 'f' to activate, deactivate user filter\n"); printf("Press 'Esc' to quit\n"); printf("\n"); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/dsp_custom/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/dsp_custom/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/dsp_custom/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/dsp_custom/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ dsp_custom_cpp: main.cpp - g++ -O3 -o dsp_custom main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o dsp_custom main.cpp ../../api/lib/libfmodex.so -pthread -ldl dsp_custom_c: main.c - g++ -O3 -o dsp_custom main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o dsp_custom main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./dsp_custom diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/dsp_effectperspeaker/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/dsp_effectperspeaker/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/dsp_effectperspeaker/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/dsp_effectperspeaker/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ dsp_effectperspeaker_cpp: main.cpp - g++ -O3 -o dsp_effectperspeaker main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o dsp_effectperspeaker main.cpp ../../api/lib/libfmodex.so -pthread -ldl dsp_effectperspeaker_c: main.c - g++ -O3 -o dsp_effectperspeaker main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o dsp_effectperspeaker main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./dsp_effectperspeaker diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/effects/main.c fmodex-4.34.20/=unpacked-tar2=/examples/effects/main.c --- fmodex-4.34.15/=unpacked-tar2=/examples/effects/main.c 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/effects/main.c 2012-01-17 23:06:05.000000000 +0000 @@ -63,9 +63,9 @@ result = FMOD_System_CreateSound(system, "../media/drumloop.wav", FMOD_SOFTWARE, 0, &sound); ERRCHECK(result); - printf("===================================================================\n"); + printf("=================================================================\n"); printf("Effects Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("===================================================================\n"); + printf("=================================================================\n"); printf("\n"); printf("Press SPACE to paused/unpause sound.\n"); printf("Press 1 to toggle dsplowpass effect.\n"); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/effects/main.cpp fmodex-4.34.20/=unpacked-tar2=/examples/effects/main.cpp --- fmodex-4.34.15/=unpacked-tar2=/examples/effects/main.cpp 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/effects/main.cpp 2012-01-17 23:06:05.000000000 +0000 @@ -63,9 +63,9 @@ result = system->createSound("../media/drumloop.wav", FMOD_SOFTWARE, 0, &sound); ERRCHECK(result); - printf("===================================================================\n"); + printf("=================================================================\n"); printf("Effects Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("===================================================================\n"); + printf("=================================================================\n"); printf("\n"); printf("Press SPACE to paused/unpause sound.\n"); printf("Press 1 to toggle dsplowpass effect.\n"); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/effects/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/effects/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/effects/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/effects/Makefile 2012-01-17 23:06:04.000000000 +0000 @@ -1,8 +1,8 @@ effects_cpp: main.cpp - g++ -O3 -o effects main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o effects main.cpp ../../api/lib/libfmodex.so -pthread -ldl effects_c: main.c - g++ -O3 -o effects main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o effects main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./effects diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/filecallbacks/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/filecallbacks/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/filecallbacks/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/filecallbacks/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ filecallbacks_cpp: main.cpp - g++ -O3 -o filecallbacks main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o filecallbacks main.cpp ../../api/lib/libfmodex.so -pthread -ldl filecallbacks_c: main.c - g++ -O3 -o filecallbacks main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o filecallbacks main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./filecallbacks diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/generatetone/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/generatetone/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/generatetone/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/generatetone/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ generatetone_cpp: main.cpp - g++ -O3 -o generatetone main.cpp ../../api/lib/libfmodex64.so + g++ -O3 -o generatetone main.cpp ../../api/lib/libfmodex.so -pthread -ldl generatetone_c: main.c - g++ -O3 -o generatetone main.c ../../api/lib/libfmodex64.so + g++ -O3 -o generatetone main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./generatetone diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/loadfrommemory/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/loadfrommemory/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/loadfrommemory/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/loadfrommemory/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ loadfrommemory_cpp: main.cpp - g++ -O3 -o loadfrommemory main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o loadfrommemory main.cpp ../../api/lib/libfmodex.so -pthread -ldl loadfrommemory_c: main.c - g++ -O3 -o loadfrommemory main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o loadfrommemory main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./loadfrommemory diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/media/playlist.m3u fmodex-4.34.20/=unpacked-tar2=/examples/media/playlist.m3u --- fmodex-4.34.15/=unpacked-tar2=/examples/media/playlist.m3u 1970-01-01 00:00:00.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/media/playlist.m3u 2012-01-17 23:06:05.000000000 +0000 @@ -0,0 +1,11 @@ +#EXTM3U +#EXTINF:11,Unknown - FMOD example wave +wave.mp3 +#EXTINF:1,swish +swish.wav +#EXTINF:2,stereo +stereo.ogg +#EXTINF:1,jaguar +jaguar.wav +#EXTINF:0,drumloop +drumloop.wav diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/multiplesoundcard/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/multiplesoundcard/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/multiplesoundcard/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/multiplesoundcard/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ multiplesoundcard_cpp: main.cpp - g++ -O3 -o multiplesoundcard main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o multiplesoundcard main.cpp ../../api/lib/libfmodex.so -pthread -ldl multiplesoundcard_c: main.c - g++ -O3 -o multiplesoundcard main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o multiplesoundcard main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./multiplesoundcard diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/multispeakeroutput/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/multispeakeroutput/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/multispeakeroutput/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/multispeakeroutput/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ multispeakeroutput_cpp: main.cpp - g++ -O3 -o multispeakeroutput main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o multispeakeroutput main.cpp ../../api/lib/libfmodex.so -pthread -ldl multispeakeroutput_c: main.c - g++ -O3 -o multispeakeroutput main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o multispeakeroutput main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./multispeakeroutput diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/netstream/main.cpp fmodex-4.34.20/=unpacked-tar2=/examples/netstream/main.cpp --- fmodex-4.34.15/=unpacked-tar2=/examples/netstream/main.cpp 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/netstream/main.cpp 2012-01-17 23:06:05.000000000 +0000 @@ -116,7 +116,7 @@ } if (tag.datatype == FMOD_TAGDATATYPE_STRING) { - printf("%s = %s (%d bytes)\n", tag.name, tag.data, tag.datalen); + printf("%s = %s (%d bytes)\n", tag.name, (char *)tag.data, tag.datalen); } } @@ -134,7 +134,8 @@ channel->setMute(starving); ERRCHECK(result); - printf("Time %02d:%02d:%02d : %s : (%3d%%%) %s \r", ms / 1000 / 60, ms / 1000 % 60, ms / 10 % 100, openstate == FMOD_OPENSTATE_BUFFERING ? "Buffering..." : openstate == FMOD_OPENSTATE_CONNECTING ? "Connecting..." : paused ? "Paused " : playing ? "Playing " : "Stopped ", percent, starving ? "STARVING" : " "); + printf("Time %02d:%02d:%02d : %s : (%3d%%) %s \r", ms / 1000 / 60, ms / 1000 % 60, ms / 10 % 100, openstate == FMOD_OPENSTATE_BUFFERING ? "Buffering..." : openstate == FMOD_OPENSTATE_CONNECTING ? "Connecting..." : paused ? "Paused " : playing ? "Playing " : "Stopped ", percent, starving ? "STARVING" : " "); + fflush(stdout); Sleep(10); @@ -144,6 +145,12 @@ printf("Shutting down.\n"); + if (channel) + { + result = channel->stop(); + ERRCHECK(result); + } + /* If we pressed escape before it is ready, wait for it to finish opening before we release it. */ @@ -160,6 +167,7 @@ } printf("Waiting for sound to finish opening before trying to release it....\r"); + fflush(stdout); Sleep(10); } while (1); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/netstream/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/netstream/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/netstream/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/netstream/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ netstream_cpp: main.cpp - g++ -O3 -o netstream main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o netstream main.cpp ../../api/lib/libfmodex.so -pthread -ldl netstream_c: main.c - g++ -O3 -o netstream main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o netstream main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./netstream diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/offlinedecoding/main.c fmodex-4.34.20/=unpacked-tar2=/examples/offlinedecoding/main.c --- fmodex-4.34.15/=unpacked-tar2=/examples/offlinedecoding/main.c 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/offlinedecoding/main.c 2012-01-17 23:06:05.000000000 +0000 @@ -52,9 +52,9 @@ result = FMOD_System_CreateStream(system, "../media/wave.mp3", FMOD_OPENONLY | FMOD_ACCURATETIME, 0, &sound); ERRCHECK(result); - printf("===============================================================================\n"); + printf("==========================================================================\n"); printf("Offline Decoding Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("===============================================================================\n"); + printf("==========================================================================\n"); printf("\n"); printf("This program will open wave.mp3 and decode it into wave.raw using the\n"); printf("FMOD_Sound_ReadData function.\n"); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/offlinedecoding/main.cpp fmodex-4.34.20/=unpacked-tar2=/examples/offlinedecoding/main.cpp --- fmodex-4.34.15/=unpacked-tar2=/examples/offlinedecoding/main.cpp 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/offlinedecoding/main.cpp 2012-01-17 23:06:05.000000000 +0000 @@ -52,9 +52,9 @@ result = system->createStream("../media/wave.mp3", FMOD_OPENONLY | FMOD_ACCURATETIME, 0, &sound); ERRCHECK(result); - printf("===============================================================================\n"); + printf("==========================================================================\n"); printf("Offline Decoding Example. Copyright (c) Firelight Technologies 2004-2011.\n"); - printf("===============================================================================\n"); + printf("==========================================================================\n"); printf("\n"); printf("This program will open wave.mp3 and decode it into wave.raw using the\n"); printf("Sound::readData function.\n"); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/offlinedecoding/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/offlinedecoding/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/offlinedecoding/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/offlinedecoding/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ offlinedecoding_cpp: main.cpp - g++ -O3 -o offlinedecoding main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o offlinedecoding main.cpp ../../api/lib/libfmodex.so -pthread -ldl offlinedecoding_c: main.c - g++ -O3 -o offlinedecoding main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o offlinedecoding main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./offlinedecoding diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/pitchdetection/main.c fmodex-4.34.20/=unpacked-tar2=/examples/pitchdetection/main.c --- fmodex-4.34.15/=unpacked-tar2=/examples/pitchdetection/main.c 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/pitchdetection/main.c 2012-01-17 23:06:05.000000000 +0000 @@ -87,9 +87,10 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -106,6 +107,8 @@ break; case '3' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_ESD); break; + case '4' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_PULSEAUDIO); + break; default : return 1; } ERRCHECK(result); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/pitchdetection/main.cpp fmodex-4.34.20/=unpacked-tar2=/examples/pitchdetection/main.cpp --- fmodex-4.34.15/=unpacked-tar2=/examples/pitchdetection/main.cpp 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/pitchdetection/main.cpp 2012-01-17 23:06:05.000000000 +0000 @@ -87,9 +87,10 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -106,6 +107,8 @@ break; case '3' : result = system->setOutput(FMOD_OUTPUTTYPE_ESD); break; + case '4' : result = system->setOutput(FMOD_OUTPUTTYPE_PULSEAUDIO); + break; default : return 1; } ERRCHECK(result); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/pitchdetection/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/pitchdetection/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/pitchdetection/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/pitchdetection/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ pitchdetection_cpp: main.cpp - g++ -O3 -o pitchdetection main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o pitchdetection main.cpp ../../api/lib/libfmodex.so -pthread -ldl pitchdetection_c: main.c - g++ -O3 -o pitchdetection main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o pitchdetection main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./pitchdetection diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/playlist/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/playlist/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/playlist/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/playlist/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ playlist_cpp: main.cpp - g++ -O3 -o playlist main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o playlist main.cpp ../../api/lib/libfmodex.so -pthread -ldl playlist_c: main.c - g++ -O3 -o playlist main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o playlist main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./playlist diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/playsound/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/playsound/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/playsound/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/playsound/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ playsound_cpp: main.cpp - g++ -O3 -o playsound main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o playsound main.cpp ../../api/lib/libfmodex.so -pthread -ldl playsound_c: main.c - gcc -O3 -o playsound main.c ../../api/lib/libfmodex64.so -pthread + gcc -O3 -o playsound main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./playsound diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/playstream/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/playstream/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/playstream/Makefile 2011-11-17 04:25:56.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/playstream/Makefile 2012-01-17 23:06:04.000000000 +0000 @@ -1,8 +1,8 @@ playstream_cpp: main.cpp - g++ -O3 -o playstream main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o playstream main.cpp ../../api/lib/libfmodex.so -pthread -ldl playstream_c: main.c - g++ -O3 -o playstream main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o playstream main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./playstream diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/readtags/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/readtags/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/readtags/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/readtags/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ readtags_cpp: main.cpp - g++ -O3 -o readtags main.cpp ../../api/lib/libfmodex64.so + g++ -O3 -o readtags main.cpp ../../api/lib/libfmodex.so -pthread -ldl readtags_c: main.c - g++ -O3 -o readtags main.c ../../api/lib/libfmodex64.so + g++ -O3 -o readtags main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./readtags diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/realtimestitching/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/realtimestitching/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/realtimestitching/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/realtimestitching/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ realtimestitching_cpp: main.cpp - g++ -O3 -o realtimestitching main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o realtimestitching main.cpp ../../api/lib/libfmodex.so -pthread -ldl realtimestitching_c: main.c - g++ -O3 -o realtimestitching main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o realtimestitching main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./realtimestitching diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/recording/main.c fmodex-4.34.20/=unpacked-tar2=/examples/recording/main.c --- fmodex-4.34.15/=unpacked-tar2=/examples/recording/main.c 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/recording/main.c 2012-01-17 23:06:05.000000000 +0000 @@ -158,9 +158,10 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -177,6 +178,8 @@ break; case '3' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_ESD); break; + case '4' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_PULSEAUDIO); + break; default : return 1; } ERRCHECK(result); @@ -251,13 +254,16 @@ printf("\n"); + result = FMOD_System_SetRecordDriver(system, recorddriver, driver); + ERRCHECK(result); + result = FMOD_System_Init(system, 32, FMOD_INIT_NORMAL, NULL); ERRCHECK(result); memset(&exinfo, 0, sizeof(FMOD_CREATESOUNDEXINFO)); exinfo.cbsize = sizeof(FMOD_CREATESOUNDEXINFO); - exinfo.numchannels = 1; + exinfo.numchannels = 2; exinfo.format = FMOD_SOUND_FORMAT_PCM16; exinfo.defaultfrequency = 44100; exinfo.length = exinfo.defaultfrequency * sizeof(short) * exinfo.numchannels * 5; @@ -373,6 +379,7 @@ FMOD_System_Update(system); + fflush(stdout); Sleep(10); } while (key != 27); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/recording/main.cpp fmodex-4.34.20/=unpacked-tar2=/examples/recording/main.cpp --- fmodex-4.34.15/=unpacked-tar2=/examples/recording/main.cpp 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/recording/main.cpp 2012-01-17 23:06:05.000000000 +0000 @@ -158,9 +158,10 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -177,6 +178,8 @@ break; case '3' : result = system->setOutput(FMOD_OUTPUTTYPE_ESD); break; + case '4' : result = system->setOutput(FMOD_OUTPUTTYPE_PULSEAUDIO); + break; default : return 1; } ERRCHECK(result); @@ -257,7 +260,7 @@ memset(&exinfo, 0, sizeof(FMOD_CREATESOUNDEXINFO)); exinfo.cbsize = sizeof(FMOD_CREATESOUNDEXINFO); - exinfo.numchannels = 1; + exinfo.numchannels = 2; exinfo.format = FMOD_SOUND_FORMAT_PCM16; exinfo.defaultfrequency = 44100; exinfo.length = exinfo.defaultfrequency * sizeof(short) * exinfo.numchannels * 5; @@ -372,6 +375,7 @@ system->update(); + fflush(stdout); Sleep(10); } while (key != 27); diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/recording/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/recording/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/recording/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/recording/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ recording_cpp: main.cpp - g++ -O3 -o recording main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o recording main.cpp ../../api/lib/libfmodex.so -pthread -ldl recording_c: main.c - g++ -O3 -o recording main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o recording main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./recording diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/recordtodisk/main.c fmodex-4.34.20/=unpacked-tar2=/examples/recordtodisk/main.c --- fmodex-4.34.15/=unpacked-tar2=/examples/recordtodisk/main.c 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/recordtodisk/main.c 2012-01-17 23:06:05.000000000 +0000 @@ -109,7 +109,7 @@ FMOD_SOUND *sound = 0; FMOD_RESULT result; FMOD_CREATESOUNDEXINFO exinfo; - int key, driver, numdrivers, count; + int key, recorddriver, numdrivers, count; unsigned int version; FILE *fp; unsigned int datalength = 0, soundlength; @@ -135,9 +135,10 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -154,6 +155,8 @@ break; case '3' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_ESD); break; + case '4' : result = FMOD_System_SetOutput(system, FMOD_OUTPUTTYPE_PULSEAUDIO); + break; default : return 1; } ERRCHECK(result); @@ -180,6 +183,7 @@ printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); + recorddriver = 0; do { key = getch(); @@ -187,11 +191,11 @@ { return 0; } - driver = key - '1'; - } while (driver < 0 || driver >= numdrivers); + recorddriver = key - '1'; + } while (recorddriver < 0 || recorddriver >= numdrivers); printf("\n"); - + result = FMOD_System_Init(system, 32, FMOD_INIT_NORMAL, 0); ERRCHECK(result); @@ -215,7 +219,7 @@ getch(); - result = FMOD_System_RecordStart(system, driver, sound, TRUE); + result = FMOD_System_RecordStart(system, recorddriver, sound, TRUE); ERRCHECK(result); printf("Press 'Esc' to quit\n"); @@ -249,7 +253,7 @@ key = getch(); } - FMOD_System_GetRecordPosition(system, driver, &recordpos); + FMOD_System_GetRecordPosition(system, recorddriver, &recordpos); ERRCHECK(result); if (recordpos != lastrecordpos) diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/recordtodisk/main.cpp fmodex-4.34.20/=unpacked-tar2=/examples/recordtodisk/main.cpp --- fmodex-4.34.15/=unpacked-tar2=/examples/recordtodisk/main.cpp 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/recordtodisk/main.cpp 2012-01-17 23:06:05.000000000 +0000 @@ -109,7 +109,7 @@ FMOD::Sound *sound = 0; FMOD_RESULT result; FMOD_CREATESOUNDEXINFO exinfo; - int key, driver, numdrivers, count; + int key, recorddriver, numdrivers, count; unsigned int version; FILE *fp; unsigned int datalength = 0, soundlength; @@ -135,9 +135,10 @@ printf("---------------------------------------------------------\n"); printf("Select OUTPUT type\n"); printf("---------------------------------------------------------\n"); - printf("1 : OSS - Open Sound System\n"); - printf("2 : ALSA - Advanced Linux Sound Architecture\n"); - printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("1 : OSS - Open Sound System\n"); + printf("2 : ALSA - Advanced Linux Sound Architecture\n"); + printf("3 : ESD - Enlightenment Sound Daemon\n"); + printf("4 : PULSEAUDIO - Pulse Audio Sound Server\n"); printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); @@ -154,6 +155,8 @@ break; case '3' : result = system->setOutput(FMOD_OUTPUTTYPE_ESD); break; + case '4' : result = system->setOutput(FMOD_OUTPUTTYPE_PULSEAUDIO); + break; default : return 1; } ERRCHECK(result); @@ -180,6 +183,7 @@ printf("---------------------------------------------------------\n"); printf("Press a corresponding number or ESC to quit\n"); + recorddriver = 0; do { key = getch(); @@ -187,8 +191,8 @@ { return 0; } - driver = key - '1'; - } while (driver < 0 || driver >= numdrivers); + recorddriver = key - '1'; + } while (recorddriver < 0 || recorddriver >= numdrivers); printf("\n"); @@ -215,7 +219,7 @@ getch(); - result = system->recordStart(driver, sound, true); + result = system->recordStart(recorddriver, sound, true); ERRCHECK(result); printf("Press 'Esc' to quit\n"); @@ -249,7 +253,7 @@ key = getch(); } - system->getRecordPosition(driver, &recordpos); + system->getRecordPosition(recorddriver, &recordpos); ERRCHECK(result); if (recordpos != lastrecordpos) diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/recordtodisk/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/recordtodisk/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/recordtodisk/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/recordtodisk/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ recordtodisk_cpp: main.cpp - g++ -O3 -o recordtodisk main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o recordtodisk main.cpp ../../api/lib/libfmodex.so -pthread -ldl recordtodisk_c: main.c - g++ -O3 -o recordtodisk main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o recordtodisk main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./recordtodisk diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/ripnetstream/main.c fmodex-4.34.20/=unpacked-tar2=/examples/ripnetstream/main.c --- fmodex-4.34.15/=unpacked-tar2=/examples/ripnetstream/main.c 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/ripnetstream/main.c 2012-01-17 23:06:05.000000000 +0000 @@ -293,7 +293,7 @@ { FMOD_OPENSTATE openstate = FMOD_OPENSTATE_READY; - FMOD_Sound_GetOpenState(sound, &openstate, 0, 0); + FMOD_Sound_GetOpenState(sound, &openstate, 0, 0, 0); if (openstate == FMOD_OPENSTATE_ERROR) { diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/ripnetstream/main.cpp fmodex-4.34.20/=unpacked-tar2=/examples/ripnetstream/main.cpp --- fmodex-4.34.15/=unpacked-tar2=/examples/ripnetstream/main.cpp 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/ripnetstream/main.cpp 2012-01-17 23:06:05.000000000 +0000 @@ -293,7 +293,7 @@ { FMOD_OPENSTATE openstate = FMOD_OPENSTATE_READY; - sound->getOpenState(&openstate, 0, 0); + sound->getOpenState(&openstate, 0, 0, 0); if (openstate == FMOD_OPENSTATE_ERROR) { diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/ripnetstream/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/ripnetstream/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/ripnetstream/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/ripnetstream/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ ripnetstream_cpp: main.cpp - g++ -O3 -o ripnetstream main.cpp ../../api/lib/libfmodex64.so + g++ -O3 -o ripnetstream main.cpp ../../api/lib/libfmodex.so -pthread -ldl ripnetstream_c: main.c - g++ -O3 -o ripnetstream main.c ../../api/lib/libfmodex64.so + g++ -O3 -o ripnetstream main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./ripnetstream diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/submixing/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/submixing/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/submixing/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/submixing/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ submixing_cpp: main.cpp - g++ -O3 -o submixing main.cpp ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o submixing main.cpp ../../api/lib/libfmodex.so -pthread -ldl submixing_c: main.c - g++ -O3 -o submixing main.c ../../api/lib/libfmodex64.so -pthread + g++ -O3 -o submixing main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./submixing diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/useplugins/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/useplugins/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/useplugins/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/useplugins/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ useplugins_cpp: main.cpp - g++ -O3 -o useplugins main.cpp ../../api/lib/libfmodexp64.so -pthread + g++ -O3 -o useplugins main.cpp ../../api/lib/libfmodex.so -pthread -ldl useplugins_c: main.c - g++ -O3 -o useplugins main.c ../../api/lib/libfmodexp64.so -pthread + g++ -O3 -o useplugins main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./useplugins diff -Nru fmodex-4.34.15/=unpacked-tar2=/examples/usercreatedsound/Makefile fmodex-4.34.20/=unpacked-tar2=/examples/usercreatedsound/Makefile --- fmodex-4.34.15/=unpacked-tar2=/examples/usercreatedsound/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/examples/usercreatedsound/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,8 +1,8 @@ usercreatedsound_cpp: main.cpp - g++ -O3 -o usercreatedsound main.cpp ../../api/lib/libfmodex64.so + g++ -O3 -o usercreatedsound main.cpp ../../api/lib/libfmodex.so -pthread -ldl usercreatedsound_c: main.c - g++ -O3 -o usercreatedsound main.c ../../api/lib/libfmodex64.so + g++ -O3 -o usercreatedsound main.c ../../api/lib/libfmodex.so -pthread -ldl run: ./usercreatedsound diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/inc/fmod_event.h fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/inc/fmod_event.h --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/inc/fmod_event.h 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/inc/fmod_event.h 2012-01-17 23:06:06.000000000 +0000 @@ -21,7 +21,7 @@ 0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number. */ -#define FMOD_EVENT_VERSION 0x00043415 +#define FMOD_EVENT_VERSION 0x00043420 /* FMOD event types diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/inc/fmod_event_net.h fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/inc/fmod_event_net.h --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/inc/fmod_event_net.h 2011-11-17 04:26:03.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/inc/fmod_event_net.h 2012-01-17 23:06:07.000000000 +0000 @@ -18,7 +18,7 @@ FMOD NetEventSystem version number. Check this against NetEventSystem_GetVersion. 0xaaaabbcc -> aaaa = major version number. bb = minor version number. cc = development version number. */ -#define FMOD_EVENT_NET_VERSION 0x00043415 +#define FMOD_EVENT_NET_VERSION 0x00043420 /* Default port that the target (game) will listen on Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodevent-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodevent-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodevent64-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodevent64-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodevent64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodevent64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventL-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventL-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventL64-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventL64-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventL64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventL64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventL.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventL.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnet-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnet-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnet64-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnet64-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnet64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnet64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnetL-4.34.20.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnetL-4.34.20.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnetL64-4.34.15.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnetL64-4.34.15.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnetL64.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnetL64.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnetL.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnetL.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnet.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodeventnet.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodevent.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/api/lib/libfmodevent.so differ diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/effects/Makefile fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/effects/Makefile --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/effects/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/effects/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o effects -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib + g++ -O3 -o effects -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib -pthread -ldl -pthread -ldl run: ./effects diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/info_only/Makefile fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/info_only/Makefile --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/info_only/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/info_only/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o info_only -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib + g++ -O3 -o info_only -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib -pthread -ldl run: ./info_only diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/load_data/Makefile fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/load_data/Makefile --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/load_data/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/load_data/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o load_data -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib + g++ -O3 -o load_data -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib -pthread -ldl run: ./load_data diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/max_playbacks/Makefile fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/max_playbacks/Makefile --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/max_playbacks/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/max_playbacks/Makefile 2012-01-17 23:06:04.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o max_playbacks -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib + g++ -O3 -o max_playbacks -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib -pthread -ldl run: ./max_playbacks diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/parameters/Makefile fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/parameters/Makefile --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/parameters/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/parameters/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o parameters -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib + g++ -O3 -o parameters -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib -pthread -ldl run: ./parameters diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/programmer_selected/Makefile fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/programmer_selected/Makefile --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/programmer_selected/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/programmer_selected/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o programmer_selected -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib + g++ -O3 -o programmer_selected -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib -pthread -ldl run: ./programmer_selected diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/programmer_sound/Makefile fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/programmer_sound/Makefile --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/programmer_sound/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/programmer_sound/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o programmer_sound -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib + g++ -O3 -o programmer_sound -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib -pthread -ldl run: ./programmer_sound diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/realtime_tweaking/Makefile fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/realtime_tweaking/Makefile --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/realtime_tweaking/Makefile 2011-11-17 04:25:56.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/realtime_tweaking/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o realtime_tweaking -I../../../api/inc main.cpp ../../api/lib/libfmodeventnet64.so -Wl,-rpath ../../../api/lib -Wl,-rpath ../../api/lib + g++ -O3 -o realtime_tweaking -I../../../api/inc main.cpp ../../api/lib/libfmodeventnet.so -Wl,-rpath ../../../api/lib -pthread -ldl -Wl,-rpath ../../api/lib run: ./realtime_tweaking diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/RUN_BUILD_MEDIA_FILES.txt fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/RUN_BUILD_MEDIA_FILES.txt --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/RUN_BUILD_MEDIA_FILES.txt 1970-01-01 00:00:00.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/RUN_BUILD_MEDIA_FILES.txt 2012-01-17 23:06:05.000000000 +0000 @@ -0,0 +1 @@ +Run the build_media_files.sh shell script (in the media directory ./media) to build the media files required for these examples. diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/simple_event/Makefile fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/simple_event/Makefile --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/examples/simple_event/Makefile 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/examples/simple_event/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,5 +1,5 @@ all: main.cpp - g++ -O3 -o simple_event -I../../../api/inc main.cpp ../../api/lib/libfmodevent64.so -Wl,-rpath ../../../api/lib + g++ -O3 -o simple_event -I../../../api/inc main.cpp ../../api/lib/libfmodevent.so -Wl,-rpath ../../../api/lib -pthread -ldl run: ./simple_event diff -Nru fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/README.TXT fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/README.TXT --- fmodex-4.34.15/=unpacked-tar2=/fmoddesignerapi/README.TXT 2011-11-17 04:25:58.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/fmoddesignerapi/README.TXT 2012-01-17 23:06:06.000000000 +0000 @@ -1,5 +1,5 @@ ---------------------------------------------------------------------------- - FMOD Designer 4.34.15 + FMOD Designer 4.34.20 Copyright (c) Firelight Technologies Pty, Ltd, 2004-2011 ---------------------------------------------------------------------------- diff -Nru fmodex-4.34.15/=unpacked-tar2=/Makefile fmodex-4.34.20/=unpacked-tar2=/Makefile --- fmodex-4.34.15/=unpacked-tar2=/Makefile 2011-11-17 04:25:57.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/Makefile 2012-01-17 23:06:04.000000000 +0000 @@ -1,4 +1,4 @@ -VERSION = 4.34.15 +VERSION = 4.34.20 LIBDIR = api/lib HDRDIR = api/inc DESTLIBDIR = /usr/local/lib @@ -49,8 +49,8 @@ install: @echo "Installing FMOD Ex libraries and headers..." - cp -f ${LIBDIR}/libfmodex64-${VERSION}.so ${DESTLIBDIR} - cp -f ${LIBDIR}/libfmodexL64-${VERSION}.so ${DESTLIBDIR} + cp -f ${LIBDIR}/libfmodex-${VERSION}.so ${DESTLIBDIR} + cp -f ${LIBDIR}/libfmodexL-${VERSION}.so ${DESTLIBDIR} ldconfig -n ${DESTLIBDIR} mkdir -p ${DESTHDRDIR} cp -f ${HDRDIR}/*.h* ${DESTHDRDIR} @@ -58,8 +58,8 @@ uninstall: @echo "Uninstalling FMOD Ex libraries..." - rm -f ${DESTLIBDIR}/libfmodex64-${VERSION}.so - rm -f ${DESTLIBDIR}/libfmodexL64-${VERSION}.so + rm -f ${DESTLIBDIR}/libfmodex-${VERSION}.so + rm -f ${DESTLIBDIR}/libfmodexL-${VERSION}.so ldconfig -n ${DESTLIBDIR} rm -rf ${DESTHDRDIR} @echo "done." Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/tools/fsbanklib/celt_encoder.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/tools/fsbanklib/celt_encoder.so differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/tools/fsbanklib/example and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/tools/fsbanklib/example differ diff -Nru fmodex-4.34.15/=unpacked-tar2=/tools/fsbanklib/fsbank.h fmodex-4.34.20/=unpacked-tar2=/tools/fsbanklib/fsbank.h --- fmodex-4.34.15/=unpacked-tar2=/tools/fsbanklib/fsbank.h 2011-11-17 04:36:10.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/tools/fsbanklib/fsbank.h 2012-01-17 23:12:03.000000000 +0000 @@ -3,6 +3,8 @@ #if defined(_WIN32) #define FB_API __declspec(dllexport) _stdcall +#elif defined(__linux__) + #define FB_API __attribute__ ((visibility("default"))) #else #define FB_API #endif Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/tools/fsbanklib/libfsbankex64.a and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/tools/fsbanklib/libfsbankex64.a differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/tools/fsbanklib/libfsbankex.a and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/tools/fsbanklib/libfsbankex.a differ Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/tools/fsbanklib/libmp3lame.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/tools/fsbanklib/libmp3lame.so differ diff -Nru fmodex-4.34.15/=unpacked-tar2=/tools/fsbanklib/Makefile fmodex-4.34.20/=unpacked-tar2=/tools/fsbanklib/Makefile --- fmodex-4.34.15/=unpacked-tar2=/tools/fsbanklib/Makefile 2011-11-17 04:25:56.000000000 +0000 +++ fmodex-4.34.20/=unpacked-tar2=/tools/fsbanklib/Makefile 2012-01-17 23:06:05.000000000 +0000 @@ -1,5 +1,5 @@ all: example.cpp - g++ -O3 -o example example.cpp libfsbankex64.a ../../api/lib/libfmodex64.so + g++ -O3 -o example example.cpp libfsbankex.a ../../api/lib/libfmodex.so -pthread -ldl clean: rm -f example Binary files /tmp/jserMF5WMm/fmodex-4.34.15/=unpacked-tar2=/tools/fsbanklib/twolame.so and /tmp/h_ptIaYkFF/fmodex-4.34.20/=unpacked-tar2=/tools/fsbanklib/twolame.so differ