Funkwhale/Clementine-audio-player-Mac-Linux-Windows
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Memory optimization in network remote.

Browse Source
This commit is contained in:
Andreas 2013-07-16 17:47:49 +02:00
parent 150345f2a6
commit 6c19acdf48
2 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/networkremote/outgoingdatacreator.cpp
View File

@ -556,8 +556,6 @@ void OutgoingDataCreator::SendSongs(const pb::remote::RequestDownloadSongs &requ
default: default:
break; break;
} }
client->DisconnectClient(pb::remote::Server_Shutdown);
} }
void OutgoingDataCreator::SendSingleSong(RemoteClient* client, const Song &song, void OutgoingDataCreator::SendSingleSong(RemoteClient* client, const Song &song,
@ -574,8 +572,10 @@ void OutgoingDataCreator::SendSingleSong(RemoteClient* client, const Song &song,
QFile file(song.url().toLocalFile()); QFile file(song.url().toLocalFile());
file.open(QIODevice::ReadOnly); file.open(QIODevice::ReadOnly);
QByteArray data;
while (!file.atEnd()) { while (!file.atEnd()) {
QByteArray data = file.read(kFileChunkSize); data = file.read(kFileChunkSize);
pb::remote::Message msg; pb::remote::Message msg;
msg.set_type(pb::remote::SONG_FILE_CHUNK); msg.set_type(pb::remote::SONG_FILE_CHUNK);
@ -586,7 +586,7 @@ void OutgoingDataCreator::SendSingleSong(RemoteClient* client, const Song &song,
chunk->set_file_count(song_count); chunk->set_file_count(song_count);
chunk->set_file_number(song_no); chunk->set_file_number(song_no);
chunk->set_size(file.size()); chunk->set_size(file.size());
chunk->set_data(data.constData(), data.size()); chunk->set_data(data.data(), data.size());
if (chunk_number == 1) { if (chunk_number == 1) {
int i = app_->playlist_manager()->active()->current_row(); int i = app_->playlist_manager()->active()->current_row();
CreateSong( CreateSong(
@ -596,9 +596,11 @@ void OutgoingDataCreator::SendSingleSong(RemoteClient* client, const Song &song,
msg.set_version(msg.default_instance().version()); msg.set_version(msg.default_instance().version());
client->SendData(&msg); client->SendData(&msg);
data.clear();
chunk_number++; chunk_number++;
} }
file.close(); file.close();
} }

14
src/networkremote/remoteclient.cpp
View File

@ -112,6 +112,11 @@ void RemoteClient::ParseMessage(const QByteArray &data) {
} }
} }
if (msg.type() == pb::remote::CONNECT) {
setDownloader(msg.request_connect().downloader());
qDebug() << "Downloader" << downloader_;
}
// Check if downloads are allowed // Check if downloads are allowed
if (msg.type() == pb::remote::DOWNLOAD_SONGS && !allow_downloads_) { if (msg.type() == pb::remote::DOWNLOAD_SONGS && !allow_downloads_) {
DisconnectClient(pb::remote::Download_Forbidden); DisconnectClient(pb::remote::Download_Forbidden);
@ -119,17 +124,12 @@ void RemoteClient::ParseMessage(const QByteArray &data) {
} }
if (msg.type() == pb::remote::DISCONNECT) { if (msg.type() == pb::remote::DISCONNECT) {
client_->flush(); qDebug() << client_->state();
client_->close(); client_->abort();
qDebug() << "Client disconnected"; qDebug() << "Client disconnected";
return; return;
} }
if (msg.type() == pb::remote::DOWNLOAD_SONGS) {
qDebug() << "Downloader";
setDownloader(true);
}
// Check if the client has sent the correct auth code // Check if the client has sent the correct auth code
if (!authenticated_) { if (!authenticated_) {
DisconnectClient(pb::remote::Not_Authenticated); DisconnectClient(pb::remote::Not_Authenticated);