From a504c1d3910e2623fae92c9709c2b69503c7e4ab Mon Sep 17 00:00:00 2001 From: Lukas Prediger Date: Tue, 25 Jan 2022 22:02:11 +0200 Subject: [PATCH] RipCDDialog: References to pointers in function args. --- src/ripper/ripcddialog.cpp | 14 +++++++------- src/ripper/ripcddialog.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/ripper/ripcddialog.cpp b/src/ripper/ripcddialog.cpp index 4c3be4968..8ee57a669 100644 --- a/src/ripper/ripcddialog.cpp +++ b/src/ripper/ripcddialog.cpp @@ -217,16 +217,16 @@ void RipCDDialog::ClickedRipButton() { connect(cancel_button_, SIGNAL(clicked()), ripper, SLOT(Cancel())); connect(ripper, &Ripper::Finished, this, [this, ripper]() { - this->Finished(*ripper, /*progress_to_display = */ 1.0f); + this->Finished(ripper, /*progress_to_display = */ 1.0f); }); connect(ripper, &Ripper::Cancelled, this, [this, ripper]() { - this->Finished(*ripper, /*progress_to_display = */ 0.0f); + this->Finished(ripper, /*progress_to_display = */ 0.0f); }); ui_->progress_bar->setRange(0, 100); transcoding_progress_timer_connection_ = connect(&transcoding_progress_timer_, &QTimer::timeout, this, - [this, ripper]() { this->TranscodingProgressTimeout(*ripper); }); + [this, ripper]() { this->TranscodingProgressTimeout(ripper); }); // Add tracks and album information to the ripper. ripper->ClearTracks(); @@ -351,9 +351,9 @@ void RipCDDialog::DeviceSelected(int device_index) { SLOT(SongsLoaded(SongList))); } -void RipCDDialog::Finished(Ripper& ripper, float progress_to_display) { +void RipCDDialog::Finished(Ripper* ripper, float progress_to_display) { SetWorking(false); - ripper.deleteLater(); + ripper->deleteLater(); transcoding_progress_timer_.stop(); disconnect(transcoding_progress_timer_connection_); @@ -531,10 +531,10 @@ void RipCDDialog::UpdateMetadataFromGUI() { UpdateFileNamePreviews(); } -void RipCDDialog::TranscodingProgressTimeout(Ripper& ripper) { +void RipCDDialog::TranscodingProgressTimeout(Ripper* ripper) { if (working_) { int progress = - qBound(0, static_cast(ripper.GetProgress() * 100.0f), 100); + qBound(0, static_cast(ripper->GetProgress() * 100.0f), 100); ui_->progress_bar->setValue(progress); } } diff --git a/src/ripper/ripcddialog.h b/src/ripper/ripcddialog.h index e5b32af7a..1ec382b51 100644 --- a/src/ripper/ripcddialog.h +++ b/src/ripper/ripcddialog.h @@ -56,7 +56,7 @@ class RipCDDialog : public QDialog { void SelectNone(); void InvertSelection(); void DeviceSelected(int device_index); - void Finished(Ripper& ripper, float progress_to_display); + void Finished(Ripper* ripper, float progress_to_display); void SongsLoaded(const SongList& songs); void DiscChanged(); void FormatStringUpdated(); @@ -65,7 +65,7 @@ class RipCDDialog : public QDialog { void YearEditChanged(const QString& year_string); void UpdateMetadataEdits(); void UpdateMetadataFromGUI(); - void TranscodingProgressTimeout(Ripper& ripper); + void TranscodingProgressTimeout(Ripper* ripper); private: static const char* kSettingsGroup;