mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-04 21:27:58 +02:00
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:tomahawk-player/tomahawk into mhd

Browse Source
This commit is contained in:
Leo Franchi
2012-04-21 15:23:26 -04:00
parent 012bc8949e e4d6b1785c
commit a48fff23c2
2 changed files with 9 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
ChangeLog
View File

@@ -1,4 +1,5 @@
Version 0.4.2: Version 0.4.2:
* Fix ZeroConf protocol showing IP addresses instead of host names.
* Updated translations for various languages. * Updated translations for various languages.
* Resuming playback restores correct volume settings. * Resuming playback restores correct volume settings.
* Reduced CPU usage during playback. * Reduced CPU usage during playback.

15
src/accounts/zeroconf/tomahawkzeroconf.h
View File

@@ -98,19 +98,20 @@ public slots:
void advertise() void advertise()
{ {
qDebug() << "Advertising us on the LAN (both versions)"; qDebug() << "Advertising us on the LAN (both versions)";
QByteArray advert = QString( "TOMAHAWKADVERT:%1:%2" ) // Keep newer versions first
.arg( m_port ) QByteArray advert = QString( "TOMAHAWKADVERT:%1:%2:%3" )
.arg( Database::instance()->dbid() )
.toAscii();
m_sock.writeDatagram( advert.data(), advert.size(),
QHostAddress::Broadcast, ZCONF_PORT );
advert = QString( "TOMAHAWKADVERT:%1:%2:%3" )
.arg( m_port ) .arg( m_port )
.arg( Database::instance()->dbid() ) .arg( Database::instance()->dbid() )
.arg( QHostInfo::localHostName() ) .arg( QHostInfo::localHostName() )
.toAscii(); .toAscii();
m_sock.writeDatagram( advert.data(), advert.size(), m_sock.writeDatagram( advert.data(), advert.size(),
QHostAddress::Broadcast, ZCONF_PORT ); QHostAddress::Broadcast, ZCONF_PORT );
advert = QString( "TOMAHAWKADVERT:%1:%2" )
.arg( m_port )
.arg( Database::instance()->dbid() )
.toAscii();
m_sock.writeDatagram( advert.data(), advert.size(),
QHostAddress::Broadcast, ZCONF_PORT );
} }
signals: signals: