From 4153a582dc21156c92a570da0f0089d545e57948 Mon Sep 17 00:00:00 2001 From: Raspbeguy Date: Wed, 21 May 2014 18:08:47 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Syst=C3=A8me=20de=20lecture=20op=C3=A9ratio?= =?UTF-8?q?nnel=20:)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- sources/Makefile | 10 ++- sources/instruments/instruments.c | 19 ++++- sources/instruments/instruments.h | 10 ++- sources/lecture/lecture.c | 42 +++++++---- sources/lecture/lecture.h | 4 +- sources/main.c | 116 +++++++++++++++++++----------- sources/mainTest/Makefile | 14 ++-- sources/mainTest/maintest.c | 6 +- sources/mainTest/ponytracker | Bin 0 -> 21024 bytes sources/melodie/melodie.c | 4 +- sources/melodie/melodie.h | 2 +- sources/samples/samples.c | 9 +-- sources/samples/samples.h | 2 +- 13 files changed, 152 insertions(+), 86 deletions(-) create mode 100755 sources/mainTest/ponytracker diff --git a/sources/Makefile b/sources/Makefile index 0d944c6..8414ba7 100644 --- a/sources/Makefile +++ b/sources/Makefile @@ -1,7 +1,7 @@ all : ponytracker clean -ponytracker : main.o lecture.o motifs.o melodie.o - gcc -std=c99 -L'fmod/lib' -lfmodex -Wall main.o lecture.o motifs.o melodie.o -o ponytracker `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` +ponytracker : main.o lecture.o motifs.o melodie.o samples.o instruments.o + gcc -std=c99 -L'fmod/lib' -lfmodex -Wall main.o lecture.o motifs.o melodie.o instruments.o samples.o -o ponytracker `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` main.o : main.c gcc -std=c99 -Wall -c main.c `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` @@ -15,5 +15,11 @@ melodie.o : melodie/melodie.c melodie/melodie.h lecture.o : lecture/lecture.c lecture/lecture.h gcc -std=c99 -Wall -c lecture/lecture.c +samples.o : samples/samples.c samples/samples.h + gcc -std=c99 -Wall -c samples/samples.c + +instruments.o : instruments/instruments.c instruments/instruments.h + gcc -std=c99 -Wall -c instruments/instruments.c + clean : rm -f *.o diff --git a/sources/instruments/instruments.c b/sources/instruments/instruments.c index 5e123b2..9f7d324 100644 --- a/sources/instruments/instruments.c +++ b/sources/instruments/instruments.c @@ -19,7 +19,11 @@ void supprimerInstrument(Instrument* tab[], int i){ free(tab[i]); } -int getVolume(Instrument* inst) { +char* getChemin(Instrument* inst) { + return inst->sample->chemin; +} + +int getVolumeInst(Instrument* inst) { return inst->volume; } @@ -30,11 +34,16 @@ int getBalance(Instrument* inst) { char* getNomInst(Instrument* inst) { return inst->nom; } -void setVolume(Instrument* inst, int volume) { + +Sample* getSample(Instrument* inst) { + return inst->sample; +} + +void setVolumeInst(Instrument* inst, int volume) { inst->volume = volume; } -void setBalance(Instrument* inst, int balance) { +void setBalanceInst(Instrument* inst, int balance) { inst->balance = balance; } @@ -42,6 +51,10 @@ void setNomInst(Instrument* inst, char* nom) { strcpy(inst->nom,nom); } +void setSample(Instrument* inst, Sample* smpl){ + inst->sample = smpl; +} + float rapportPitch(Instrument* inst, int note, int octave){ float freq = 440*pow(2,(octave-3)+(note-11)*(1.0/12.0)); return freq/(inst->sample->hauteur_ref); diff --git a/sources/instruments/instruments.h b/sources/instruments/instruments.h index ee98d8e..75256f3 100644 --- a/sources/instruments/instruments.h +++ b/sources/instruments/instruments.h @@ -36,18 +36,24 @@ void ajouterInstrument(Instrument* tab[], int i); void supprimerInstrument(Instrument* tab[], int i); -int getVolume(Instrument* inst); +char* getChemin(Instrument* inst); -int getBalance(Instrument* inst); +int getVolumeInst(Instrument* inst); + +int getBalanceInst(Instrument* inst); char* getNomInst(Instrument* inst); +Sample* getSample(Instrument* inst); + void setVolume(Instrument* inst, int volume); void setBalance(Instrument* inst, int balance); void setNomInst(Instrument* inst, char* nom); +void setSample(Instrument* inst, Sample* smpl); + /* * Cette fonction prend une note et une octave en paramètre et renvoie la valeur à entrer dans le pitch shifter. */ diff --git a/sources/lecture/lecture.c b/sources/lecture/lecture.c index f631051..128a00c 100644 --- a/sources/lecture/lecture.c +++ b/sources/lecture/lecture.c @@ -10,6 +10,7 @@ #include "lecture.h" +/* void lireTick (FMOD_SYSTEM* system, Motif* m, int tmp, FMOD_SOUND* sample[], FMOD_CHANNEL* chan[], int nbrPortees, int tempo) { // On va lire les ticks (plus petite division temporelle de la playlist) de haut en bas //int tempsPrecedent = SDL_GetTicks(); @@ -33,16 +34,16 @@ void lireTick (FMOD_SYSTEM* system, Motif* m, int tmp, FMOD_SOUND* sample[], FMO } } } - /* while (SDL_GetTicks() - tempsPrecedent < 125) {} // Si 125 ms se sont écoulées (il faudra régler ce temps sur le tempo) - tempsPrecedent = tempsPrecedent + 125; - Avouez que ce serait con qu'on ait besoin de SDL juste pour la temporisation - alors qu'on peut utiliser la fonction native usleep pour ça, et beaucoup plus simplement. */ + while (SDL_GetTicks() - tempsPrecedent < 125) {} // Si 125 ms se sont écoulées (il faudra régler ce temps sur le tempo) + tempsPrecedent = tempsPrecedent + 125; + Avouez que ce serait con qu'on ait besoin de SDL juste pour la temporisation + alors qu'on peut utiliser la fonction native usleep pour ça, et beaucoup plus simplement. usleep(60000000/tempo); } +*/ - -void lecture (int nombreChaines, int tempo, Motif* melodie[]) { +void lecture (int nombreChaines, int nombreInst, int tempo, Instrument* inst[], Motif* melodie[]) { FMOD_SYSTEM *system; @@ -57,8 +58,20 @@ void lecture (int nombreChaines, int tempo, Motif* melodie[]) { FMOD_CHANNEL **chan = malloc(nombreChaines*sizeof(FMOD_CHANNEL*)); // On ouvre le nombre de chaines nécessaires dans le mixer - FMOD_SOUND *sample[5]; // On charge les samples avec un message d'erreur en cas d'échec + FMOD_SOUND **sample = malloc(nombreInst*sizeof(FMOD_SOUND*)); + + // On charge les samples avec un message d'erreur en cas d'échec + + for (int k = 0; k < nombreInst; k++) { + resultat = FMOD_System_CreateStream(system, getChemin(inst[k]), FMOD_SOFTWARE | FMOD_2D | FMOD_LOOP_NORMAL, 0, &sample[0]); + if (resultat != FMOD_OK) + { + fprintf(stderr, "Impossible de lire le fichier audio\n"); + exit(EXIT_FAILURE); + } + } + /* resultat = FMOD_System_CreateStream(system, "lecture/0.wav", FMOD_SOFTWARE | FMOD_2D | FMOD_LOOP_NORMAL, 0, &sample[0]); if (resultat != FMOD_OK) { @@ -93,6 +106,7 @@ void lecture (int nombreChaines, int tempo, Motif* melodie[]) { fprintf(stderr, "Impossible de lire le fichier audio\n"); exit(EXIT_FAILURE); } + */ //Lecture des motifs @@ -105,21 +119,21 @@ void lecture (int nombreChaines, int tempo, Motif* melodie[]) { // DÉBUT DU COPIER COLLER POTENTIELLEMENT FOIREUX - m = melodie[courant] - for (int chaine = 0; chaine < nombreChaines; chaine++) { // On va lire les chaines une à une par numéro croissant + m = melodie[courant]; + for (int chaine = 0; chaine < nombreChaines; chaine++) { // On va lire les chaines une à une par numéro croissant if (m != NULL) { - if (getInstrument(m,0,tmp) == -1) FMOD_Channel_Stop(chan[chaine]); // Si la note est un silence, la chaine s'arrête + if (getInstrument(m,0,i) == -1) FMOD_Channel_Stop(chan[chaine]); // Si la note est un silence, la chaine s'arrête else { - if (getNote(m,0,tmp) != 0) { + if (getNote(m,0,i) != -1) { FMOD_Channel_Stop(chan[chaine]); - FMOD_System_PlaySound(system, FMOD_CHANNEL_FREE, sample[getInstrument(m,chaine,tmp)], 0, &chan[chaine]); + FMOD_System_PlaySound(system, FMOD_CHANNEL_FREE, sample[getInstrument(m,chaine,i)], 0, &chan[chaine]); //Ici on va s'occuper du pitch FMOD_DSP *pitch; FMOD_System_CreateDSPByType(system, FMOD_DSP_TYPE_PITCHSHIFT, &pitch); - FMOD_DSP_SetParameter(pitch, FMOD_DSP_PITCHSHIFT_PITCH, 2.0); + FMOD_DSP_SetParameter(pitch, FMOD_DSP_PITCHSHIFT_PITCH, rapportPitch(inst[getInstrument(m,0,i)],getNote(m,0,i),4)); FMOD_Channel_AddDSP(chan[chaine], pitch, 0); // C'est quoi chan1 ??? Je l'ai remplacé par chan[1], vu que chan1 est as déclaré... // On va passer une bonne journée... } @@ -140,7 +154,7 @@ void lecture (int nombreChaines, int tempo, Motif* melodie[]) { } //On relache le système FMOD - for (int i = 0; i <= nombreChaines; i++) { + for (int i = 0; i < nombreInst; i++) { FMOD_Sound_Release(sample[i]); } FMOD_System_Close(system); diff --git a/sources/lecture/lecture.h b/sources/lecture/lecture.h index 670d332..baeb5e5 100644 --- a/sources/lecture/lecture.h +++ b/sources/lecture/lecture.h @@ -13,7 +13,7 @@ #define _LECTURE_H #include "../melodie/melodie.h" -// #include "../instruments/instrument.h" +#include "../instruments/instruments.h" // #include // #include #include @@ -29,6 +29,6 @@ @param[in] tempo : vitesse de lecture @param[in] melodie[] : tableau ordonné des motifs */ -void lecture(int nbrChaines, int tempo, Motif* melodie[]); +void lecture(int nbrChaines, int nombreInst, int tempo, Instrument* inst[], Motif* melodie[]); #endif diff --git a/sources/main.c b/sources/main.c index 3039e98..e09a099 100644 --- a/sources/main.c +++ b/sources/main.c @@ -24,6 +24,8 @@ #include "motifs/motifs.h" #include "melodie/melodie.h" +#include "samples/samples.h" +#include "instruments/instruments.h" #include "lecture/lecture.h" //#include //#include @@ -31,6 +33,8 @@ #define DEF_NBR_TMP 16 #define MAX_PATTERNS 256 +#define NBR_INST 10 +#define NBR_SMPL 5 // Fonctions de débug @@ -46,87 +50,112 @@ void afficherMotif(Motif* m, int nbrPortees){ // Fin des fonctions de débug -void debut(Motif* melodie[], Motif* liste, int nbrPortees){ +void debut(Motif* melodie[], Instrument* inst[], Sample* smpl[], Motif* liste, int nbrPortees){ ajouterMotif(&liste, DEF_NBR_TMP, nbrPortees); Motif* m = liste; + int i; + // My Little Pony. + + for (i = 0; i < DEF_NBR_TMP; i++) { + definirNote(m,0,i,-1); + } + definirNote(m,0,0,1); - definirInstrument(m,0,0,1); + definirInstrument(m,0,0,0); definirInstrument(m,0,2,-1); - definirNote(m,0,4,1); + definirNote(m,0,4,0); definirInstrument(m,0,4,0); definirNote(m,0,5,1); - definirInstrument(m,0,5,1); + definirInstrument(m,0,5,0); definirInstrument(m,0,6,-1); - definirNote(m,0,7,1); - definirInstrument(m,0,7,2); + definirNote(m,0,7,3); + definirInstrument(m,0,7,0); definirInstrument(m,0,8,-1); definirNote(m,0,9,1); - definirInstrument(m,0,9,1); + definirInstrument(m,0,9,0); definirInstrument(m,0,12,-1); ajouterMotif(&liste, DEF_NBR_TMP, nbrPortees); Motif* n = liste; // I used to wonder what friendship could be. - definirNote(n,0,1,1); - definirInstrument(n,0,1,3); - definirNote(n,0,2,1); - definirInstrument(n,0,2,3); - definirNote(n,0,3,1); - definirInstrument(n,0,3,3); - definirNote(n,0,4,1); - definirInstrument(n,0,4,3); + + for (i = 0; i < DEF_NBR_TMP; i++) { + definirNote(n,0,i,-1); + } + + definirNote(n,0,1,5); + definirInstrument(n,0,1,0); + definirNote(n,0,2,5); + definirInstrument(n,0,2,0); + definirNote(n,0,3,5); + definirInstrument(n,0,3,0); + definirNote(n,0,4,5); + definirInstrument(n,0,4,0); definirInstrument(n,0,5,-1); definirNote(n,0,6,1); - definirInstrument(n,0,6,1); - definirNote(n,0,7,1); - definirInstrument(n,0,7,2); + definirInstrument(n,0,6,0); + definirNote(n,0,7,3); + definirInstrument(n,0,7,0); definirInstrument(n,0,8,-1); definirNote(n,0,9,1); - definirInstrument(n,0,9,1); + definirInstrument(n,0,9,0); definirInstrument(n,0,10,-1); - definirNote(n,0,11,1); - definirInstrument(n,0,11,3); + definirNote(n,0,11,5); + definirInstrument(n,0,11,0); definirInstrument(n,0,12,-1); - definirNote(n,0,13,1); - definirInstrument(n,0,13,2); + definirNote(n,0,13,3); + definirInstrument(n,0,13,0); definirInstrument(n,0,14,-1); definirNote(n,0,15,1); - definirInstrument(n,0,15,1); + definirInstrument(n,0,15,0); ajouterMotif(&liste, DEF_NBR_TMP, nbrPortees); Motif* p = liste; // Until you all shared its magic with me. - definirNote(p,0,0,1); - definirInstrument(p,0,0,3); - definirNote(p,0,1,1); - definirInstrument(p,0,1,4); + + for (i = 0; i < DEF_NBR_TMP; i++) { + definirNote(p,0,i,-1); + } + + definirNote(p,0,0,5); + definirInstrument(p,0,0,0); + definirNote(p,0,1,8); + definirInstrument(p,0,1,0); definirInstrument(p,0,2,-1); - definirNote(p,0,3,1); - definirInstrument(p,0,3,4); + definirNote(p,0,3,8); + definirInstrument(p,0,3,0); definirInstrument(p,0,4,-1); - definirNote(p,0,5,1); - definirInstrument(p,0,5,3); + definirNote(p,0,5,5); + definirInstrument(p,0,5,0); definirInstrument(p,0,6,-1); - definirNote(p,0,7,1); - definirInstrument(p,0,7,2); + definirNote(p,0,7,3); + definirInstrument(p,0,7,0); definirInstrument(p,0,8,-1); definirNote(p,0,9,1); - definirInstrument(p,0,9,1); - definirNote(p,0,10,1); - definirInstrument(p,0,10,3); + definirInstrument(p,0,9,0); + definirNote(p,0,10,5); + definirInstrument(p,0,10,0); definirInstrument(p,0,11,-1); - definirNote(p,0,12,1); - definirInstrument(p,0,12,2); + definirNote(p,0,12,3); + definirInstrument(p,0,12,0); definirInstrument(p,0,14,-1); ajouterMotifVirtuel(melodie,0,m); ajouterMotifVirtuel(melodie,1,n); ajouterMotifVirtuel(melodie,2,m); ajouterMotifVirtuel(melodie,3,p); + + // Définir les instruments les samples + + ajouterSample(smpl,0,"lecture/0.wav"); + setHauteur(smpl[0],440.0); + + ajouterInstrument(inst,0); + setSample(inst[0],smpl[0]); } int main( int argc, char *argv[] ){ @@ -206,11 +235,14 @@ void lancerLecture () { Motif* melodie[MAX_PATTERNS] = {NULL}; Motif* liste = NULL; + Instrument* inst[NBR_INST] = {NULL}; + Sample* smpl[NBR_SMPL] = {NULL}; + int nbrPortees = 1; - courant = 0; + //courant = 0; taille = 0; - debut(melodie, liste, nbrPortees); - lecture(nbrPortees,480,melodie); + debut(melodie, inst, smpl, liste, nbrPortees); + lecture(nbrPortees,1,480,inst,melodie); } void quitter () diff --git a/sources/mainTest/Makefile b/sources/mainTest/Makefile index 6fdfbd5..0a3ebc0 100644 --- a/sources/mainTest/Makefile +++ b/sources/mainTest/Makefile @@ -1,19 +1,19 @@ all : ponytracker clean ponytracker : maintest.o lecture.o motifs.o melodie.o - gcc -std=c99 -L'fmod/lib' -lfmodex64 -Wall maintest.o lecture.o motifs.o melodie.o -o ponytracker `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` + gcc -std=c99 -L'../fmod/lib' -lfmodex64 -Wall maintest.o lecture.o motifs.o melodie.o -o ponytracker `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` maintest.o : maintest.c gcc -std=c99 -Wall -c maintest.c `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0` -motifs.o : motifs/motifs.c motifs/motifs.h - gcc -std=c99 -Wall -c motifs/motifs.c +motifs.o : ../motifs/motifs.c ../motifs/motifs.h + gcc -std=c99 -Wall -c ../motifs/motifs.c -melodie.o : melodie/melodie.c melodie/melodie.h - gcc -std=c99 -Wall -c melodie/melodie.c +melodie.o : ../melodie/melodie.c ../melodie/melodie.h + gcc -std=c99 -Wall -c ../melodie/melodie.c -lecture.o : lecture/lecture.c lecture/lecture.h - gcc -std=c99 -Wall -c lecture/lecture.c +lecture.o : ../lecture/lecture.c ../lecture/lecture.h + gcc -std=c99 -Wall -c ../lecture/lecture.c clean : rm -f *.o diff --git a/sources/mainTest/maintest.c b/sources/mainTest/maintest.c index e94445a..1073bcd 100644 --- a/sources/mainTest/maintest.c +++ b/sources/mainTest/maintest.c @@ -141,7 +141,7 @@ int main( int argc, char *argv[] ){ // insérer code GTK ici GtkBuilder *monBuilder; GtkWidget *maFenetre; - char *str; + char *str = NULL; gtk_init( &argc, &argv ); @@ -155,7 +155,7 @@ int main( int argc, char *argv[] ){ GtkLabel *labelNote = (GtkLabel*) gtk_builder_get_object(monBuilder,"button16"); if (getNote(m,0,0)==0) str="Do"; else if (getNote(m,0,0)==1) str="Re"; - gtk_label_set_text(labelNote, str); + gtk_label_set_text(labelNote, str); gtk_widget_show_all (maFenetre); gtk_main(); @@ -283,7 +283,7 @@ void lancerLecture () Motif* melodie[MAX_PATTERNS] = {NULL}; Motif* liste = NULL; int nbrPortees = 1; - courant = 0; + int courant = 0; taille = 0; debut(melodie, liste, nbrPortees); lecture(nbrPortees,480,melodie); diff --git a/sources/mainTest/ponytracker b/sources/mainTest/ponytracker new file mode 100755 index 0000000000000000000000000000000000000000..16e71f77032e4f16cf0a2476adb3eef278825f81 GIT binary patch literal 21024 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 BD@OnT literal 0 HcmV?d00001 diff --git a/sources/melodie/melodie.c b/sources/melodie/melodie.c index f3d6db4..c28826b 100644 --- a/sources/melodie/melodie.c +++ b/sources/melodie/melodie.c @@ -12,9 +12,9 @@ void afficherMotifActuel(){ // TODO } -void definirCourant(int i){ +/* void definirCourant(int i){ courant = i; -} +}*/ void ajouterMotifVirtuel(Motif* melodie[], int ind, Motif* m){ for (int i = taille; i > ind; i--) { diff --git a/sources/melodie/melodie.h b/sources/melodie/melodie.h index 9e57830..322d80d 100644 --- a/sources/melodie/melodie.h +++ b/sources/melodie/melodie.h @@ -17,7 +17,7 @@ void afficherListeMotifs(); void afficherMotifActuel(); -void definirCourant(int i); +//void definirCourant(int i); void ajouterMotifVirtuel(Motif* melodie[], int ind, Motif* m); diff --git a/sources/samples/samples.c b/sources/samples/samples.c index 47147de..2ee9508 100644 --- a/sources/samples/samples.c +++ b/sources/samples/samples.c @@ -13,15 +13,10 @@ void ajouterSample(Sample* tab[], int i, char* chemin) { tab[i] = calloc(1,sizeof(Sample)); sprintf(tab[i]->nom,"Sample %d",i); + strcpy(tab[i]->chemin,chemin); } -void supprimerSample(Sample* tab[], int i, Poubelle** poub) { - if (!(doitEtreSauvegarde(tab, i))) { - Poubelle* p = malloc(sizeof(Poubelle)); - strcpy(p->chemin, tab[i]->chemin); - p->suiv = *poub; - *poub = p; - } +void supprimerSample(Sample* tab[], int i) { free(tab[i]); } diff --git a/sources/samples/samples.h b/sources/samples/samples.h index 3d79945..d216653 100644 --- a/sources/samples/samples.h +++ b/sources/samples/samples.h @@ -30,7 +30,7 @@ typedef struct _sample{ void ajouterSample(Sample* tab[], int i, char* chemin); -void supprimerSample(Sample* tab[], int i, Poubelle** poub); +void supprimerSample(Sample* tab[], int i); //void setResampling(Sample* sample, int deb, int fin); From a8bdfd3e5b82370b801a8549351ec8fcefa12be0 Mon Sep 17 00:00:00 2001 From: Raspbeguy Date: Wed, 21 May 2014 18:26:04 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Hop=20je=20crois=20que=20c'est=20r=C3=A9sol?= =?UTF-8?q?u=20maintenant.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 2 +- sources/mainTest/maintest.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 443a38e..69e5dbf 100644 --- a/.gitignore +++ b/.gitignore @@ -41,4 +41,4 @@ sources/instruments/.instruments.c.swp sources/instruments/instruments.o sources/samples/.samples.c.swp sources/samples/samples.o -sources/mainTest/maintest.c.orig \ No newline at end of file +sources/mainTest/.maintest.c.swp \ No newline at end of file diff --git a/sources/mainTest/maintest.c b/sources/mainTest/maintest.c index 78409e7..f03a5dc 100644 --- a/sources/mainTest/maintest.c +++ b/sources/mainTest/maintest.c @@ -18,6 +18,7 @@ * @date Mai 2014 */ + #include #include #include From ddbad7392cc1267df6a5d8f8c05ce39718c33aab Mon Sep 17 00:00:00 2001 From: Raspbeguy Date: Wed, 21 May 2014 18:27:57 +0200 Subject: [PATCH 3/3] Non, maintenant c'est bon. --- sources/mainTest/maintest.c | 9 --------- 1 file changed, 9 deletions(-) diff --git a/sources/mainTest/maintest.c b/sources/mainTest/maintest.c index f03a5dc..ef1c3e1 100644 --- a/sources/mainTest/maintest.c +++ b/sources/mainTest/maintest.c @@ -160,11 +160,7 @@ int main( int argc, char *argv[] ){ // insérer code GTK ici GtkBuilder *monBuilder; GtkWidget *maFenetre; -<<<<<<< HEAD - char *str = NULL; -======= char *str=NULL; ->>>>>>> 558938498b5f31ae16de379239153824be76559a gtk_init( &argc, &argv ); @@ -176,10 +172,6 @@ int main( int argc, char *argv[] ){ maFenetre = GTK_WIDGET( gtk_builder_get_object( monBuilder, "fenetreprincipale")); GtkLabel *labelNote = (GtkLabel*) gtk_builder_get_object(monBuilder,"button16"); -<<<<<<< HEAD - if (getNote(m,0,0)==0) str="Do"; - else if (getNote(m,0,0)==1) str="Re"; -======= switch (getNote(m,0,0)) { case 0 : str="Do "; @@ -304,7 +296,6 @@ int main( int argc, char *argv[] ){ break; } ->>>>>>> 558938498b5f31ae16de379239153824be76559a gtk_label_set_text(labelNote, str); gtk_widget_show_all (maFenetre);