diff --git a/include/DetuningHelper.h b/include/PitchBendHelper.h similarity index 86% rename from include/DetuningHelper.h rename to include/PitchBendHelper.h index de0acc82603..1cef968ef57 100644 --- a/include/DetuningHelper.h +++ b/include/PitchBendHelper.h @@ -1,5 +1,5 @@ /* - * DetuningHelper.h - detuning automation helper + * PitchBendHelper.h - pitch bend automation helper * * Copyright (c) 2007 Javier Serrano Polo * Copyright (c) 2008-2010 Tobias Doerffel @@ -29,17 +29,17 @@ #include "InlineAutomation.h" #include "MemoryManager.h" -class DetuningHelper : public InlineAutomation +class PitchBendHelper : public InlineAutomation { Q_OBJECT MM_OPERATORS public: - DetuningHelper() : + PitchBendHelper() : InlineAutomation() { } - virtual ~DetuningHelper() + virtual ~PitchBendHelper() { } @@ -50,12 +50,12 @@ class DetuningHelper : public InlineAutomation virtual QString displayName() const { - return tr( "Note detuning" ); + return tr( "Note pitch bend" ); } inline virtual QString nodeName() const { - return "detuning"; + return "pitch bend"; } } ; diff --git a/src/gui/editors/PianoRoll.cpp b/src/gui/editors/PianoRoll.cpp index 3bbcdebf7a0..3e964df5c77 100644 --- a/src/gui/editors/PianoRoll.cpp +++ b/src/gui/editors/PianoRoll.cpp @@ -49,7 +49,7 @@ #include "Clipboard.h" #include "ComboBox.h" #include "debug.h" -#include "DetuningHelper.h" +#include "PitchBendHelper.h" #include "embed.h" #include "GuiApplication.h" #include "gui_templates.h" @@ -876,7 +876,7 @@ void PianoRoll::drawNoteRect( QPainter & p, int x, int y, -void PianoRoll::drawDetuningInfo( QPainter & _p, const Note * _n, int _x, +void PianoRoll::drawPitchBendInfo( QPainter & _p, const Note * _n, int _x, int _y ) const { int middle_y = _y + KEY_LINE_HEIGHT / 2; @@ -885,7 +885,7 @@ void PianoRoll::drawDetuningInfo( QPainter & _p, const Note * _n, int _x, int old_x = 0; int old_y = 0; - timeMap & map = _n->detuning()->automationPattern()->getTimeMap(); + timeMap & map = _n->pitchBend()->automationPattern()->getTimeMap(); for( timeMap::ConstIterator it = map.begin(); it != map.end(); ++it ) { int pos_ticks = it.key(); @@ -901,7 +901,7 @@ void PianoRoll::drawDetuningInfo( QPainter & _p, const Note * _n, int _x, if( old_x != 0 && old_y != 0 ) { - switch( _n->detuning()->automationPattern()->progressionType() ) + switch( _n->pitchBend()->automationPattern()->progressionType() ) { case AutomationPattern::DiscreteProgression: _p.drawLine( old_x, old_y, pos_x, old_y ); @@ -1336,21 +1336,21 @@ void PianoRoll::mousePressEvent(QMouseEvent * me ) return; } - if( m_editMode == ModeEditDetuning && noteUnderMouse() ) + if( m_editMode == ModeEditPitchBend && noteUnderMouse() ) { - static AutomationPattern* detuningPattern = nullptr; - if (detuningPattern != nullptr) + static AutomationPattern* pitchBendPattern = nullptr; + if (pitchBendPattern != nullptr) { - detuningPattern->disconnect(this); + pitchBendPattern->disconnect(this); } Note* n = noteUnderMouse(); - if (n->detuning() == nullptr) + if (n->pitchBend() == nullptr) { - n->createDetuning(); + n->createPitchBend(); } - detuningPattern = n->detuning()->automationPattern(); - connect(detuningPattern, SIGNAL(dataChanged()), this, SLOT(update())); - gui->automationEditor()->open(detuningPattern); + pitchBendPattern = n->pitchBend()->automationPattern(); + connect(pitchBendPattern, SIGNAL(dataChanged()), this, SLOT(update())); + gui->automationEditor()->open(pitchBendPattern); return; } @@ -3048,9 +3048,9 @@ void PianoRoll::paintEvent(QPaintEvent * pe ) editHandles << QPoint ( x + noteEditLeft(), editHandleTop ); - if( note->hasDetuningInfo() ) + if( note->hasPitchBendInfo() ) { - drawDetuningInfo( p, note, + drawPitchBendInfo( p, note, x + WHITE_KEY_WIDTH, y_base - key * KEY_LINE_HEIGHT ); } @@ -3137,7 +3137,7 @@ void PianoRoll::paintEvent(QPaintEvent * pe ) break; case ModeErase: cursor = s_toolErase; break; case ModeSelect: cursor = s_toolSelect; break; - case ModeEditDetuning: cursor = s_toolOpen; break; + case ModeEditPitchBend: cursor = s_toolOpen; break; } if( cursor != NULL ) { @@ -4115,7 +4115,7 @@ PianoRollWindow::PianoRollWindow() : pitchBendAction->setWhatsThis( tr( "Click here and Pitch Bend mode will be activated. " "In this mode you can click a note to open its " - "automation detuning. You can utilize this to slide " + "automation pitch bend. You can utilize this to slide " "notes from one to another. You can also press " "'Shift+T' on your keyboard to activate this mode." ) );