diff options
| author | Robert Jonsson <spamatica@gmail.com> | 2012-12-10 19:40:00 +0000 |
|---|---|---|
| committer | Robert Jonsson <spamatica@gmail.com> | 2012-12-10 19:40:00 +0000 |
| commit | 5d45a0a6a4d44bb83098641d2595daec686b5a65 (patch) | |
| tree | 38ad111371c850a8840dc91a53ad1aaa9a3875bc /muse2/synti | |
| parent | f26abd714f485fa04c3b1480cd0c712403d74e8f (diff) | |
rc2
Diffstat (limited to 'muse2/synti')
| -rw-r--r-- | muse2/synti/simpledrums2/simpledrums.cpp | 8 | ||||
| -rw-r--r-- | muse2/synti/simpledrums2/simpledrumsgui.cpp | 23 |
2 files changed, 26 insertions, 5 deletions
diff --git a/muse2/synti/simpledrums2/simpledrums.cpp b/muse2/synti/simpledrums2/simpledrums.cpp index 8b3ea69c..ef626954 100644 --- a/muse2/synti/simpledrums2/simpledrums.cpp +++ b/muse2/synti/simpledrums2/simpledrums.cpp @@ -1,5 +1,5 @@ // -// C++ Implementation: simplesynth +// C++ Implementation: simpledrums // // Description: // @@ -1665,9 +1665,9 @@ void SimpleSynth::guiSendError(const char* errorstring) extern "C" { static MESS descriptor = { - "SimpleSynth", - "SimpleSynth by Mathias Lundgren", // (lunar_shuttle@users.sf.net)", - "0.1", //Version string + "SimpleDrums", + "SimpleDrums by Mathias Lundgren", // (lunar_shuttle@users.sf.net)", + "0.1.1", //Version string MESS_MAJOR_VERSION, MESS_MINOR_VERSION, instantiate, }; diff --git a/muse2/synti/simpledrums2/simpledrumsgui.cpp b/muse2/synti/simpledrums2/simpledrumsgui.cpp index 54063959..f5e38a86 100644 --- a/muse2/synti/simpledrums2/simpledrumsgui.cpp +++ b/muse2/synti/simpledrums2/simpledrumsgui.cpp @@ -94,6 +94,26 @@ SimpleSynthGui* simplesynthgui_ptr; +QString labelStrings[] = { + "C 1", + "C#1", + "D 1", + "D#1", + "E 1", + "F 1", + "F#1", + "G 1", + + "G#1", + "A 1", + "A#1", + "B 1", + "C 2", + "C#2", + "D 2", + "D#2", +}; + /*! \fn QChannelSlider::QChannelSlider(Qt::Orientation orientation, int ch, QWidget* parent, const char* name) @@ -401,7 +421,8 @@ SimpleSynthGui::SimpleSynthGui() QHBoxLayout* strip = new QHBoxLayout;//(mgbLayout, 5); mgbLayout->addLayout(strip, r, c); - QLabel* channelLabel = new QLabel(QString("Ch ") + QString::number(i + 1), mainGroupBox); + //QLabel* channelLabel = new QLabel(QString("Ch ") + QString::number(i + 1), mainGroupBox); + QLabel* channelLabel = new QLabel(QString::number(i + 1) + ": (" +labelStrings[i] + ")", mainGroupBox); strip->addWidget(channelLabel); sampleNameLineEdit[i] = new QLineEdit(mainGroupBox); |