Skip to content

Commit 9842977

Browse files
committed
-new song
1 parent e051f08 commit 9842977

File tree

4 files changed

+44
-106
lines changed

4 files changed

+44
-106
lines changed

tones/blank.wav

-1.81 MB
Binary file not shown.

tones/blankSpace.txt

Lines changed: 37 additions & 103 deletions
Original file line numberDiff line numberDiff line change
@@ -1,109 +1,43 @@
1-
f5,q,
2-
f5,dq,
3-
shit,sq,
4-
f5,q,
5-
f5,dq,
6-
shit,sq,
7-
f5,q,
8-
f5,dq,
9-
shit,sq,
10-
f5,dh,
11-
g5,q,
12-
a5,dq,
13-
a5,dq,
14-
g5,dq,
15-
f5,q,
16-
g5,dq,
17-
a5,dq,
18-
d5,dh,
1+
rest,q,
2+
f5,s,
3+
f5,s,
4+
rest,e,
5+
f5,s,
6+
f5,s,
7+
rest,e,
8+
f5,s,
9+
f5,s,
10+
rest,e,
1911
----------,z,
20-
shit,sq,
21-
f5,q,
22-
f5,dq,
23-
shit,sq,
2412
f5,q,
25-
f5,dq,
26-
shit,sq,
27-
f5,q,
28-
f5,dq,
29-
shit,sq,
30-
f5,dh,
13+
g5,s,
14+
a5,e,
15+
a5,e,
3116
g5,q,
32-
a5,dq,
33-
a5,dq,
34-
g5,dq,
35-
f5,q,
36-
g5,dq,
37-
a5,dq,
17+
f5,s,
18+
g5,s,
19+
f5,s,
20+
g5,e,
3821
----------,z,
39-
as4,dq,
40-
f5,dq,
41-
f5,h,
42-
shit,sq,
43-
c5,q,
44-
c5,q,
45-
a5,q,
46-
a5,dq,
47-
shit,sq,
48-
as4,dq,
49-
f5,dq,
50-
f5,h,
51-
shit,sq,
52-
c5,q,
53-
c5,q,
54-
a5,dq,
55-
a5,h,
56-
shit,sq,
57-
as4,q,
58-
f5,dq,
59-
f5,h,
60-
shit,sq,
61-
c5,q,
62-
a5,dq,
63-
a5,h,
64-
as5,sq,
65-
a5,q,
66-
g5,w,
67-
f5,dq,
68-
shit,sq,
69-
----------,z,
70-
----------,z,
71-
f5,q,
72-
f5,q,
73-
f5,q,
74-
f5,q,
75-
f5,q,
76-
f5,q,
77-
g5,h,
78-
a5,h,
22+
f5,s,
23+
d5,de,
24+
f5,s,
25+
f5,s,
26+
rest,e,
27+
f5,s,
28+
f5,s,
29+
rest,e,
30+
f5,s,
31+
f5,s,
32+
rest,e,
7933
----------,z,
80-
shit,dq,
81-
f5,q,
82-
f5,q,
83-
f5,q,
84-
f5,q,
85-
f5,h,
86-
a5,h,
87-
e5,h,
88-
e5,h,
89-
f5,h,
90-
----------,z,
91-
f5,q,
92-
f5,q,
93-
f5,q,
94-
f5,q,
95-
f5,q,
96-
f5,q,
97-
g5,dq,
98-
a5,dq,
99-
----------,z,
100-
shit,q,
101-
f5,q,
102-
f5,q,
103-
f5,q,
10434
f5,q,
105-
f5,dq,
106-
a5,dq,
107-
e5,dq,
108-
e5,dq,
109-
f5,dq,
35+
g5,s,
36+
a5,e,
37+
a5,s,
38+
a5,e,
39+
g5,s,
40+
g5,s,
41+
g5,s,
42+
f5,de,
43+
----------,z,

tones/musiclib.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
import string
22
#A4 = 440.0 Hz tuning
3-
tempo = 60
3+
tempo = 96
44
#number_of_notes = 12
55

66
sample = [("c0",16.35),("cs0",17.32),("db0",17.32),("d0",18.35),\
@@ -84,7 +84,8 @@ def get_location(note):
8484

8585

8686
def frequency(note,tuning):
87-
if note == 'shit':
87+
print note
88+
if note == 'rest':
8889
return 0
8990
if note == '----------':
9091
return 0
@@ -97,7 +98,10 @@ def frequency(note,tuning):
9798

9899
def timesDict():
99100
octav =7
100-
q = [("sq",0.125),("q",0.25),("dq",.375),("ei",0.125 ), ("h",0.5),("dh",.75),("w",1.0),("z",0.0)]
101+
#q = [("sq",0.125),("q",0.25),("dq",.375),("ei",0.125 ), ("h",0.5),("dh",.75),("w",1.0),("z",0.0)]
102+
q = [('w',4),('h',2),('q',1),('e',0.5),('s',0.25),\
103+
('dq',1.5),('de',1.75),('ds',3.0/8.0),\
104+
('z',0)]
101105
d = dict()
102106
for x in q:
103107
d[x[0]] = x[1]

tones/musiclib.pyc

13 Bytes
Binary file not shown.

0 commit comments

Comments
 (0)