Add key pressing

eishchuk
1 parent 88c1f94c
Showing 16 changed files with 119 additions and 87 deletions Show diff stats
COW_d.WAV
DO.WAV
FA.WAV
LA.WAV
MI.WAV
Makefile
RE.WAV
SI.WAV
SOL.WAV
clavier
main.cpp
main.o
readme.md
task.txt
test
testWAV.pro
-CC = g++
-FLAGS = -c
-OBJECTS = $(SOURDES:.cpp=.o)
-
-TARGET = clavier
-
-$(TARGET) : $(OBJECTS)
-
-all: $(TARGET)
+all: 
+	g++ -c main.cpp fft.cpp wavdata.cpp
+	g++ -o clavier main.o fft.o wavdata.o
 clean:
-	rm -f core *.o $(TARGET)
+	rm -f core *.o clavier
@@ -2,93 +2,135 @@
 #include "wavdata.h"
 #include "fft.h"
 #include <math.h>
+#include <stdio.h>
+#include <stdlib.h>
+
 #define DELAY 5000
-#define TOUCH 35000
+#define TOUCH 30000
 #define AMPLITUDE 0.5
-int main(int argc, char **argv)
-{
-	/*WavData w;
-    char * name = "COW.WAV";
-	w.load(name);
-
-	char *data = w.data();
-	char *data2 = new char[w.datasize()*2];
-
-	int i;
-	for(i=0;i<w.datasize();i++)
-		data2[i]=data[i];
-	for(;i<w.datasize()*2;i++)
-		data2[i]=128;
-
-	for(int i=DELAY;i<2*w.datasize();i++)
-	{
-		float value = (float)(unsigned char)data2[i-DELAY]-128.0;
-		value = value * AMPLITUDE;
-		int val = (unsigned int)value + (unsigned char)data2[i];
-		if(val>255)val=255;
-		if(val<0)val=0;
+#define DO_FREQ 16744
+#define RE_FREQ 18794
+#define MI_FREQ 21096
+#define FA_FREQ 22350
+#define SOL_FREQ 25087
+#define LA_FREQ 28160
+#define SI_FREQ 31608
-		data2[i]= (unsigned char)(unsigned int)val;
-	}
+#define MAX_NOTES 7
-	w.clearData();
-	w.setDatasize(w.datasize()*2);
-	w.setData(data2);
-    char * name_save = "COW_d.WAV";
-	w.save(name_save);*/
+char * sounds[MAX_NOTES];
+char buttons[MAX_NOTES];
+int freqs[MAX_NOTES];
+void save(int freq, char * filename) {
+    WavData data;
+    data.load("COW.WAV");
-    // recréer une note ) partir du son de la vache
+    data.setFrequency(freq);
-    WavData note_do;
-    note_do.load("COW.WAV");
-    
-    printf("Frequency : %d\n", note_do.frequency());
-    
-    
-    
-    char * data_do = note_do.data();
+    char * data_do = data.data();
+    char *data2 = new char[data.datasize()/2];
+
+	int i;
+    int j = 0;
+	for(i=0;i<data.datasize();i+=2) {
+		data2[j]=data_do[i];
+        j++;
+    }
-    // TOUCH = durée d'une note
-    int size = note_do.datasize();
+    int size = data.datasize()/2;
     if (size > TOUCH) size = TOUCH;
-    // changer le son pour avoir une note approprié
+    data.clearData();
+	data.setDatasize(size);
+	data.setData(data2);
+
+    data.save(filename);
+}
+
+void generate_sounds() {
+    for (int i = 0; i < MAX_NOTES; i++) {
+        save(freqs[i], sounds[i]);
+    }
+}
+
+int play_music(char* filename) {
-    /*int i;
-    for (i = 0; i < size ; i++) {
-        data_do[i] = i;
-    }*/
+    char command[256];
+    int status;
-    // assign new data & save
+    sprintf( command, "aplay -c 1 -q -t wav %s", filename );
+
+    status = system( command );
+     
+    return status;
+}
+
+int run_sound(char button) {
-    //note_do.clearData();
-    note_do.setDatasize(TOUCH);
-    note_do.setFrequency(16744);
-    //note_do.setData(data_do);
+    for(int i = 0; i < MAX_NOTES; i++ ) {
+        if (buttons[i] == button) {
+            return play_music(sounds[i]);
+        }
+    }
-    note_do.save("DO.WAV");
+    return -1;
+}
+
+void load_data() {
+    sounds[0] = "DO.WAV",
+    sounds[1] = "RE.WAV",
+    sounds[2] = "MI.WAV",
+    sounds[3] = "FA.WAV",
+    sounds[4] = "SOL.WAV",
+    sounds[5] = "LA.WAV",
+    sounds[6] = "SI.WAV";
+    
+    buttons[0] = 'q';
+    buttons[1] = 's';
+    buttons[2] = 'd';
+    buttons[3] = 'f';
+    buttons[4] = 'g';
+    buttons[5] = 'h';
+    buttons[6] = 'j';
+    
+    freqs[0] = DO_FREQ;
+    freqs[1] = RE_FREQ;
+    freqs[2] = MI_FREQ;
+    freqs[3] = FA_FREQ;
+    freqs[4] = SOL_FREQ;
+    freqs[5] = LA_FREQ;
+    freqs[6] = SI_FREQ;
+}
+
+int main(int argc, char **argv)
+{
-    note_do.setFrequency(18794);
-    note_do.save("RE.WAV");
+    char button;
-    note_do.setFrequency(21096);
-    note_do.save("MI.WAV");
+    /* load sounds, buttons and frequencies*/
+    load_data();
-    note_do.setFrequency(22350);
-    note_do.save("FA.WAV");
+    /* generate sounds from do to si (you'll find them in the same repository)*/
+    generate_sounds();
-    note_do.setFrequency(25087);
-    note_do.save("SOL.WAV");
+    printf("You can play on the keyboards q-j which corresponds to the notes do - si\n. To exit press e.\n  Enjoy!\n");
-    note_do.setFrequency(28160);
-    note_do.save("LA.WAV");
+    /* reconfigure consol to detect pressed key without enter pressing*/
+    system ("/bin/stty raw");
+
+    /* char can be read without enter; to stop it - . should be pressed*/    
+    while((button=getchar())!= '.') {
+        putchar(button);
+        run_sound(button);
+    }
-    note_do.setFrequency(31608);
-    note_do.save("SI.WAV");
+    /* return to normal consol mode*/
+    system ("/bin/stty cooked");
+    return 0;
 }
@@ -0,0 +1,9 @@
+# to compile project
+make clean
+make all
+
+# to execute 
+./clavier
+
+# to play on "piano": press buttons from 'q' to 'j' which correspond to do - si
+# to stop : press '.'
@@ -1 +0,0 @@
-Realiser un clavier de piano sur les touches pour avoir le son de vach pour chaque note musicale
@@ -1,12 +0,0 @@
-######################################################################
-# Automatically generated by qmake (2.01a) lun. mai 9 11:16:11 2011
-######################################################################
-
-TEMPLATE = app
-TARGET = 
-DEPENDPATH += .
-INCLUDEPATH += .
-
-# Input
-HEADERS += fft.h wavdata.h
-SOURCES += fft.cpp main.cpp wavdata.cpp