From e93068b7480fe5b3124523798ad80d5278518b99 Mon Sep 17 00:00:00 2001
From: root <root@raspberrypi.(none)>
Date: Tue, 17 Feb 2015 08:00:48 +0000
Subject: [PATCH] Modification programme : recup resolution temporelle

---
 main.py        | 12 ++++++------
 python_midi.py | 36 +++++++++++++++++++++++++++++++++---
 2 files changed, 39 insertions(+), 9 deletions(-)

diff --git a/main.py b/main.py
index 85810b3..1addb51 100644
--- a/main.py
+++ b/main.py
@@ -1,12 +1,12 @@
 import python_midi
 import dico_notes
 import sys
+import thread_dd
+
 
 def main(args):
 	print "Bienvenue dans le programme de traitement des fichiers MIDI"
-	(p,v,t) = python_midi.midi_treatment_file("mary.mid")
-	print p
-	print v
-	print t
-
-main(sys.argv)
\ No newline at end of file
+	print '\n'
+	(p,v,t,f,r) = python_midi.midi_treatment_file("/home/pi/python-midi/mary.mid")
+	print (p,v,t,f,r)
+main(sys.argv)
diff --git a/python_midi.py b/python_midi.py
index 2552bba..96191a6 100755
--- a/python_midi.py
+++ b/python_midi.py
@@ -1,6 +1,9 @@
+#! /usr/bin/python
+
 import sys
 import os
 import re
+import dico_notes
 
 def midi_treatment_file(midi_file):
 	os.system("mididump.py " + midi_file + ">musique.txt")
@@ -9,8 +12,21 @@ def midi_treatment_file(midi_file):
 	midi_frame = texte.split("),")
 	midi_note_events = []
 	i = 0
+	resolution = 0
+	nn = 0
+	dd = 0
+	key = 0
+	m = 0
+	ntimc = 0
 	while (i < len(midi_frame)-1):
-		if(("midi.NoteOn" in midi_frame[i]) or ("midi.NoteOff" in midi_frame[i])):
+		if ("midi.TimeSignatureEvent" in midi_frame[i]):
+			resolution=midi_frame[i][34:37]
+			i+=1
+		elif ("midi.KeySignatureEvent" in midi_frame[i]):
+			key = midi_frame[i][41:42]
+			m = midi_frame[i][44:45]
+			i+=1
+		elif (("midi.NoteOn" in midi_frame[i]) or ("midi.NoteOff" in midi_frame[i])):
 			midi_note_events.append(midi_frame[i])
 			i+=1
 		else:
@@ -43,7 +59,7 @@ def midi_treatment_file(midi_file):
 
 	l = 0
 	while (l < len(pitches)):
-		pitches[l] = int(pitches[l])
+		pitches[l] = str(pitches[l])
 		l+=1
 
 	k = 0
@@ -57,4 +73,18 @@ def midi_treatment_file(midi_file):
 		velocity[l] = int(velocity[l])
 		l+=1
 
-	return (pitches,velocity,ticks)
+	frequency = []
+	k = 0
+	while(k<len(pitches)-1):
+		frequency.append(dico_notes.midi_note[pitches[k]])
+		k+=1
+
+	print resolution
+	if (key == '0'):
+		print "Cle de DO"
+	if (m == '0'):
+		print "MAJEUR"
+
+	return (pitches,velocity,ticks,frequency,resolution)
+
+(p,v,t,f,r) = midi_treatment_file("/home/pi/python-midi/mary.mid")
--
libgit2 0.21.2