1
0
mirror of https://github.com/clementine-player/Clementine synced 2025-01-15 03:06:56 +01:00

- Correct filename in coverexport when textfield is empty.

- Network clients can now love and ban tracks.
This commit is contained in:
Andreas 2013-05-07 17:57:53 +02:00
parent 74d9e4bd23
commit 4bb433e912
4 changed files with 17 additions and 1 deletions

View File

@ -14,6 +14,9 @@ enum MsgType {
REMOVE_SONGS = 9;
OPEN_PLAYLIST = 10;
CLOSE_PLAYLIST = 11;
// Lastfm
LOVE = 12;
BAN = 13;
// Messages send by both
DISCONNECT = 2;

View File

@ -21,6 +21,8 @@
#include "core/logging.h"
#include "engines/enginebase.h"
#include "internet/internetmodel.h"
#include "internet/lastfmservice.h"
#include "playlist/playlistmanager.h"
#include "playlist/playlistsequence.h"
#include "playlist/playlist.h"
@ -69,6 +71,11 @@ IncomingDataParser::IncomingDataParser(Application* app)
app_->playlist_manager(), SLOT(Open(int)));
connect(this, SIGNAL(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() {
@ -126,6 +133,10 @@ void IncomingDataParser::Parse(const pb::remote::Message& msg) {
case pb::remote::CLOSE_PLAYLIST:
ClosePlaylist(msg);
break;
case pb::remote::LOVE: emit Love();
break;
case pb::remote::BAN: emit Ban();
break;
default: break;
}
}

View File

@ -24,6 +24,8 @@ signals:
void SendPlaylistSongs(int id);
void Open(int id);
void Close(int id);
void Love();
void Ban();
void Play();
void PlayPause();

View File

@ -58,7 +58,7 @@ AlbumCoverExport::DialogResult AlbumCoverExport::Exec() {
if(!result.cancelled_) {
QString fileName = ui_->fileName->text();
if (fileName.isEmpty()) {
fileName = "folder";
fileName = "cover";
}
OverwriteMode overwrite = ui_->doNotOverwrite->isChecked()
? OverwriteMode_None