Includes, comments and bugfixes

- Fix includes
- Use common regex (Song::kCoverRemoveDisc) for removing Disc/CD from album
- Remove Disc/CD from album when creating hash
- Make imobiledevice support compile
- Fix setting device on windows
This commit is contained in:
Jonas Kvinge
2018-05-01 00:41:33 +02:00
parent fccbd6790c
commit e337b7933b
518 changed files with 7003 additions and 4693 deletions

View File

@@ -23,25 +23,24 @@
#include "config.h"
#include <QMap>
#include <QObject>
#include <QMap>
#include <QString>
#include <QStringList>
#include <QNetworkAccessManager>
#include <QNetworkReply>
class NetworkTimeouts;
class QNetworkAccessManager;
class QNetworkReply;
class AcoustidClient : public QObject {
Q_OBJECT
// Gets a MBID from a Chromaprint fingerprint.
// A fingerprint identifies one particular encoding of a song and is created
// by Fingerprinter. An MBID identifies the actual song and can be passed to
// Musicbrainz to get metadata.
// A fingerprint identifies one particular encoding of a song and is created by Fingerprinter.
// An MBID identifies the actual song and can be passed to Musicbrainz to get metadata.
// You can create one AcoustidClient and make multiple requests using it.
// IDs are provided by the caller when a request is started and included in
// the Finished signal - they have no meaning to AcoustidClient.
// IDs are provided by the caller when a request is started and included in the Finished signal - they have no meaning to AcoustidClient.
public:
AcoustidClient(QObject *parent = nullptr);
@@ -49,16 +48,13 @@ class AcoustidClient : public QObject {
// Network requests will be aborted after this interval.
void SetTimeout(int msec);
// Starts a request and returns immediately. Finished() will be emitted
// later with the same ID.
void Start(int id, const QString& fingerprint, int duration_msec);
// Starts a request and returns immediately. Finished() will be emitted later with the same ID.
void Start(int id, const QString &fingerprint, int duration_msec);
// Cancels the request with the given ID. Finished() will never be emitted
// for that ID. Does nothing if there is no request with the given ID.
// Cancels the request with the given ID. Finished() will never be emitted for that ID. Does nothing if there is no request with the given ID.
void Cancel(int id);
// Cancels all requests. Finished() will never be emitted for any pending
// requests.
// Cancels all requests. Finished() will never be emitted for any pending requests.
void CancelAll();
signals: