iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix playback of local files by inbuilt HTTP server.

Browse Source 
BUG 554
This commit is contained in:
craig.p.drummond
2014-10-03 18:10:11 +00:00
committed by craig.p.drummond
parent 997753359f
commit 6a66fbd2c6
4 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
http/httpserver.cpp
View File

@@ -67,7 +67,6 @@ HttpServer::HttpServer()
, closeTimer(0)
{
force=Settings::self()->alwaysUseHttp();
connect(MPDConnection::self(), SIGNAL(socketAddress(QString)), this, SLOT(mpdAddress(QString)));
connect(MPDConnection::self(), SIGNAL(cantataStreams(QList<Song>,bool)), this, SLOT(cantataStreams(QList<Song>,bool)));
connect(MPDConnection::self(), SIGNAL(cantataStreams(QStringList)), this, SLOT(cantataStreams(QStringList)));
connect(MPDConnection::self(), SIGNAL(removedIds(QSet<qint32>)), this, SLOT(removedIds(QSet<qint32>)));
@@ -92,7 +91,7 @@ bool HttpServer::start()
thread=new Thread("HttpServer");
}
socket=new HttpSocket(Settings::self()->httpInterface(), prevPort);
socket->mpdAddress(mpdAddr);
socket->mpdAddress(MPDConnection::self()->ipAddress());
connect(this, SIGNAL(terminateSocket()), socket, SLOT(terminate()), Qt::QueuedConnection);
if (socket->serverPort()!=prevPort) {
Settings::self()->saveHttpAllocatedPort(socket->serverPort());
@@ -315,11 +314,6 @@ void HttpServer::startCloseTimer()
closeTimer->start(1000);
}
void HttpServer::mpdAddress(const QString &a)
{
mpdAddr=a;
}
void HttpServer::cantataStreams(const QStringList &files)
{
DBUG << files;