Linting the code, using QDir::tempPath instead of "/tmp"
This commit is contained in:
asiviero
parent
d014d1549d
commit
d2881aad4b
116
src/ui/ripcd.cpp
116
src/ui/ripcd.cpp
@ -66,14 +66,14 @@ RipCD::RipCD(QWidget* parent) :
|
||||
ui_->setupUi(this);
|
||||
cancel_button_ = ui_->button_box->button(QDialogButtonBox::Cancel);
|
||||
|
||||
connect(ui_->ripButton, SIGNAL(clicked()), this, SLOT(clickedRipButton()));
|
||||
connect(ui_->ripButton, SIGNAL(clicked()), this, SLOT(ClickedRipButton()));
|
||||
connect(cancel_button_, SIGNAL(clicked()), SLOT(Cancel()));
|
||||
|
||||
connect(transcoder_, SIGNAL(JobComplete(QString,bool)), SLOT(JobComplete(QString,bool)));
|
||||
connect(transcoder_, SIGNAL(JobComplete(QString, bool)), SLOT(JobComplete(QString, bool)));
|
||||
connect(transcoder_, SIGNAL(AllJobsComplete()), SLOT(AllJobsComplete()));
|
||||
connect(transcoder_, SIGNAL(JobOutputName(QString)),
|
||||
SLOT(AppendOutput(QString)));
|
||||
connect(this, SIGNAL(RippingComplete()), SLOT(threadedTranscoding()));
|
||||
connect(this, SIGNAL(RippingComplete()), SLOT(ThreadedTranscoding()));
|
||||
connect(this, SIGNAL(signalUpdateProgress()), SLOT(UpdateProgress()));
|
||||
|
||||
connect(ui_->options, SIGNAL(clicked()), SLOT(Options()));
|
||||
@ -81,10 +81,8 @@ RipCD::RipCD(QWidget* parent) :
|
||||
|
||||
setWindowTitle(tr("Rip CD"));
|
||||
|
||||
//track_t i_first_track;
|
||||
p_cdio = cdio_open(NULL, DRIVER_UNKNOWN);
|
||||
//i_first_track = cdio_get_first_track_num(p_cdio);
|
||||
i_tracks = cdio_get_num_tracks(p_cdio);
|
||||
p_cdio_ = cdio_open(NULL, DRIVER_UNKNOWN);
|
||||
i_tracks = cdio_get_num_tracks(p_cdio_);
|
||||
ui_->tableWidget->setRowCount(i_tracks);
|
||||
for (int i = 1; i <= i_tracks; i++) {
|
||||
QCheckBox *_t = new QCheckBox(tr(""), ui_->tableWidget);
|
||||
@ -102,7 +100,7 @@ RipCD::RipCD(QWidget* parent) :
|
||||
// Get presets
|
||||
QList < TranscoderPreset > presets = Transcoder::GetAllPresets();
|
||||
qSort(presets.begin(), presets.end(), ComparePresetsByName);
|
||||
foreach (const TranscoderPreset& preset, presets) {
|
||||
foreach(const TranscoderPreset& preset, presets) {
|
||||
ui_->format->addItem(
|
||||
QString("%1 (.%2)").arg(preset.name_, preset.extension_),
|
||||
QVariant::fromValue(preset));
|
||||
@ -126,22 +124,22 @@ RipCD::RipCD(QWidget* parent) :
|
||||
ui_->progress_bar->setMaximum(100);
|
||||
}
|
||||
|
||||
void RipCD::write_WAV_header(FILE *stream, int32_t i_bytecount) {
|
||||
void RipCD::WriteWAVHeader(FILE *stream, int32_t i_bytecount) {
|
||||
fwrite("RIFF", sizeof(char), 4, stream);
|
||||
put_num(i_bytecount + 44 - 8, stream, 4); /* 4-7 */
|
||||
PutNum(i_bytecount + 44 - 8, stream, 4); /* 4-7 */
|
||||
fwrite("WAVEfmt ", sizeof(char), 8, stream); /* 8-15 */
|
||||
put_num(16, stream, 4); /* 16-19 */
|
||||
put_num(1, stream, 2); /* 20-21 */
|
||||
put_num(2, stream, 2); /* 22-23 */
|
||||
put_num(44100, stream, 4); /* 24-27 */
|
||||
put_num(44100 * 2 * 2, stream, 4); /* 28-31 */
|
||||
put_num(4, stream, 2); /* 32-33 */
|
||||
put_num(16, stream, 2); /* 34-35 */
|
||||
PutNum(16, stream, 4); /* 16-19 */
|
||||
PutNum(1, stream, 2); /* 20-21 */
|
||||
PutNum(2, stream, 2); /* 22-23 */
|
||||
PutNum(44100, stream, 4); /* 24-27 */
|
||||
PutNum(44100 * 2 * 2, stream, 4); /* 28-31 */
|
||||
PutNum(4, stream, 2); /* 32-33 */
|
||||
PutNum(16, stream, 2); /* 34-35 */
|
||||
fwrite("data", sizeof(char), 4, stream); /* 36-39 */
|
||||
put_num(i_bytecount, stream, 4); /* 40-43 */
|
||||
PutNum(i_bytecount, stream, 4); /* 40-43 */
|
||||
}
|
||||
|
||||
void RipCD::put_num(long int num, FILE *stream, int bytes) {
|
||||
void RipCD::PutNum(int64_t num, FILE *stream, int bytes) {
|
||||
unsigned int i;
|
||||
unsigned char c;
|
||||
|
||||
@ -154,7 +152,7 @@ void RipCD::put_num(long int num, FILE *stream, int bytes) {
|
||||
}
|
||||
}
|
||||
|
||||
int RipCD::nTracksToRip() {
|
||||
int RipCD::NumTracksToRip() {
|
||||
int k = 0;
|
||||
for (int i = 0; i < checkboxes_.length(); i++) {
|
||||
if (checkboxes_.value(i)->isChecked() == true) {
|
||||
@ -164,14 +162,14 @@ int RipCD::nTracksToRip() {
|
||||
return k;
|
||||
}
|
||||
|
||||
void RipCD::toThreadClickedRipButton() {
|
||||
QString source_directory = "/tmp/";
|
||||
void RipCD::ThreadClickedRipButton() {
|
||||
QString source_directory = QDir::tempPath() + "/";
|
||||
|
||||
finished_success_ = 0;
|
||||
finished_failed_ = 0;
|
||||
ui_->progress_bar->setMaximum(nTracksToRip() * 2 * 100);
|
||||
ui_->progress_bar->setMaximum(NumTracksToRip() * 2 * 100);
|
||||
|
||||
emit(signalUpdateProgress());
|
||||
emit(SignalUpdateProgress());
|
||||
|
||||
// Set up the progressbar
|
||||
|
||||
@ -180,42 +178,43 @@ void RipCD::toThreadClickedRipButton() {
|
||||
continue;
|
||||
}
|
||||
tracks_to_rip_.append(i);
|
||||
lsn_t i_first_lsn = cdio_get_track_lsn(p_cdio, i);
|
||||
lsn_t i_last_lsn = cdio_get_track_last_lsn(p_cdio, i);
|
||||
// lsn_t i_last_lsn = i_first_lsn+300; // debug
|
||||
lsn_t i_first_lsn = cdio_get_track_lsn(p_cdio_, i);
|
||||
lsn_t i_last_lsn = cdio_get_track_last_lsn(p_cdio_, i);
|
||||
|
||||
lsn_t i_cursor;
|
||||
int16_t *p_readbuf = (int16_t *) calloc(CDIO_CD_FRAMESIZE_RAW, 1);
|
||||
int16_t *p_readbuf = reinterpret_cast<int16_t *>
|
||||
(calloc(CDIO_CD_FRAMESIZE_RAW, 1));
|
||||
|
||||
QString filename = source_directory + ParseFileFormatString(ui_->format_filename->text(),i) + ".wav";
|
||||
QString filename = source_directory
|
||||
+ ParseFileFormatString(ui_->format_filename->text(), i) + ".wav";
|
||||
FILE *fp = fopen(filename.toUtf8().constData(), "w");
|
||||
write_WAV_header(fp,
|
||||
WriteWAVHeader(fp,
|
||||
(i_last_lsn - i_first_lsn + 1) * CDIO_CD_FRAMESIZE_RAW);
|
||||
|
||||
for (i_cursor = i_first_lsn; i_cursor <= i_last_lsn; i_cursor++) {
|
||||
cdio_read_audio_sector(p_cdio, p_readbuf, i_cursor);
|
||||
cdio_read_audio_sector(p_cdio_, p_readbuf, i_cursor);
|
||||
if (!p_readbuf) {
|
||||
qDebug() << "Read error. Stopping.";
|
||||
break;
|
||||
} else {
|
||||
fwrite(p_readbuf, 1, CDIO_CD_FRAMESIZE_RAW, fp);
|
||||
}
|
||||
|
||||
}
|
||||
finished_success_++;
|
||||
emit(signalUpdateProgress());
|
||||
emit(SignalUpdateProgress());
|
||||
fclose(fp);
|
||||
free(p_readbuf);
|
||||
p_readbuf = NULL;
|
||||
|
||||
//TranscoderPreset preset(Transcoder::PresetForFileType(Song::Type_OggVorbis));
|
||||
TranscoderPreset preset =
|
||||
ui_->format->itemData(ui_->format->currentIndex()).value<
|
||||
TranscoderPreset>();
|
||||
ui_->format->itemData(ui_->format->currentIndex())
|
||||
.value<TranscoderPreset>();
|
||||
|
||||
QString outfilename = GetOutputFileName(filename, preset);
|
||||
transcoder_->AddJob(filename.toUtf8().constData(), preset, outfilename);
|
||||
}
|
||||
emit (RippingComplete());}
|
||||
emit(RippingComplete());
|
||||
}
|
||||
|
||||
// Returns the rightmost non-empty part of 'path'.
|
||||
QString RipCD::TrimPath(const QString& path) const {
|
||||
@ -236,50 +235,50 @@ QString RipCD::GetOutputFileName(const QString& input,
|
||||
}
|
||||
}
|
||||
|
||||
QString RipCD::ParseFileFormatString(const QString& file_format, int trackNo) const {
|
||||
QString RipCD::ParseFileFormatString(const QString& file_format,
|
||||
int trackNo) const {
|
||||
QString to_return = file_format;
|
||||
to_return.replace(QString("%artist%"),ui_->artistLineEdit->text());
|
||||
to_return.replace(QString("%album%"),ui_->albumLineEdit->text());
|
||||
to_return.replace(QString("%genre%"),ui_->genreLineEdit->text());
|
||||
to_return.replace(QString("%year%"),ui_->yearLineEdit->text());
|
||||
to_return.replace(QString("%tracknum%"),QString::number(trackNo));
|
||||
to_return.replace(QString("%track%"),track_names_.value(trackNo - 1)->text());
|
||||
to_return.replace(QString("%artist%"), ui_->artistLineEdit->text());
|
||||
to_return.replace(QString("%album%"), ui_->albumLineEdit->text());
|
||||
to_return.replace(QString("%genre%"), ui_->genreLineEdit->text());
|
||||
to_return.replace(QString("%year%"), ui_->yearLineEdit->text());
|
||||
to_return.replace(QString("%tracknum%"), QString::number(trackNo));
|
||||
to_return.replace(QString("%track%"),
|
||||
track_names_.value(trackNo - 1)->text());
|
||||
return to_return;
|
||||
}
|
||||
|
||||
void RipCD::UpdateProgress() {
|
||||
int progress = (finished_success_ + finished_failed_) * 100;
|
||||
QMap<QString, float> current_jobs = transcoder_->GetProgress();
|
||||
foreach (float value, current_jobs.values()) {
|
||||
progress += qBound(0, int(value * 100), 99);
|
||||
for (float value : current_jobs.values()) {
|
||||
progress += qBound(0, static_cast<int>(value * 100), 99);
|
||||
}
|
||||
|
||||
ui_->progress_bar->setValue(progress);
|
||||
}
|
||||
|
||||
void RipCD::threadedTranscoding() {
|
||||
void RipCD::ThreadedTranscoding() {
|
||||
transcoder_->Start();
|
||||
TranscoderPreset preset =
|
||||
ui_->format->itemData(ui_->format->currentIndex()).value<TranscoderPreset>();
|
||||
ui_->format->itemData(ui_->format->currentIndex())
|
||||
.value<TranscoderPreset>();
|
||||
// Save the last output format
|
||||
QSettings s;
|
||||
s.beginGroup(kSettingsGroup);
|
||||
s.setValue("last_output_format", preset.extension_);
|
||||
|
||||
}
|
||||
|
||||
void RipCD::clickedRipButton() {
|
||||
QtConcurrent::run(this, &RipCD::toThreadClickedRipButton);
|
||||
|
||||
void RipCD::ClickedRipButton() {
|
||||
QtConcurrent::run(this, &RipCD::ThreadClickedRipButton);
|
||||
}
|
||||
|
||||
void RipCD::JobComplete(const QString& filename, bool success) {
|
||||
(*(success ? &finished_success_ : &finished_failed_))++;
|
||||
emit(signalUpdateProgress());
|
||||
emit(SignalUpdateProgress());
|
||||
}
|
||||
|
||||
void RipCD::AllJobsComplete() {
|
||||
|
||||
// having a little trouble on wav files, works fine on ogg-vorbis
|
||||
qSort(generated_files_);
|
||||
|
||||
@ -288,14 +287,15 @@ void RipCD::AllJobsComplete() {
|
||||
TagLib::FileRef f(generated_files_.value(i).toUtf8().constData());
|
||||
|
||||
f.tag()->setTitle(
|
||||
track_names_.value(tracks_to_rip_.value(i) - 1)->text().toUtf8().constData());
|
||||
track_names_.value(tracks_to_rip_.value(i) - 1)
|
||||
->text().toUtf8().constData());
|
||||
f.tag()->setAlbum(ui_->albumLineEdit->text().toUtf8().constData());
|
||||
f.tag()->setArtist(ui_->artistLineEdit->text().toUtf8().constData());
|
||||
f.tag()->setGenre(ui_->genreLineEdit->text().toUtf8().constData());
|
||||
f.tag()->setYear(ui_->yearLineEdit->text().toInt());
|
||||
f.tag()->setTrack(tracks_to_rip_.value(i) - 1);
|
||||
// Need to check this
|
||||
//f.tag()->setDisc(ui_->discLineEdit->text().toInt());
|
||||
// f.tag()->setDisc(ui_->discLineEdit->text().toInt());
|
||||
f.save();
|
||||
}
|
||||
// Resets lists
|
||||
@ -309,7 +309,9 @@ void RipCD::AppendOutput(const QString &filename) {
|
||||
|
||||
void RipCD::Options() {
|
||||
TranscoderPreset preset =
|
||||
ui_->format->itemData(ui_->format->currentIndex()).value<TranscoderPreset>();
|
||||
ui_->format->itemData(
|
||||
ui_->format->currentIndex())
|
||||
.value<TranscoderPreset>();
|
||||
|
||||
TranscoderOptionsDialog dialog(preset.type_, this);
|
||||
if (dialog.is_valid()) {
|
||||
|
||||
@ -15,12 +15,13 @@
|
||||
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
|
||||
*/
|
||||
|
||||
#ifndef RIPCD_H
|
||||
#define RIPCD_H
|
||||
#ifndef SRC_UI_RIPCD_H_
|
||||
#define SRC_UI_RIPCD_H_
|
||||
|
||||
#include <QDialog>
|
||||
#include <QCheckBox>
|
||||
#include <QThread>
|
||||
#include <QFile>
|
||||
#include <cdio/cdio.h>
|
||||
#include "ui_ripcd.h"
|
||||
|
||||
@ -31,10 +32,9 @@ struct TranscoderPreset;
|
||||
|
||||
class RipCD: public QDialog {
|
||||
Q_OBJECT
|
||||
// QThread thread;
|
||||
|
||||
public:
|
||||
RipCD(QWidget* parent = 0);
|
||||
explicit RipCD(QWidget* parent = 0);
|
||||
static const char* kSettingsGroup;
|
||||
static const int kProgressInterval;
|
||||
static const int kMaxDestinationItems;
|
||||
@ -46,7 +46,7 @@ class RipCD: public QDialog {
|
||||
int finished_failed_;
|
||||
track_t i_tracks;
|
||||
Ui_RipCD* ui_;
|
||||
CdIo_t *p_cdio;
|
||||
CdIo_t *p_cdio_;
|
||||
QList<QCheckBox*> checkboxes_;
|
||||
QList<QString> generated_files_;
|
||||
QList<int> tracks_to_rip_;
|
||||
@ -54,25 +54,22 @@ class RipCD: public QDialog {
|
||||
QString last_add_dir_;
|
||||
QPushButton* cancel_button_;
|
||||
|
||||
void write_WAV_header(FILE *stream, int32_t i_bytecount);
|
||||
void put_num(long int num, FILE *stream, int bytes);
|
||||
int nTracksToRip();
|
||||
void toThreadClickedRipButton();
|
||||
void WriteWAVHeader(FILE *stream, int32_t i_bytecount);
|
||||
void PutNum(int64_t num, FILE *stream, int bytes);
|
||||
int NumTracksToRip();
|
||||
void ThreadClickedRipButton();
|
||||
QString TrimPath(const QString& path) const;
|
||||
QString GetOutputFileName(const QString& input,
|
||||
const TranscoderPreset& preset) const;
|
||||
QString ParseFileFormatString(const QString& file_format, int trackNo) const;
|
||||
|
||||
|
||||
|
||||
signals:
|
||||
void RippingComplete();
|
||||
void signalUpdateProgress();
|
||||
|
||||
void SignalUpdateProgress();
|
||||
private slots:
|
||||
void UpdateProgress();
|
||||
void threadedTranscoding();
|
||||
void clickedRipButton();
|
||||
void ThreadedTranscoding();
|
||||
void ClickedRipButton();
|
||||
void JobComplete(const QString& filename, bool success);
|
||||
void AllJobsComplete();
|
||||
void AppendOutput(const QString &filename);
|
||||
@ -81,4 +78,4 @@ class RipCD: public QDialog {
|
||||
void Cancel();
|
||||
};
|
||||
|
||||
#endif // RIPCD_H
|
||||
#endif // SRC_UI_RIPCD_H_
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user