From 7bcbce77be291bea8c98dd5e0b962dc0b6bfdc95 Mon Sep 17 00:00:00 2001
From: Raspbeguy <guy.godfroy@telecom-sudparis.eu>
Date: Tue, 8 Apr 2014 18:30:56 +0200
Subject: [PATCH] Yep
---
.gitignore | 4 +-
sources/GUI/ponytracker.glade | 107 +++++++++-------------------------
sources/GUI/premierTest.c | 6 +-
sources/Makefile | 11 +++-
sources/lecture/lecture.h | 4 +-
sources/main.c | 76 +++++++++++++++++++++++-
6 files changed, 119 insertions(+), 89 deletions(-)
diff --git a/.gitignore b/.gitignore
index 800fca8..d408562 100644
--- a/.gitignore
+++ b/.gitignore
@@ -28,4 +28,6 @@ sources/motifs.o
sources/ponytracker
sources/lecture/.lecture.c.swp
sources/lecture/.lecture.h.swp
-sources/lecture/lecture.o
\ No newline at end of file
+sources/lecture/lecture.o
+sources/GUI/premierTest
+sources/lecture.o
\ No newline at end of file
diff --git a/sources/GUI/ponytracker.glade b/sources/GUI/ponytracker.glade
index 6660b03..1b694c1 100644
--- a/sources/GUI/ponytracker.glade
+++ b/sources/GUI/ponytracker.glade
@@ -1,6 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!-- Generated with glade 3.16.1 -->
<interface>
- <!-- interface-requires gtk+ 3.6 -->
+ <requires lib="gtk+" version="3.6"/>
<object class="GtkWindow" id="ajoutInstrument">
<property name="can_focus">False</property>
<child>
@@ -16,7 +17,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -30,7 +30,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -44,7 +43,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -58,7 +56,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -72,7 +69,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -86,7 +82,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -100,7 +95,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -114,7 +108,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -128,7 +121,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -142,7 +134,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -156,7 +147,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -170,7 +160,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -184,7 +173,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -198,7 +186,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -212,7 +199,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -226,7 +212,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -240,7 +225,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -254,7 +238,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -268,7 +251,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -282,7 +264,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -396,6 +377,18 @@
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<property name="orientation">vertical</property>
+ <child internal-child="plus_button">
+ <object class="GtkButton" id="scalebutton-plus_button1">
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ </object>
+ </child>
+ <child internal-child="minus_button">
+ <object class="GtkButton" id="scalebutton-minus_button1">
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -412,6 +405,18 @@
<property name="relief">none</property>
<property name="focus_on_click">False</property>
<property name="orientation">vertical</property>
+ <child internal-child="plus_button">
+ <object class="GtkButton" id="scalebutton-plus_button2">
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ </object>
+ </child>
+ <child internal-child="minus_button">
+ <object class="GtkButton" id="scalebutton-minus_button2">
+ <property name="can_focus">False</property>
+ <property name="receives_default">False</property>
+ </object>
+ </child>
</object>
<packing>
<property name="left_attach">1</property>
@@ -514,7 +519,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -528,7 +532,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -542,7 +545,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -556,7 +558,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -570,7 +571,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -584,7 +584,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -598,7 +597,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -612,7 +610,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -626,7 +623,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -640,7 +636,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -654,7 +649,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -668,7 +662,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -682,7 +675,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">0</property>
@@ -696,7 +688,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -710,7 +701,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -724,7 +714,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -738,7 +727,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -752,7 +740,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -766,7 +753,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -780,7 +766,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -794,7 +779,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -808,7 +792,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -822,7 +805,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -836,7 +818,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -850,7 +831,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -864,7 +844,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -878,7 +857,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -892,7 +870,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -906,7 +883,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -920,7 +896,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -934,7 +909,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">2</property>
@@ -1106,7 +1080,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1119,7 +1092,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1132,7 +1104,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1145,7 +1116,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1158,7 +1128,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1171,7 +1140,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1184,7 +1152,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1197,7 +1164,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1210,7 +1176,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1223,7 +1188,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1236,7 +1200,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1249,7 +1212,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1262,7 +1224,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1275,7 +1236,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1288,7 +1248,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1301,7 +1260,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1314,7 +1272,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1327,7 +1284,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1340,7 +1296,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1353,7 +1308,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1400,7 +1354,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="expand">False</property>
@@ -1508,7 +1461,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1522,7 +1474,6 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
- <property name="invisible_char_set">True</property>
</object>
<packing>
<property name="left_attach">1</property>
@@ -1915,7 +1866,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked" handler="ajouterSample" swapped="no"/>
+ <signal name="clicked" handler="fenetreSample" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1929,7 +1880,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked" handler="ajouterInstrument" swapped="no"/>
+ <signal name="clicked" handler="fenetreInstrument" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -1943,7 +1894,7 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <signal name="clicked" handler="ajouterMotif" swapped="no"/>
+ <signal name="clicked" handler="fenetreMotif" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
diff --git a/sources/GUI/premierTest.c b/sources/GUI/premierTest.c
index 1784c2f..140f228 100644
--- a/sources/GUI/premierTest.c
+++ b/sources/GUI/premierTest.c
@@ -26,7 +26,7 @@ void lecture ()
gtk_main_quit();
}
-void ajouterSample ( int argc, char *argv[] )
+void fenetreSample ( int argc, char *argv[] )
{
GtkBuilder *monBuilderSample;
GtkWidget *maFenetreSample;
@@ -43,7 +43,7 @@ void ajouterSample ( int argc, char *argv[] )
gtk_widget_show_all (maFenetreSample);
}
-void ajouterInstrument ( int argc, char *argv[] )
+void fenetreInstrument ( int argc, char *argv[] )
{
GtkBuilder *monBuilderInstrument;
GtkWidget *maFenetreInstrument;
@@ -60,7 +60,7 @@ void ajouterInstrument ( int argc, char *argv[] )
gtk_widget_show_all (maFenetreInstrument);
}
-void ajouterMotif ( int argc, char *argv[] )
+void fenetreMotif ( int argc, char *argv[] )
{
GtkBuilder *monBuilderMotif;
GtkWidget *maFenetreMotif;
diff --git a/sources/Makefile b/sources/Makefile
index 889add9..0d99efc 100644
--- a/sources/Makefile
+++ b/sources/Makefile
@@ -1,8 +1,10 @@
-ponytracker : main.o motifs.o melodie.o
- gcc -Wall main.o motifs.o melodie.o -o ponytracker
+all : ponytracker clean
+
+ponytracker : main.o lecture.o motifs.o melodie.o
+ gcc -L/opt/local/lib -lsdl -lsdl_mixer -lsdlmain -Wall main.o lecture.o motifs.o melodie.o -o ponytracker `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0`
main.o : main.c
- gcc -Wall -c main.c
+ gcc -L/opt/local/lib -lsdl -lsdl_mixer -lsdlmain -Wall -c main.c `pkg-config --cflags --libs gtk+-3.0 gmodule-2.0`
motifs.o : motifs/motifs.c motifs/motifs.h
gcc -Wall -c motifs/motifs.c
@@ -10,5 +12,8 @@ motifs.o : motifs/motifs.c motifs/motifs.h
melodie.o : melodie/melodie.c melodie/melodie.h
gcc -Wall -c melodie/melodie.c
+lecture.o : lecture/lecture.c lecture/lecture.h
+ gcc -L/opt/local/lib -lsdl -lsdl_mixer -lsdlmain -Wall -c lecture/lecture.c
+
clean :
rm -f *.o
diff --git a/sources/lecture/lecture.h b/sources/lecture/lecture.h
index 4bd1b91..6c282ff 100644
--- a/sources/lecture/lecture.h
+++ b/sources/lecture/lecture.h
@@ -5,8 +5,8 @@
#include "../melodie/melodie.h"
// #include "../instruments/instrument.h"
-#include <SDL/SDL.h>
-#include <SDL/SDL_mixer.h>
+#include "/opt/local/include/SDL/SDL.h"
+#include "/opt/local/include/SDL/SDL_mixer.h"
#include <stdio.h>
#include <stdlib.h>
diff --git a/sources/main.c b/sources/main.c
index 656da85..2a2df81 100644
--- a/sources/main.c
+++ b/sources/main.c
@@ -1,9 +1,12 @@
#include <stdio.h>
#include <stdlib.h>
+#include <gtk/gtk.h>
#include "motifs/motifs.h"
#include "melodie/melodie.h"
#include "lecture/lecture.h"
+#include "/opt/local/include/SDL/SDL.h"
+#include "/opt/local/include/SDL/SDL_mixer.h"
#define DEF_NBR_TMP 16
#define MAX_PATTERNS 256
@@ -37,7 +40,12 @@ void debut(Motif* melodie[], Motif* liste, int nbrPortees){
ajouterMotifVirtuel(melodie,3,n);
}
-int main(){
+/*void lecture ()
+{
+ gtk_main_quit();
+}*/
+
+int main( int argc, char *argv[] ){
Motif* melodie[MAX_PATTERNS] = {NULL};
Motif* liste = NULL;
int nbrPortees = 2;
@@ -45,9 +53,73 @@ int main(){
taille = 0;
debut(melodie, liste, nbrPortees);
- lecture(nbrPortee, melodie);
+ //lecture(nbrPortee, melodie);
// insérer code GTK ici
+ GtkBuilder *monBuilder;
+ GtkWidget *maFenetre;
+ gtk_init( &argc, &argv );
+
+ monBuilder = gtk_builder_new();
+
+ gtk_builder_add_from_file( monBuilder, "GUI/ponytracker.glade", NULL);
+ gtk_builder_connect_signals( monBuilder, NULL);
+
+ maFenetre = GTK_WIDGET( gtk_builder_get_object( monBuilder, "fenetrePrincipale"));
+
+ gtk_widget_show_all (maFenetre);
+ gtk_main();
return EXIT_SUCCESS;
}
+
+void fenetreSample ( int argc, char *argv[] )
+{
+ GtkBuilder *monBuilderSample;
+ GtkWidget *maFenetreSample;
+
+ gtk_init( &argc, &argv );
+
+ monBuilderSample = gtk_builder_new();
+
+ gtk_builder_add_from_file( monBuilderSample, "GUI/ponytracker.glade", NULL);
+ gtk_builder_connect_signals( monBuilderSample, NULL);
+
+ maFenetreSample = GTK_WIDGET( gtk_builder_get_object( monBuilderSample, "ajoutSample"));
+
+ gtk_widget_show_all (maFenetreSample);
+}
+
+void fenetreInstrument ( int argc, char *argv[] )
+{
+ GtkBuilder *monBuilderInstrument;
+ GtkWidget *maFenetreInstrument;
+
+ gtk_init( &argc, &argv );
+
+ monBuilderInstrument = gtk_builder_new();
+
+ gtk_builder_add_from_file( monBuilderInstrument, "GUI/ponytracker.glade", NULL);
+ gtk_builder_connect_signals( monBuilderInstrument, NULL);
+
+ maFenetreInstrument = GTK_WIDGET( gtk_builder_get_object( monBuilderInstrument, "ajoutInstrument"));
+
+ gtk_widget_show_all (maFenetreInstrument);
+}
+
+void fenetreMotif ( int argc, char *argv[] )
+{
+ GtkBuilder *monBuilderMotif;
+ GtkWidget *maFenetreMotif;
+
+ gtk_init( &argc, &argv );
+
+ monBuilderMotif = gtk_builder_new();
+
+ gtk_builder_add_from_file( monBuilderMotif, "GUI/ponytracker.glade", NULL);
+ gtk_builder_connect_signals( monBuilderMotif, NULL);
+
+ maFenetreMotif = GTK_WIDGET( gtk_builder_get_object( monBuilderMotif, "ajoutMotif"));
+
+ gtk_widget_show_all (maFenetreMotif);
+}