Diffstat (limited to 'noncore/multimedia/tonleiter/tonleiterdatahelper.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/tonleiter/tonleiterdatahelper.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp b/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp index d904a71..285d2c1 100644 --- a/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp +++ b/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp | |||
@@ -1,144 +1,144 @@ | |||
1 | #include "tonleiterdatahelper.h" | 1 | #include "tonleiterdatahelper.h" |
2 | 2 | ||
3 | #include <math.h> | 3 | #include <math.h> |
4 | 4 | ||
5 | using namespace Data; | 5 | using namespace Data; |
6 | 6 | ||
7 | int Note::getOctaveOfNote(int note) | 7 | int Note::getOctaveOfNote(int note) |
8 | { | 8 | { |
9 | int remain=note%12; | 9 | int remain=note%12; |
10 | return (note-remain)/12; | 10 | return (note-remain)/12; |
11 | } | 11 | } |
12 | //**************************************************************************** | 12 | //**************************************************************************** |
13 | QString Note::getNameOfNote(int note) | 13 | QString Note::getNameOfNote(int note) |
14 | { | 14 | { |
15 | int octave=getOctaveOfNote(note); | 15 | int octave=getOctaveOfNote(note); |
16 | return notenames[note-12*octave]; | 16 | return notenames[note-12*octave]; |
17 | } | 17 | } |
18 | //**************************************************************************** | 18 | //**************************************************************************** |
19 | int Note::getNoteFromName(QString name,int octave) | 19 | int Note::getNoteFromName(QString name,int octave) |
20 | { | 20 | { |
21 | int notevalue=0; | 21 | int notevalue=0; |
22 | for(int a=0;a<12;a++) | 22 | for(int a=0;a<12;a++) |
23 | { | 23 | { |
24 | if(name==notenames[a]) | 24 | if(name==notenames[a]) |
25 | { | 25 | { |
26 | notevalue=a; | 26 | notevalue=a; |
27 | break; | 27 | break; |
28 | } | 28 | } |
29 | } | 29 | } |
30 | return notevalue+12*octave; | 30 | return notevalue+12*octave; |
31 | } | 31 | } |
32 | //**************************************************************************** | 32 | //**************************************************************************** |
33 | int Note::octaveOfBaseNote(int base,int note) | 33 | int Note::octaveOfBaseNote(int base,int note) |
34 | { | 34 | { |
35 | int normnote = (note>=base) ? note-base : (12-base)+note; | 35 | int normnote = (note>=base) ? note-base : (12-base)+note; |
36 | int octave=getOctaveOfNote(normnote); | 36 | int octave=getOctaveOfNote(normnote); |
37 | //qDebug("note %d of %d base is norm %d -> ocatve %d",note,base,normnote,octave); | 37 | //odebug << "note " << note << " of " << base << " base is norm " << normnote << " -> ocatve " << octave << "" << oendl; |
38 | return octave; | 38 | return octave; |
39 | } | 39 | } |
40 | //**************************************************************************** | 40 | //**************************************************************************** |
41 | //**************************************************************************** | 41 | //**************************************************************************** |
42 | Instrument::Instrument() | 42 | Instrument::Instrument() |
43 | { | 43 | { |
44 | name="UNDEFINED"; | 44 | name="UNDEFINED"; |
45 | frets=0; | 45 | frets=0; |
46 | } | 46 | } |
47 | //**************************************************************************** | 47 | //**************************************************************************** |
48 | Instrument::Instrument(QString name,int frets,QValueList<int> strings) | 48 | Instrument::Instrument(QString name,int frets,QValueList<int> strings) |
49 | :name(name),frets(frets),strings(strings) | 49 | :name(name),frets(frets),strings(strings) |
50 | { | 50 | { |
51 | } | 51 | } |
52 | //**************************************************************************** | 52 | //**************************************************************************** |
53 | Instrument::~Instrument() | 53 | Instrument::~Instrument() |
54 | { | 54 | { |
55 | } | 55 | } |
56 | //**************************************************************************** | 56 | //**************************************************************************** |
57 | int Instrument::noOfStrings() | 57 | int Instrument::noOfStrings() |
58 | { | 58 | { |
59 | return (int)strings.count(); | 59 | return (int)strings.count(); |
60 | } | 60 | } |
61 | //**************************************************************************** | 61 | //**************************************************************************** |
62 | int Instrument::noOfFrets() | 62 | int Instrument::noOfFrets() |
63 | { | 63 | { |
64 | return frets; | 64 | return frets; |
65 | } | 65 | } |
66 | //**************************************************************************** | 66 | //**************************************************************************** |
67 | QString Instrument::instName() | 67 | QString Instrument::instName() |
68 | { | 68 | { |
69 | return name; | 69 | return name; |
70 | } | 70 | } |
71 | //**************************************************************************** | 71 | //**************************************************************************** |
72 | int Instrument::string(int id) | 72 | int Instrument::string(int id) |
73 | { | 73 | { |
74 | return strings[id]; | 74 | return strings[id]; |
75 | } | 75 | } |
76 | //**************************************************************************** | 76 | //**************************************************************************** |
77 | int Instrument::noOfOctaves() | 77 | int Instrument::noOfOctaves() |
78 | { | 78 | { |
79 | return (int) ceil((highestNote()-lowestNote())/12.0); | 79 | return (int) ceil((highestNote()-lowestNote())/12.0); |
80 | } | 80 | } |
81 | //**************************************************************************** | 81 | //**************************************************************************** |
82 | int Instrument::lowestNote() | 82 | int Instrument::lowestNote() |
83 | { | 83 | { |
84 | return strings[0]; | 84 | return strings[0]; |
85 | 85 | ||
86 | } | 86 | } |
87 | //**************************************************************************** | 87 | //**************************************************************************** |
88 | int Instrument::highestNote() | 88 | int Instrument::highestNote() |
89 | { | 89 | { |
90 | return strings[strings.count()-1]+frets; | 90 | return strings[strings.count()-1]+frets; |
91 | } | 91 | } |
92 | //**************************************************************************** | 92 | //**************************************************************************** |
93 | //**************************************************************************** | 93 | //**************************************************************************** |
94 | Scale::Scale() | 94 | Scale::Scale() |
95 | { | 95 | { |
96 | name="UNDEFINED"; | 96 | name="UNDEFINED"; |
97 | } | 97 | } |
98 | //**************************************************************************** | 98 | //**************************************************************************** |
99 | Scale::Scale(QString name,QValueList<int> halftones) | 99 | Scale::Scale(QString name,QValueList<int> halftones) |
100 | :name(name),halftones(halftones) | 100 | :name(name),halftones(halftones) |
101 | { | 101 | { |
102 | } | 102 | } |
103 | //**************************************************************************** | 103 | //**************************************************************************** |
104 | Scale::~Scale() | 104 | Scale::~Scale() |
105 | { | 105 | { |
106 | } | 106 | } |
107 | //**************************************************************************** | 107 | //**************************************************************************** |
108 | int Scale::noOfHaltones() | 108 | int Scale::noOfHaltones() |
109 | { | 109 | { |
110 | return (int)halftones.count(); | 110 | return (int)halftones.count(); |
111 | } | 111 | } |
112 | //**************************************************************************** | 112 | //**************************************************************************** |
113 | int Scale::getHalfTone(int id) | 113 | int Scale::getHalfTone(int id) |
114 | { | 114 | { |
115 | if(id>=0 && id<noOfHaltones()) | 115 | if(id>=0 && id<noOfHaltones()) |
116 | return halftones[id]; | 116 | return halftones[id]; |
117 | else | 117 | else |
118 | return 0; | 118 | return 0; |
119 | } | 119 | } |
120 | //**************************************************************************** | 120 | //**************************************************************************** |
121 | QString Scale::scaleName() | 121 | QString Scale::scaleName() |
122 | { | 122 | { |
123 | return name; | 123 | return name; |
124 | } | 124 | } |
125 | //**************************************************************************** | 125 | //**************************************************************************** |
126 | bool Scale::noteInScale(int base,int note) | 126 | bool Scale::noteInScale(int base,int note) |
127 | { | 127 | { |
128 | int octave=Note::getOctaveOfNote(note); | 128 | int octave=Note::getOctaveOfNote(note); |
129 | note-=12*octave; | 129 | note-=12*octave; |
130 | int normnote = (note>=base) ? note-base : (12-base)+note; | 130 | int normnote = (note>=base) ? note-base : (12-base)+note; |
131 | 131 | ||
132 | if(halftones.contains(normnote)>0) | 132 | if(halftones.contains(normnote)>0) |
133 | { | 133 | { |
134 | //qDebug("OK : base : %d, note %d -> norm %d",base,note,normnote); | 134 | //odebug << "OK : base : " << base << ", note " << note << " -> norm " << normnote << "" << oendl; |
135 | return true; | 135 | return true; |
136 | } | 136 | } |
137 | else | 137 | else |
138 | { | 138 | { |
139 | //qDebug("BAD : base : %d, note %d -> norm %d",base,note,normnote); | 139 | //odebug << "BAD : base : " << base << ", note " << note << " -> norm " << normnote << "" << oendl; |
140 | return false; | 140 | return false; |
141 | } | 141 | } |
142 | } | 142 | } |
143 | //**************************************************************************** | 143 | //**************************************************************************** |
144 | //**************************************************************************** | 144 | //**************************************************************************** |