Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix crash in Audio File Processor #7124

Merged
merged 2 commits into from
Feb 24, 2024
Merged

Fix crash in Audio File Processor #7124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3aa5f3f
Fix crash in Audio File Processor
michaelgregorius Feb 23, 2024
f14fb88
Fix code formatting
michaelgregorius Feb 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions plugins/AudioFileProcessor/AudioFileProcessorView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,12 +184,12 @@ void AudioFileProcessorView::newWaveView()
delete m_waveView;
m_waveView = 0;
}
m_waveView = new AudioFileProcessorWaveView(this, 245, 75, &castModel<AudioFileProcessor>()->sample());
m_waveView->move(2, 172);
m_waveView->setKnobs(
m_waveView = new AudioFileProcessorWaveView(this, 245, 75, &castModel<AudioFileProcessor>()->sample(),
dynamic_cast<AudioFileProcessorWaveView::knob*>(m_startKnob),
dynamic_cast<AudioFileProcessorWaveView::knob*>(m_endKnob),
dynamic_cast<AudioFileProcessorWaveView::knob*>(m_loopKnob));
m_waveView->move(2, 172);

m_waveView->show();
}

Expand Down
37 changes: 18 additions & 19 deletions plugins/AudioFileProcessor/AudioFileProcessorWaveView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ f_cnt_t AudioFileProcessorWaveView::range() const
return m_to - m_from;
}

AudioFileProcessorWaveView::AudioFileProcessorWaveView(QWidget * parent, int w, int h, Sample const * buf) :
AudioFileProcessorWaveView::AudioFileProcessorWaveView(QWidget* parent, int w, int h, Sample const* buf,
knob* start, knob* end, knob* loop) :
QWidget(parent),
m_sample(buf),
m_graph(QPixmap(w - 2 * s_padding, h - 2 * s_padding)),
Expand All @@ -74,9 +75,9 @@ AudioFileProcessorWaveView::AudioFileProcessorWaveView(QWidget * parent, int w,
m_last_from(0),
m_last_to(0),
m_last_amp(0),
m_startKnob(0),
m_endKnob(0),
m_loopKnob(0),
m_startKnob(start),
m_endKnob(end),
m_loopKnob(loop),
m_isDragging(false),
m_reversed(false),
m_framesPlayed(0),
Expand All @@ -85,6 +86,8 @@ AudioFileProcessorWaveView::AudioFileProcessorWaveView(QWidget * parent, int w,
setFixedSize(w, h);
setMouseTracking(true);

configureKnobRelationsAndWaveViews();

updateSampleRange();

m_graph.fill(Qt::transparent);
Expand Down Expand Up @@ -399,21 +402,6 @@ void AudioFileProcessorWaveView::slide(int px)
slideSampleByFrames(step);
}

void AudioFileProcessorWaveView::setKnobs(knob * start, knob * end, knob * loop)
{
m_startKnob = start;
m_endKnob = end;
m_loopKnob = loop;

m_startKnob->setWaveView(this);
m_startKnob->setRelatedKnob(m_endKnob);

m_endKnob->setWaveView(this);
m_endKnob->setRelatedKnob(m_startKnob);

m_loopKnob->setWaveView(this);
}

void AudioFileProcessorWaveView::slideSamplePointByPx(Point point, int px)
{
slideSamplePointByFrames(
Expand Down Expand Up @@ -511,6 +499,17 @@ void AudioFileProcessorWaveView::updateCursor(QMouseEvent * me)
setCursor(Qt::OpenHandCursor);
}

void AudioFileProcessorWaveView::configureKnobRelationsAndWaveViews()
{
m_startKnob->setWaveView(this);
m_startKnob->setRelatedKnob(m_endKnob);

m_endKnob->setWaveView(this);
m_endKnob->setRelatedKnob(m_startKnob);

m_loopKnob->setWaveView(this);
}

void AudioFileProcessorWaveView::knob::slideTo(double v, bool check_bound)
{
if (check_bound && ! checkBound(v))
Expand Down
6 changes: 4 additions & 2 deletions plugins/AudioFileProcessor/AudioFileProcessorWaveView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,8 +146,8 @@ public slots:
friend class AudioFileProcessorView;

public:
AudioFileProcessorWaveView(QWidget* parent, int w, int h, Sample const* buf);
void setKnobs(knob* start, knob* end, knob* loop);
AudioFileProcessorWaveView(QWidget* parent, int w, int h, Sample const* buf,
knob* start, knob* end, knob* loop);


void updateSampleRange();
Expand All @@ -170,6 +170,8 @@ public slots:
void reverse();
void updateCursor(QMouseEvent* me = nullptr);

void configureKnobRelationsAndWaveViews();

static bool isCloseTo(int a, int b)
{
return qAbs(a - b) < 4;
Expand Down
Loading