mirror of
https://github.com/clementine-player/Clementine
synced 2025-01-28 10:09:24 +01:00
- Correct filename in coverexport when textfield is empty.
- Network clients can now love and ban tracks.
This commit is contained in:
parent
74d9e4bd23
commit
4bb433e912
@ -14,6 +14,9 @@ enum MsgType {
|
|||||||
REMOVE_SONGS = 9;
|
REMOVE_SONGS = 9;
|
||||||
OPEN_PLAYLIST = 10;
|
OPEN_PLAYLIST = 10;
|
||||||
CLOSE_PLAYLIST = 11;
|
CLOSE_PLAYLIST = 11;
|
||||||
|
// Lastfm
|
||||||
|
LOVE = 12;
|
||||||
|
BAN = 13;
|
||||||
|
|
||||||
// Messages send by both
|
// Messages send by both
|
||||||
DISCONNECT = 2;
|
DISCONNECT = 2;
|
||||||
|
@ -21,6 +21,8 @@
|
|||||||
|
|
||||||
#include "core/logging.h"
|
#include "core/logging.h"
|
||||||
#include "engines/enginebase.h"
|
#include "engines/enginebase.h"
|
||||||
|
#include "internet/internetmodel.h"
|
||||||
|
#include "internet/lastfmservice.h"
|
||||||
#include "playlist/playlistmanager.h"
|
#include "playlist/playlistmanager.h"
|
||||||
#include "playlist/playlistsequence.h"
|
#include "playlist/playlistsequence.h"
|
||||||
#include "playlist/playlist.h"
|
#include "playlist/playlist.h"
|
||||||
@ -69,6 +71,11 @@ IncomingDataParser::IncomingDataParser(Application* app)
|
|||||||
app_->playlist_manager(), SLOT(Open(int)));
|
app_->playlist_manager(), SLOT(Open(int)));
|
||||||
connect(this, SIGNAL(Close(int)),
|
connect(this, SIGNAL(Close(int)),
|
||||||
app_->playlist_manager(), SLOT(Close(int)));
|
app_->playlist_manager(), SLOT(Close(int)));
|
||||||
|
|
||||||
|
connect(this, SIGNAL(Love()),
|
||||||
|
InternetModel::Service<LastFMService>(), SLOT(Love()));
|
||||||
|
connect(this, SIGNAL(Ban()),
|
||||||
|
InternetModel::Service<LastFMService>(), SLOT(Ban()));
|
||||||
}
|
}
|
||||||
|
|
||||||
IncomingDataParser::~IncomingDataParser() {
|
IncomingDataParser::~IncomingDataParser() {
|
||||||
@ -126,6 +133,10 @@ void IncomingDataParser::Parse(const pb::remote::Message& msg) {
|
|||||||
case pb::remote::CLOSE_PLAYLIST:
|
case pb::remote::CLOSE_PLAYLIST:
|
||||||
ClosePlaylist(msg);
|
ClosePlaylist(msg);
|
||||||
break;
|
break;
|
||||||
|
case pb::remote::LOVE: emit Love();
|
||||||
|
break;
|
||||||
|
case pb::remote::BAN: emit Ban();
|
||||||
|
break;
|
||||||
default: break;
|
default: break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -24,6 +24,8 @@ signals:
|
|||||||
void SendPlaylistSongs(int id);
|
void SendPlaylistSongs(int id);
|
||||||
void Open(int id);
|
void Open(int id);
|
||||||
void Close(int id);
|
void Close(int id);
|
||||||
|
void Love();
|
||||||
|
void Ban();
|
||||||
|
|
||||||
void Play();
|
void Play();
|
||||||
void PlayPause();
|
void PlayPause();
|
||||||
|
@ -58,7 +58,7 @@ AlbumCoverExport::DialogResult AlbumCoverExport::Exec() {
|
|||||||
if(!result.cancelled_) {
|
if(!result.cancelled_) {
|
||||||
QString fileName = ui_->fileName->text();
|
QString fileName = ui_->fileName->text();
|
||||||
if (fileName.isEmpty()) {
|
if (fileName.isEmpty()) {
|
||||||
fileName = "folder";
|
fileName = "cover";
|
||||||
}
|
}
|
||||||
OverwriteMode overwrite = ui_->doNotOverwrite->isChecked()
|
OverwriteMode overwrite = ui_->doNotOverwrite->isChecked()
|
||||||
? OverwriteMode_None
|
? OverwriteMode_None
|
||||||
|
Loading…
x
Reference in New Issue
Block a user