← Back to branch summary

~ubuntu-branches/ubuntu/karmic/rosegarden/karmic

« back to all changes in this revision

Viewing changes to src/gui/widgets/PitchDragLabel.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Stefan Ebner
  • Date: 2008-05-02 00:33:44 UTC
  • mfrom: (1.1.7 upstream) (6.1.1 lenny)
  • Revision ID: james.westby@ubuntu.com-20080502003344-67vbfhgqx2yl0ksi
Tags: 1:1.7.0-1ubuntu1
https://launchpad.net/bugs/225849
* Merge from Debian unstable. (LP: #225849) Remaining Ubuntu changes:
  - Add usr/share/doc/kde/HTML to rosegarden-data, to provide online
    help documentation.
  - Change fftw3-dev to libfftw3-dev.
  - Update maintainer field as per spec.

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/gui/widgets/PitchDragLabel.cpp
4
4
    Rosegarden
5
5
    A MIDI and audio sequencer and musical notation editor.
6
6
 
7
 
    This program is Copyright 2000-2007
 
7
    This program is Copyright 2000-2008
8
8
        Guillaume Laurent   <glaurent@telegraph-road.org>,
9
9
        Chris Cannam        <cannam@all-day-breakfast.com>,
10
10
        Richard Bown        <richard.bown@ferventsoftware.com>
59
59
void
60
60
PitchDragLabel::slotSetPitch(int p)
61
61
{
62
 
    if (m_pitch == p)
63
 
        return ;
64
62
    bool up = (p > m_pitch);
65
63
    m_usingSharps = up;
 
64
    if (m_pitch == p)
 
65
        return ;
66
66
    m_pitch = p;
67
67
    calculatePixmap();
68
68
    emitPitchChange();
108
108
            newPitch = 127;
109
109
 
110
110
        if (m_pitch != newPitch) {
111
 
            if (newPitch > m_pitch)
 
111
            bool up = (newPitch > m_pitch);
 
112
            m_pitch = newPitch;
 
113
            m_usingSharps = up;
 
114
            calculatePixmap();
 
115
            emit pitchDragged(m_pitch);
 
116
            if (up)
112
117
            {
113
118
                // use sharps
114
 
                emit pitchDragged(newPitch, (int)(((long)newPitch) / 12),
115
 
                                  steps_Cmajor_with_sharps[newPitch % 12]);
 
119
                emit pitchDragged(m_pitch, (int)(((long)m_pitch) / 12),
 
120
                                  steps_Cmajor_with_sharps[m_pitch % 12]);
116
121
            }
117
122
            else
118
123
            {
119
124
                // use flats
120
 
                emit pitchDragged(newPitch, (int)(((long)newPitch) / 12),
121
 
                                  steps_Cmajor_with_flats[newPitch % 12]);
 
125
                emit pitchDragged(m_pitch, (int)(((long)m_pitch) / 12),
 
126
                                  steps_Cmajor_with_flats[m_pitch % 12]);
122
127
            }
 
128
            emit preview(m_pitch);
 
129
            paintEvent(0);
123
130
        }
124
131
    }
125
132
}
156
163
{
157
164
    if (e->delta() > 0) {
158
165
        if (m_pitch < 127) {
159
 
            int newPitch = m_pitch + 1;
160
 
            // use sharps
161
 
            emit pitchDragged(newPitch, (int)(((long)newPitch) / 12),
162
 
                              steps_Cmajor_with_sharps[newPitch % 12]);
 
166
            ++m_pitch;
 
167
            m_usingSharps = true;
 
168
            calculatePixmap();
 
169
                        emitPitchChange();
 
170
            emit preview(m_pitch);
 
171
            paintEvent(0);
163
172
        }
164
173
    } else {
165
174
        if (m_pitch > 0) {
166
 
            int newPitch = m_pitch - 1;
167
 
            // use flats
168
 
            emit pitchDragged(newPitch, (int)(((long)newPitch) / 12),
169
 
                              steps_Cmajor_with_flats[newPitch % 12]);
 
175
            --m_pitch;
 
176
            m_usingSharps = false;
 
177
            calculatePixmap();
 
178
            emitPitchChange();
 
179
            emit preview(m_pitch);
 
180
            paintEvent(0);
170
181
        }
171
182
    }
172
183
}