feedc0de/DrumMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Scratching now also works when stopped

Browse Source
This commit is contained in:
0xFEEDC0DE64
2020-04-28 00:26:40 +02:00
parent 5bdf60fc82
commit 2919ca2db6
6 changed files with 65 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
trackdeck.cpp
View File

@ -25,13 +25,14 @@ TrackDeck::TrackDeck(QWidget *parent) :
connect(m_ui->verticalSliderVolume, &QAbstractSlider::valueChanged, &m_player, [&player=m_player](int value){ player.setVolume(float(value)/100.f); });
connect(m_ui->horizontalSliderSpeed, &QAbstractSlider::valueChanged, &m_player, [&player=m_player](int value){ player.setSpeed(float(value)/100.f); });
connect(m_ui->horizontalSliderSpeed, &QAbstractSlider::valueChanged, this, &TrackDeck::speedChanged);
connect(m_ui->previewWidget, &PreviewWidget::positionSelected, &m_player, &AudioPlayer::setPosition);
connect(&m_player, &AudioPlayer::positionChanged, m_ui->previewWidget, &PreviewWidget::setPosition);
connect(m_ui->scratchWidget, &ScratchWidget::scratchSpeed, &m_player, &AudioPlayer::setSpeed);
connect(m_ui->scratchWidget, &ScratchWidget::scratchBegin, this, &TrackDeck::scratchBegin);
connect(m_ui->scratchWidget, &ScratchWidget::scratchEnd, this, &TrackDeck::scratchEnd);
connect(&m_player, &AudioPlayer::positionChanged, m_ui->scratchWidget, &ScratchWidget::setPosition);
connect(&m_player, &AudioPlayer::playingChanged, m_ui->pushButtonPlay, [&button=*m_ui->pushButtonPlay](bool playing){ button.setText(playing ? tr("▮▮") : tr("▶")); });
connect(&m_player, &AudioPlayer::playingChanged, this, &TrackDeck::updatePlayButtonText);
}
TrackDeck::~TrackDeck() = default;
@ -144,3 +145,41 @@ void TrackDeck::decodingFinished(const QAudioBuffer &buffer)
m_ui->scratchWidget->setBuffer(buffer);
m_ui->progressBar->hide();
}
void TrackDeck::scratchBegin()
{
disconnect(m_ui->horizontalSliderSpeed, &QAbstractSlider::valueChanged, this, &TrackDeck::speedChanged);
m_ui->horizontalSliderSpeed->setEnabled(false);
connect(m_ui->scratchWidget, &ScratchWidget::scratchSpeed, &m_player, &AudioPlayer::setSpeed);
disconnect(&m_player, &AudioPlayer::playingChanged, this, &TrackDeck::updatePlayButtonText);
m_playingBeforeScratch = m_player.playing();
m_player.setPlaying(true);
m_speedBeforeScratch = m_player.speed();
m_stopOnEndBeforeScratch = m_player.stopOnEnd();
m_player.setStopOnEnd(false);
}
void TrackDeck::scratchEnd()
{
m_player.setPlaying(m_playingBeforeScratch);
m_player.setSpeed(m_speedBeforeScratch);
m_player.setStopOnEnd(m_stopOnEndBeforeScratch);
disconnect(m_ui->scratchWidget, &ScratchWidget::scratchSpeed, &m_player, &AudioPlayer::setSpeed);
m_ui->horizontalSliderSpeed->setEnabled(true);
connect(m_ui->horizontalSliderSpeed, &QAbstractSlider::valueChanged, this, &TrackDeck::speedChanged);
connect(&m_player, &AudioPlayer::playingChanged, this, &TrackDeck::updatePlayButtonText);
}
void TrackDeck::speedChanged(int value)
{
m_player.setSpeed(float(value)/100.f);
}
void TrackDeck::updatePlayButtonText(bool playing)
{
m_ui->pushButtonPlay->setText(playing ? tr("▮▮") : tr("▶"));
}