summaryrefslogtreecommitdiff
path: root/noncore/multimedia
Unidiff
Diffstat (limited to 'noncore/multimedia') (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/tonleiter/tonleiterdatahelper.cpp4
1 files changed, 1 insertions, 3 deletions
diff --git a/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp b/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp
index 6b8a5bd..c52e0da 100644
--- a/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp
+++ b/noncore/multimedia/tonleiter/tonleiterdatahelper.cpp
@@ -90,28 +90,26 @@ Scale::Scale(QString name,QValueList<int> halftones)
90//**************************************************************************** 90//****************************************************************************
91Scale::~Scale() 91Scale::~Scale()
92{ 92{
93} 93}
94//**************************************************************************** 94//****************************************************************************
95int Scale::noOfHaltones() 95int Scale::noOfHaltones()
96{ 96{
97 return (int)halftones.count(); 97 return (int)halftones.count();
98} 98}
99//**************************************************************************** 99//****************************************************************************
100int Scale::getHalfTone(int id) 100int Scale::getHalfTone(int id)
101{ 101{
102 if(id>=0 && noOfHaltones()<id) 102 if(id>=0 && id<noOfHaltones())
103 {
104 return halftones[id]; 103 return halftones[id];
105 }
106 else 104 else
107 return 0; 105 return 0;
108} 106}
109//**************************************************************************** 107//****************************************************************************
110QString Scale::scaleName() 108QString Scale::scaleName()
111{ 109{
112 return name; 110 return name;
113} 111}
114//**************************************************************************** 112//****************************************************************************
115bool Scale::noteInScale(int base,int note) 113bool Scale::noteInScale(int base,int note)
116{ 114{
117 int octave=Note::getOctaveOfNote(note); 115 int octave=Note::getOctaveOfNote(note);