From 9373b6b312591683aeca7ea00e7c61ab753fc70a Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Sat, 21 Apr 2012 14:53:52 -0400
Subject: [PATCH 1/2] Changelogify
---
ChangeLog | 1 +
1 file changed, 1 insertion(+)
diff --git a/ChangeLog b/ChangeLog
index d1971422c..b63fff671 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,5 @@
Version 0.4.2:
+ * Fix ZeroConf protocol showing IP addresses instead of host names.
* Updated translations for various languages.
* Resuming playback restores correct volume settings.
* Reduced CPU usage during playback.
From e4d6b1785c121c985840ce62e8567966aa476b0e Mon Sep 17 00:00:00 2001
From: Jeff Mitchell <tomahawk@jefferai.org>
Date: Sat, 21 Apr 2012 15:18:04 -0400
Subject: [PATCH 2/2] I'm stupid. Put the right version first.
---
src/accounts/zeroconf/tomahawkzeroconf.h | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/src/accounts/zeroconf/tomahawkzeroconf.h b/src/accounts/zeroconf/tomahawkzeroconf.h
index d51f76ec0..ead658db7 100644
--- a/src/accounts/zeroconf/tomahawkzeroconf.h
+++ b/src/accounts/zeroconf/tomahawkzeroconf.h
@@ -98,19 +98,20 @@ public slots:
void advertise()
{
qDebug() << "Advertising us on the LAN (both versions)";
- QByteArray advert = QString( "TOMAHAWKADVERT:%1:%2" )
- .arg( m_port )
- .arg( Database::instance()->dbid() )
- .toAscii();
- m_sock.writeDatagram( advert.data(), advert.size(),
- QHostAddress::Broadcast, ZCONF_PORT );
- advert = QString( "TOMAHAWKADVERT:%1:%2:%3" )
+ // Keep newer versions first
+ QByteArray advert = QString( "TOMAHAWKADVERT:%1:%2:%3" )
.arg( m_port )
.arg( Database::instance()->dbid() )
.arg( QHostInfo::localHostName() )
.toAscii();
m_sock.writeDatagram( advert.data(), advert.size(),
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: