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

Automatically formatted

This commit is contained in:
Clang Formatter 2018-06-13 20:37:13 +00:00 committed by vaterlangen
parent 465fa2ce87
commit 083129f41c
3 changed files with 25 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/networkremote/incomingdataparser.cpp
View File

@ -36,7 +36,6 @@ IncomingDataParser::IncomingDataParser(Application* app) : app_(app) {
ReloadSettings();
connect(app_, SIGNAL(SettingsChanged()), SLOT(ReloadSettings()));
// Connect all the signals
// due the player is in a different thread, we cannot access these functions
// directly
@ -52,7 +51,8 @@ IncomingDataParser::IncomingDataParser(Application* app) : app_(app) {
connect(this, SIGNAL(PlayAt(int, Engine::TrackChangeFlags, bool)),
app_->player(), SLOT(PlayAt(int, Engine::TrackChangeFlags, bool)));
connect(this, SIGNAL(SeekTo(int)), app_->player(), SLOT(SeekTo(int)));
connect(this, SIGNAL(Enque(int,int)), app_->playlist_manager(), SLOT(Enque(int,int)));
connect(this, SIGNAL(Enque(int, int)), app_->playlist_manager(),
SLOT(Enque(int, int)));
connect(this, SIGNAL(SetActivePlaylist(int)), app_->playlist_manager(),
SLOT(SetActivePlaylist(int)));
@ -87,9 +87,12 @@ IncomingDataParser::IncomingDataParser(Application* app) : app_(app) {
IncomingDataParser::~IncomingDataParser() {}
void IncomingDataParser::ReloadSettings() {
QSettings s;
s.beginGroup(MainWindow::kSettingsGroup);
doubleclick_playlist_addmode_ = MainWindow::PlaylistAddBehaviour(s.value("doubleclick_playlist_addmode", MainWindow::PlaylistAddBehaviour_Enqueue).toInt());
QSettings s;
s.beginGroup(MainWindow::kSettingsGroup);
doubleclick_playlist_addmode_ = MainWindow::PlaylistAddBehaviour(
s.value("doubleclick_playlist_addmode",
MainWindow::PlaylistAddBehaviour_Enqueue)
.toInt());
}
bool IncomingDataParser::close_connection() { return close_connection_; }
@ -206,8 +209,7 @@ void IncomingDataParser::ChangeSong(const pb::remote::Message& msg) {
emit SetActivePlaylist(request.playlist_id());
}
switch (doubleclick_playlist_addmode_)
{
switch (doubleclick_playlist_addmode_) {
// Play the selected song
case MainWindow::PlaylistAddBehaviour_Play:
emit PlayAt(request.song_index(), Engine::Manual, false);
@ -216,14 +218,12 @@ void IncomingDataParser::ChangeSong(const pb::remote::Message& msg) {
// Enque the selected song
case MainWindow::PlaylistAddBehaviour_Enqueue:
emit Enque(request.playlist_id(), request.song_index());
if (app_->player()->GetState() != Engine::Playing)
{
emit PlayAt(request.song_index(), Engine::Manual, false);
if (app_->player()->GetState() != Engine::Playing) {
emit PlayAt(request.song_index(), Engine::Manual, false);
}
break;
}
}
void IncomingDataParser::SetRepeatMode(const pb::remote::Repeat& repeat) {

6
src/networkremote/incomingdataparser.h
View File

@ -1,10 +1,10 @@
#ifndef INCOMINGDATAPARSER_H
#define INCOMINGDATAPARSER_H
#include "core/player.h"
#include "core/application.h"
#include "remotecontrolmessages.pb.h"
#include "core/player.h"
#include "remoteclient.h"
#include "remotecontrolmessages.pb.h"
#include "ui/mainwindow.h"
class IncomingDataParser : public QObject {
@ -19,7 +19,7 @@ class IncomingDataParser : public QObject {
void Parse(const pb::remote::Message& msg);
void ReloadSettings();
signals:
signals:
void SendClementineInfo();
void SendFirstData(bool send_playlist_songs);
void SendAllPlaylists();

22
src/playlist/playlistmanager.cpp
View File

@ -15,11 +15,6 @@
along with Clementine. If not, see <http://www.gnu.org/licenses/>.
*/
#include "playlistbackend.h"
#include "playlistcontainer.h"
#include "playlistmanager.h"
#include "playlistsaveoptionsdialog.h"
#include "playlistview.h"
#include "core/application.h"
#include "core/logging.h"
#include "core/player.h"
@ -27,9 +22,14 @@
#include "core/utilities.h"
#include "library/librarybackend.h"
#include "library/libraryplaylistitem.h"
#include "playlistbackend.h"
#include "playlistcontainer.h"
#include "playlistmanager.h"
#include "playlistparsers/playlistparser.h"
#include "smartplaylists/generator.h"
#include "playlistsaveoptionsdialog.h"
#include "playlistview.h"
#include "queue.h"
#include "smartplaylists/generator.h"
#include <QFileDialog>
#include <QFileInfo>
@ -64,7 +64,7 @@ PlaylistManager::~PlaylistManager() {
void PlaylistManager::Init(LibraryBackend* library_backend,
PlaylistBackend* playlist_backend,
PlaylistSequence* sequence,
PlaylistContainer* playlist_container) {
PlaylistContainer* playlist_container) {
library_backend_ = library_backend;
playlist_backend_ = playlist_backend;
sequence_ = sequence;
@ -399,12 +399,12 @@ void PlaylistManager::ChangePlaylistOrder(const QList<int>& ids) {
}
void PlaylistManager::Enque(int id, int i) {
QModelIndexList dummyIndexList;
QModelIndexList dummyIndexList;
Q_ASSERT(playlists_.contains(id));
Q_ASSERT(playlists_.contains(id));
dummyIndexList.append(playlist(id)->index(i, 0));
playlist(id)->queue()->ToggleTracks(dummyIndexList);
dummyIndexList.append(playlist(id)->index(i, 0));
playlist(id)->queue()->ToggleTracks(dummyIndexList);
}
void PlaylistManager::UpdateSummaryText() {