diff --git a/sources/fmod/fmod.h b/sources/fmod/include/fmod.h similarity index 100% rename from sources/fmod/fmod.h rename to sources/fmod/include/fmod.h diff --git a/sources/fmod/fmod.hpp b/sources/fmod/include/fmod.hpp similarity index 100% rename from sources/fmod/fmod.hpp rename to sources/fmod/include/fmod.hpp diff --git a/sources/fmod/fmod_codec.h b/sources/fmod/include/fmod_codec.h similarity index 100% rename from sources/fmod/fmod_codec.h rename to sources/fmod/include/fmod_codec.h diff --git a/sources/fmod/fmod_dsp.h b/sources/fmod/include/fmod_dsp.h similarity index 100% rename from sources/fmod/fmod_dsp.h rename to sources/fmod/include/fmod_dsp.h diff --git a/sources/fmod/fmod_errors.h b/sources/fmod/include/fmod_errors.h similarity index 100% rename from sources/fmod/fmod_errors.h rename to sources/fmod/include/fmod_errors.h diff --git a/sources/fmod/fmod_memoryinfo.h b/sources/fmod/include/fmod_memoryinfo.h similarity index 100% rename from sources/fmod/fmod_memoryinfo.h rename to sources/fmod/include/fmod_memoryinfo.h diff --git a/sources/fmod/fmod_output.h b/sources/fmod/include/fmod_output.h similarity index 100% rename from sources/fmod/fmod_output.h rename to sources/fmod/include/fmod_output.h diff --git a/sources/fmod/lib/libfmodex-4.44.33.so b/sources/fmod/lib/libfmodex-4.44.33.so new file mode 100755 index 0000000..6b97644 Binary files /dev/null and b/sources/fmod/lib/libfmodex-4.44.33.so differ diff --git a/sources/fmod/lib/libfmodex.dylib b/sources/fmod/lib/libfmodex.dylib new file mode 100644 index 0000000..fc259eb Binary files /dev/null and b/sources/fmod/lib/libfmodex.dylib differ diff --git a/sources/fmod/lib/libfmodex.so b/sources/fmod/lib/libfmodex.so new file mode 120000 index 0000000..c446bf0 --- /dev/null +++ b/sources/fmod/lib/libfmodex.so @@ -0,0 +1 @@ +libfmodex-4.44.33.so \ No newline at end of file diff --git a/sources/fmod/lib/libfmodex64-4.44.33.so b/sources/fmod/lib/libfmodex64-4.44.33.so new file mode 100755 index 0000000..e736475 Binary files /dev/null and b/sources/fmod/lib/libfmodex64-4.44.33.so differ diff --git a/sources/fmod/lib/libfmodex64.so b/sources/fmod/lib/libfmodex64.so new file mode 120000 index 0000000..e8675c4 --- /dev/null +++ b/sources/fmod/lib/libfmodex64.so @@ -0,0 +1 @@ +libfmodex64-4.44.33.so \ No newline at end of file diff --git a/sources/fmod/lib/libfmodexL-4.44.33.so b/sources/fmod/lib/libfmodexL-4.44.33.so new file mode 100755 index 0000000..e506fff Binary files /dev/null and b/sources/fmod/lib/libfmodexL-4.44.33.so differ diff --git a/sources/fmod/lib/libfmodexL.dylib b/sources/fmod/lib/libfmodexL.dylib new file mode 100644 index 0000000..f222921 Binary files /dev/null and b/sources/fmod/lib/libfmodexL.dylib differ diff --git a/sources/fmod/lib/libfmodexL.so b/sources/fmod/lib/libfmodexL.so new file mode 120000 index 0000000..951ac9a --- /dev/null +++ b/sources/fmod/lib/libfmodexL.so @@ -0,0 +1 @@ +libfmodexL-4.44.33.so \ No newline at end of file diff --git a/sources/fmod/lib/libfmodexL64-4.44.33.so b/sources/fmod/lib/libfmodexL64-4.44.33.so new file mode 100755 index 0000000..73156c0 Binary files /dev/null and b/sources/fmod/lib/libfmodexL64-4.44.33.so differ diff --git a/sources/fmod/lib/libfmodexL64.so b/sources/fmod/lib/libfmodexL64.so new file mode 120000 index 0000000..1d91750 --- /dev/null +++ b/sources/fmod/lib/libfmodexL64.so @@ -0,0 +1 @@ +libfmodexL64-4.44.33.so \ No newline at end of file diff --git a/sources/lecture/lecture.c b/sources/lecture/lecture.c index 927d9a5..7d0da7c 100644 --- a/sources/lecture/lecture.c +++ b/sources/lecture/lecture.c @@ -1,6 +1,6 @@ #include "lecture.h" -void lireTick (Motif* m, int tmp, FMOD_SOUND* sample[], FMOD_CHANNEL* chan[], int nbrPortees) { // On va lire les ticks (plus petite division temporelle de la playlist) de haut en bas +void lireTick (FMOD_SYSTEM* system, Motif* m, int tmp, FMOD_SOUND* sample[], FMOD_CHANNEL* chan[], int nbrPortees) { // On va lire les ticks (plus petite division temporelle de la playlist) de haut en bas int tempsPrecedent = SDL_GetTicks(); @@ -84,7 +84,7 @@ void lecture (int nombreChaines, Motif* melodie[]) { for (courant = 0; courant < taille; courant++) { for (int i = 0; i < melodie[courant] -> nbrTmp; i++) { printf("lecture temps %d : N=%d I=%d\n",i,getNote(melodie[courant],0,i),getInstrument(melodie[courant],0,i)); - lireTick (melodie[courant], i, sample, chan, nombreChaines); + lireTick (system, melodie[courant], i, sample, chan, nombreChaines); } } diff --git a/sources/lecture/lecture.h b/sources/lecture/lecture.h index e97b182..62db047 100644 --- a/sources/lecture/lecture.h +++ b/sources/lecture/lecture.h @@ -9,7 +9,7 @@ #include #include #include -#include "../fmod/fmod.h" +#include "../fmod/include/fmod.h" #define NBR_MS