Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run 'make format'

Browse Source
This commit is contained in:
Mattias Andersson 2014-04-12 09:20:25 +02:00
parent d66a73bed5
commit 31400f2740
3 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/ui/mainwindow.cpp
View File

@ -1857,7 +1857,7 @@ void MainWindow::OpenRipCD() {
if (!rip_cd_) { if (!rip_cd_) {
rip_cd_.reset(new RipCD); rip_cd_.reset(new RipCD);
} }
if(rip_cd_->CheckCDIOIsValid()) { if (rip_cd_->CheckCDIOIsValid()) {
rip_cd_->show(); rip_cd_->show();
} else { } else {
QMessageBox cdio_fail(QMessageBox::Critical, tr("Error"), QMessageBox cdio_fail(QMessageBox::Critical, tr("Error"),

24
src/ui/ripcd.cpp
View File

@ -73,7 +73,6 @@ RipCD::RipCD(QWidget* parent)
finished_success_(0), finished_success_(0),
finished_failed_(0), finished_failed_(0),
ui_(new Ui_RipCD) { ui_(new Ui_RipCD) {
cdio_ = cdio_open(NULL, DRIVER_UNKNOWN); cdio_ = cdio_open(NULL, DRIVER_UNKNOWN);
// Init // Init
ui_->setupUi(this); ui_->setupUi(this);
@ -307,10 +306,11 @@ void RipCD::ThreadedTranscoding() {
} }
void RipCD::ClickedRipButton() { void RipCD::ClickedRipButton() {
if((cdio_) && cdio_get_media_changed(cdio_)) { if ((cdio_) && cdio_get_media_changed(cdio_)) {
QMessageBox cdio_fail(QMessageBox::Critical, tr("Error"), tr("Media has changed. Reloading")); QMessageBox cdio_fail(QMessageBox::Critical, tr("Error"),
tr("Media has changed. Reloading"));
cdio_fail.exec(); cdio_fail.exec();
if(CheckCDIOIsValid()) { if (CheckCDIOIsValid()) {
BuildTrackListTable(); BuildTrackListTable();
} else { } else {
ui_->tableWidget->clearContents(); ui_->tableWidget->clearContents();
@ -409,7 +409,7 @@ void RipCD::Cancel() {
} }
bool RipCD::CheckCDIOIsValid() { bool RipCD::CheckCDIOIsValid() {
if((cdio_)) { if ((cdio_)) {
cdio_destroy(cdio_); cdio_destroy(cdio_);
} }
cdio_ = cdio_open(NULL, DRIVER_UNKNOWN); cdio_ = cdio_open(NULL, DRIVER_UNKNOWN);
@ -459,21 +459,19 @@ void RipCD::BuildTrackListTable() {
i_tracks_ = cdio_get_num_tracks(cdio_); i_tracks_ = cdio_get_num_tracks(cdio_);
ui_->tableWidget->setRowCount(i_tracks_); ui_->tableWidget->setRowCount(i_tracks_);
for (int i = 1; i <= i_tracks_; i++) { for (int i = 1; i <= i_tracks_; i++) {
QCheckBox *checkbox_i = new QCheckBox(ui_->tableWidget); QCheckBox* checkbox_i = new QCheckBox(ui_->tableWidget);
checkbox_i->setCheckState(Qt::Checked); checkbox_i->setCheckState(Qt::Checked);
checkboxes_.append(checkbox_i); checkboxes_.append(checkbox_i);
ui_->tableWidget->setCellWidget(i - 1, kCheckboxColumn, checkbox_i); ui_->tableWidget->setCellWidget(i - 1, kCheckboxColumn, checkbox_i);
ui_->tableWidget->setCellWidget(i - 1, kTrackNumberColumn, ui_->tableWidget->setCellWidget(i - 1, kTrackNumberColumn,
new QLabel(QString::number(i))); new QLabel(QString::number(i)));
QString track_title = QString("Track %1").arg(i); QString track_title = QString("Track %1").arg(i);
QLineEdit *line_edit_track_title_i = new QLineEdit(track_title, QLineEdit* line_edit_track_title_i =
ui_->tableWidget); new QLineEdit(track_title, ui_->tableWidget);
track_names_.append(line_edit_track_title_i); track_names_.append(line_edit_track_title_i);
ui_->tableWidget->setCellWidget(i - 1, kTrackTitleColumn, ui_->tableWidget->setCellWidget(i - 1, kTrackTitleColumn,
line_edit_track_title_i); line_edit_track_title_i);
} }
} }
void RipCD::showEvent(QShowEvent *event) { void RipCD::showEvent(QShowEvent* event) { BuildTrackListTable(); }
BuildTrackListTable();
}

3
src/ui/ripcd.h
View File

@ -38,8 +38,9 @@ class RipCD : public QDialog {
~RipCD(); ~RipCD();
bool CheckCDIOIsValid(); bool CheckCDIOIsValid();
void BuildTrackListTable(); void BuildTrackListTable();
protected: protected:
void showEvent(QShowEvent *event); void showEvent(QShowEvent* event);
private: private:
static const char* kSettingsGroup; static const char* kSettingsGroup;