raspbeguy
/
ponytracker
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

bodel de conflits

This commit is contained in:
Raspbeguy 2014-05-21 18:20:18 +02:00
parent 4153a582dc 558938498b
commit fd6cc499d8
4 changed files with 1909 additions and 183 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -40,4 +40,5 @@ sources/instruments/.instruments.h.swp
sources/instruments/.instruments.c.swp
sources/instruments/instruments.o
sources/samples/.samples.c.swp
sources/samples/samples.o
sources/samples/samples.o
sources/mainTest/maintest.c.orig

1663
sources/boutonsdemerde.c Normal file
View File

File diff suppressed because it is too large Load Diff

262
sources/mainTest/maintest.c
View File

@ -23,9 +23,9 @@
#include <string.h>
#include <gtk/gtk.h>
#include "../motifs/motifs.h"
#include "../melodie/melodie.h"
#include "../lecture/lecture.h"
#include "motifs/motifs.h"
#include "melodie/melodie.h"
#include "lecture/lecture.h"
//#include <SDL2/SDL.h>
//#include <SDL2/SDL_mixer.h>
//#include <SDL2/SDL_main.h>
@ -34,6 +34,24 @@
#define MAX_PATTERNS 256
Motif* m;
char *Do="Do";
char *DoD="Do#";
char *Re="Re";
char *ReD="Re#";
char *Mi="Mi";
char *Fa="Fa";
char *FaD="Fa#";
char *Sol="Sol";
char *SolD="Sol#";
char *La="La";
char *LaD="La#";
char *Si="Si";
char *SiD="Si#";
char *N1="1";
char *N2="2";
char *N3="3";
char *N4="4";
char *N5="5";
void remplissageNote (GtkWidget *widget, gpointer *data);
@ -141,20 +159,151 @@ 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 );
monBuilder = gtk_builder_new();
gtk_builder_add_from_file( monBuilder, "ponytrackertest.glade", NULL);
gtk_builder_add_from_file( monBuilder, "GUI/ponytrackertest.glade", NULL);
gtk_builder_connect_signals( monBuilder, NULL);
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 ";
break;
case 1 :
str="Do# ";
break;
case 2 :
str="Re ";
break;
case 3 :
str="Re# ";
break;
case 4 :
str="Mi ";
break;
case 5 :
str="Fa ";
break;
case 6 :
str="Fa# ";
break;
case 7 :
str="Sol ";
break;
case 8 :
str="Sol# ";
break;
case 9 :
str="La ";
break;
case 10 :
str="La# ";
break;
case 11 :
str="Si ";
break;
case 12 :
str="Si# ";
break;
default :
break;
}
switch (getOctave(m,0,0)) {
case 0 :
strcat(str, "1 ");
break;
case 1 :
strcat(str, "2 ");
break;
case 2 :
strcat(str, "3 ");
break;
case 3 :
strcat(str, "4 ");
break;
case 4 :
strcat(str, "5 ");
break;
default :
break;
}
switch (getInstrument(m,0,0)) {
case 0 :
strcat(str, "1 ");
break;
case 1 :
strcat(str, "2 ");
break;
case 2 :
strcat(str, "3 ");
break;
case 3 :
strcat(str, "4 ");
break;
case 4 :
strcat(str, "5 ");
break;
default :
break;
}
switch (getVolume(m,0,0)) {
case 0 :
strcat(str, "1 ");
break;
case 1 :
strcat(str, "2 ");
break;
case 2 :
strcat(str, "3 ");
break;
case 3 :
strcat(str, "4 ");
break;
case 4 :
strcat(str, "5 ");
break;
default :
break;
}
switch (getEffet(m,0,0)) {
case 0 :
strcat(str, "1 ");
break;
case 1 :
strcat(str, "2 ");
break;
case 2 :
strcat(str, "3 ");
break;
case 3 :
strcat(str, "4 ");
break;
case 4 :
strcat(str, "5 ");
break;
default :
break;
}
>>>>>>> 558938498b5f31ae16de379239153824be76559a
gtk_label_set_text(labelNote, str);
gtk_widget_show_all (maFenetre);
@ -162,18 +311,35 @@ int main( int argc, char *argv[] ){
return EXIT_SUCCESS;
}
void fenetreNote ( int argc, char *argv[] )
{
GtkBuilder *monBuilderNote;
GtkWidget *maFenetreNote;
gtk_init( &argc, &argv );
monBuilderNote = gtk_builder_new();
gtk_builder_add_from_file( monBuilderNote, "GUI/ponytrackertest.glade", NULL);
gtk_builder_connect_signals( monBuilderNote, NULL);
maFenetreNote = GTK_WIDGET( gtk_builder_get_object( monBuilderNote, "ajoutnote"));
GtkButton *button = (GtkButton*) gtk_builder_get_object(monBuilderNote, "buttonok");
g_signal_connect(G_OBJECT(button),"clicked",G_CALLBACK(remplissageNote),
GTK_WIDGET( gtk_builder_get_object( monBuilderNote, "ajoutnote")));
gtk_widget_show_all (maFenetreNote);
}
void remplissageNote (GtkWidget *widget, gpointer *data){
char *Do="Do";
char *Re="Re";
char *Mi="Mi";
char *N1="1";
char *N2="2";
GtkBuilder *monBuilderNote;
monBuilderNote = gtk_builder_new();
gtk_builder_add_from_file( monBuilderNote, "ponytrackertest.glade", NULL);
gtk_builder_add_from_file( monBuilderNote, "GUI/ponytrackertest.glade", NULL);
gtk_builder_connect_signals( monBuilderNote, NULL);
GtkEntry *entryNote = (GtkEntry*) gtk_builder_get_object(monBuilderNote,"choisirnote");
@ -184,25 +350,69 @@ void remplissageNote (GtkWidget *widget, gpointer *data){
if (strcmp(Do,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,1);
else
if (strcmp(Re,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,2);
if (strcmp(DoD,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,2);
else
if (strcmp(Mi,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,3);
if (strcmp(Re,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,3);
else
if (strcmp(ReD,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,4);
else
if (strcmp(Mi,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,5);
else
if (strcmp(Fa,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,6);
else
if (strcmp(FaD,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,7);
else
if (strcmp(Sol,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,8);
else
if (strcmp(SolD,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,9);
else
if (strcmp(La,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,10);
else
if (strcmp(LaD,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,11);
else
if (strcmp(Si,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,12);
else
if (strcmp(SiD,gtk_entry_get_text(entryNote))==0) definirNote(m,0,0,13);
if (strcmp(N1,gtk_entry_get_text(entryOctave))==0) definirOctave(m,0,0,1);
else
if (strcmp(N2,gtk_entry_get_text(entryOctave))==0) definirOctave(m,0,0,2);
else
if (strcmp(N3,gtk_entry_get_text(entryOctave))==0) definirOctave(m,0,0,3);
else
if (strcmp(N4,gtk_entry_get_text(entryOctave))==0) definirOctave(m,0,0,4);
else
if (strcmp(N5,gtk_entry_get_text(entryOctave))==0) definirOctave(m,0,0,5);
if (strcmp(N1,gtk_entry_get_text(entryInstrument))==0) definirInstrument(m,0,0,1);
else
if (strcmp(N2,gtk_entry_get_text(entryInstrument))==0) definirInstrument(m,0,0,2);
else
if (strcmp(N3,gtk_entry_get_text(entryInstrument))==0) definirInstrument(m,0,0,3);
else
if (strcmp(N4,gtk_entry_get_text(entryInstrument))==0) definirInstrument(m,0,0,4);
else
if (strcmp(N5,gtk_entry_get_text(entryInstrument))==0) definirInstrument(m,0,0,5);
if (strcmp(N1,gtk_entry_get_text(entryVolume))==0) definirVolume(m,0,0,1);
else
if (strcmp(N2,gtk_entry_get_text(entryVolume))==0) definirVolume(m,0,0,2);
else
if (strcmp(N3,gtk_entry_get_text(entryVolume))==0) definirVolume(m,0,0,3);
else
if (strcmp(N4,gtk_entry_get_text(entryVolume))==0) definirVolume(m,0,0,4);
else
if (strcmp(N5,gtk_entry_get_text(entryVolume))==0) definirVolume(m,0,0,5);
if (strcmp(N1,gtk_entry_get_text(entryEffet))==0) definirEffet(m,0,0,1);
else
if (strcmp(N2,gtk_entry_get_text(entryEffet))==0) definirEffet(m,0,0,2);
else
if (strcmp(N3,gtk_entry_get_text(entryEffet))==0) definirEffet(m,0,0,3);
else
if (strcmp(N4,gtk_entry_get_text(entryEffet))==0) definirEffet(m,0,0,4);
else
if (strcmp(N5,gtk_entry_get_text(entryEffet))==0) definirEffet(m,0,0,5);
}
void fenetreSample ( int argc, char *argv[] )
@ -214,7 +424,7 @@ void fenetreSample ( int argc, char *argv[] )
monBuilderSample = gtk_builder_new();
gtk_builder_add_from_file( monBuilderSample, "ponytrackertest.glade", NULL);
gtk_builder_add_from_file( monBuilderSample, "GUI/ponytrackertest.glade", NULL);
gtk_builder_connect_signals( monBuilderSample, NULL);
maFenetreSample = GTK_WIDGET( gtk_builder_get_object( monBuilderSample, "ajoutsample"));
@ -231,7 +441,7 @@ void fenetreInstrument ( int argc, char *argv[] )
monBuilderInstrument = gtk_builder_new();
gtk_builder_add_from_file( monBuilderInstrument, "ponytrackertest.glade", NULL);
gtk_builder_add_from_file( monBuilderInstrument, "GUI/ponytrackertest.glade", NULL);
gtk_builder_connect_signals( monBuilderInstrument, NULL);
maFenetreInstrument = GTK_WIDGET( gtk_builder_get_object( monBuilderInstrument, "ajoutinstrument"));
@ -248,7 +458,7 @@ void fenetreMotif ( int argc, char *argv[] )
monBuilderMotif = gtk_builder_new();
gtk_builder_add_from_file( monBuilderMotif, "ponytrackertest.glade", NULL);
gtk_builder_add_from_file( monBuilderMotif, "GUI/ponytrackertest.glade", NULL);
gtk_builder_connect_signals( monBuilderMotif, NULL);
maFenetreMotif = GTK_WIDGET( gtk_builder_get_object( monBuilderMotif, "ajoutmotif"));
@ -256,28 +466,6 @@ void fenetreMotif ( int argc, char *argv[] )
gtk_widget_show_all (maFenetreMotif);
}
void fenetreNote ( int argc, char *argv[] )
{
GtkBuilder *monBuilderNote;
GtkWidget *maFenetreNote;
gtk_init( &argc, &argv );
monBuilderNote = gtk_builder_new();
gtk_builder_add_from_file( monBuilderNote, "ponytrackertest.glade", NULL);
gtk_builder_connect_signals( monBuilderNote, NULL);
maFenetreNote = GTK_WIDGET( gtk_builder_get_object( monBuilderNote, "ajoutnote"));
GtkButton *button = (GtkButton*) gtk_builder_get_object(monBuilderNote, "buttonok");
g_signal_connect(G_OBJECT(button),"changed",G_CALLBACK(remplissageNote),
GTK_WIDGET( gtk_builder_get_object( monBuilderNote, "ajoutnote")));
gtk_widget_show_all (maFenetreNote);
}
void lancerLecture ()
{
Motif* melodie[MAX_PATTERNS] = {NULL};

164
sources/mainTest/ponytrackertest.glade
View File

@ -957,10 +957,19 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
<item translatable="yes">Choisissez une note</item>
<item translatable="yes">Do</item>
<item translatable="yes">Do#</item>
<item translatable="yes">Re</item>
<item translatable="yes">Re#</item>
<item translatable="yes">Mi</item>
<item translatable="yes">Fa</item>
<item translatable="yes">Fa#</item>
<item translatable="yes">Sol</item>
<item translatable="yes">Sol#</item>
<item translatable="yes">La</item>
<item translatable="yes">La#</item>
<item translatable="yes">Si</item>
<item translatable="yes">Si#</item>
</items>
</object>
<packing>
@ -976,7 +985,6 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
<item translatable="yes">Choisissez une octave</item>
<item translatable="yes">1</item>
<item translatable="yes">2</item>
</items>
@ -994,9 +1002,11 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
<item translatable="yes">Choisissez un instrument</item>
<item translatable="yes">1</item>
<item translatable="yes">2</item>
<item translatable="yes">3</item>
<item translatable="yes">4</item>
<item translatable="yes">5</item>
</items>
</object>
<packing>
@ -1012,9 +1022,11 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
<item translatable="yes">Choisissez un volume</item>
<item translatable="yes">1</item>
<item translatable="yes">2</item>
<item translatable="yes">3</item>
<item translatable="yes">4</item>
<item translatable="yes">5</item>
</items>
</object>
<packing>
@ -1030,9 +1042,11 @@
<property name="entry_text_column">0</property>
<property name="id_column">1</property>
<items>
<item translatable="yes">Choisissez un effet</item>
<item translatable="yes">1</item>
<item translatable="yes">2</item>
<item translatable="yes">3</item>
<item translatable="yes">4</item>
<item translatable="yes">5</item>
</items>
</object>
<packing>
@ -2443,34 +2457,6 @@
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button34">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">16</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button35">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">17</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button36">
<property name="label" translatable="yes">button</property>
@ -2667,34 +2653,6 @@
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button50">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">16</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button51">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">1</property>
<property name="top_attach">17</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button52">
<property name="label" translatable="yes">button</property>
@ -3031,34 +2989,6 @@
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button76">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">16</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button77">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">2</property>
<property name="top_attach">17</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button78">
<property name="label" translatable="yes">button</property>
@ -3171,34 +3101,6 @@
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button86">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">16</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button87">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">3</property>
<property name="top_attach">17</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button88">
<property name="label" translatable="yes">button</property>
@ -3423,34 +3325,6 @@
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button104">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">4</property>
<property name="top_attach">16</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
<child>
<object class="GtkButton" id="button105">
<property name="label" translatable="yes">button</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
</object>
<packing>
<property name="left_attach">4</property>
<property name="top_attach">17</property>
<property name="width">1</property>
<property name="height">1</property>
</packing>
</child>
</object>
<packing>
<property name="expand">False</property>