Funkwhale
/
Clementine-audio-player-Mac-Linux-Windows
mirror of https://github.com/clementine-player/Clementine
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix formatting

This commit is contained in:
Mattias Andersson 2018-07-05 16:42:45 +02:00 committed by John Maguire
parent 2c084e45b6
commit 3e53e23bb8
2 changed files with 18 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/devices/cddasongloader.cpp
View File

@ -26,11 +26,9 @@
#include "cddasongloader.h"
CddaSongLoader::CddaSongLoader(const QUrl& url, QObject* parent)
: QObject(parent),
url_(url),
cdda_(nullptr),
cdio_(nullptr) {
connect(this, SIGNAL(MusicBrainzDiscIdLoaded(const QString&)), SLOT(LoadAudioCDTags(const QString&)));
: QObject(parent), url_(url), cdda_(nullptr), cdio_(nullptr) {
connect(this, SIGNAL(MusicBrainzDiscIdLoaded(const QString&)),
SLOT(LoadAudioCDTags(const QString&)));
}
CddaSongLoader::~CddaSongLoader() {
@ -121,8 +119,9 @@ void CddaSongLoader::LoadSongsFromCdda() {
GstMessage* msg = nullptr;
GstMessage* msg_toc = nullptr;
GstMessage* msg_tag = nullptr;
while ((msg = gst_bus_timed_pop_filtered(GST_ELEMENT_BUS(pipeline),
2 * GST_SECOND, (GstMessageType)(GST_MESSAGE_TOC | GST_MESSAGE_TAG)))) {
while ((msg = gst_bus_timed_pop_filtered(
GST_ELEMENT_BUS(pipeline), 2 * GST_SECOND,
(GstMessageType)(GST_MESSAGE_TOC | GST_MESSAGE_TAG)))) {
if (GST_MESSAGE_TYPE(msg) == GST_MESSAGE_TOC) {
if (msg_toc) gst_message_unref(msg_toc); // Shouldn't happen, but just in case
msg_toc = msg;
@ -178,8 +177,9 @@ void CddaSongLoader::LoadSongsFromCdda() {
void CddaSongLoader::LoadAudioCDTags(const QString& musicbrainz_discid) const {
MusicBrainzClient* musicbrainz_client = new MusicBrainzClient;
connect(musicbrainz_client, SIGNAL(Finished(const QString&, const QString&,
MusicBrainzClient::ResultList)),
connect(musicbrainz_client,
SIGNAL(Finished(const QString&, const QString&,
MusicBrainzClient::ResultList)),
SLOT(AudioCDTagsLoaded(const QString&, const QString&,
MusicBrainzClient::ResultList)));

15
src/ripper/ripcddialog.cpp
View File

@ -29,10 +29,10 @@
#include "core/tagreaderclient.h"
#include "devices/cddasongloader.h"
#include "ripper/ripper.h"
#include "ui_ripcddialog.h"
#include "transcoder/transcoder.h"
#include "transcoder/transcoderoptionsdialog.h"
#include "ui/iconloader.h"
#include "ui_ripcddialog.h"
namespace {
bool ComparePresetsByName(const TranscoderPreset& left,
@ -54,7 +54,7 @@ RipCDDialog::RipCDDialog(QWidget* parent)
ui_(new Ui_RipCDDialog),
ripper_(new Ripper(this)),
working_(false),
loader_(new CddaSongLoader){
loader_(new CddaSongLoader) {
// Init
ui_->setupUi(this);
@ -87,9 +87,12 @@ RipCDDialog::RipCDDialog(QWidget* parent)
connect(ui_->options, SIGNAL(clicked()), SLOT(Options()));
connect(ui_->select, SIGNAL(clicked()), SLOT(AddDestination()));
connect(loader_, SIGNAL(SongsDurationLoaded(SongList)), SLOT(BuildTrackListTable(SongList)));
connect(loader_, SIGNAL(SongsMetadataLoaded(SongList)), SLOT(BuildTrackListTable(SongList)));
connect(loader_, SIGNAL(SongsMetadataLoaded(SongList)), SLOT(AddAlbumMetadataFromMusicBrainz(SongList)));
connect(loader_, SIGNAL(SongsDurationLoaded(SongList)),
SLOT(BuildTrackListTable(SongList)));
connect(loader_, SIGNAL(SongsMetadataLoaded(SongList)),
SLOT(BuildTrackListTable(SongList)));
connect(loader_, SIGNAL(SongsMetadataLoaded(SongList)),
SLOT(AddAlbumMetadataFromMusicBrainz(SongList)));
connect(ripper_, SIGNAL(Finished()), SLOT(Finished()));
connect(ripper_, SIGNAL(Cancelled()), SLOT(Cancelled()));
@ -252,7 +255,7 @@ void RipCDDialog::BuildTrackListTable(const SongList& songs) {
ui_->tableWidget->setRowCount(songs.length());
int current_row = 0;
for (const Song& song: songs) {
for (const Song& song : songs) {
QCheckBox* checkbox = new QCheckBox(ui_->tableWidget);
checkbox->setCheckState(Qt::Checked);
checkboxes_.append(checkbox);