mirror/tomahawk
1
0
Fork 0
mirror of https://github.com/tomahawk-player/tomahawk.git synced 2025-08-11 00:24:12 +02:00
Code Issues Releases Wiki Activity

Merge branch 'stable'

Browse Source
This commit is contained in:
Jeff Mitchell
2011-03-28 17:26:06 -04:00
parent ae5fa0c33a 896d6ad9f4
commit e4fefe0600
7 changed files with 49 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
admin/mac/sparkle-beta.rss
View File

@@ -16,10 +16,10 @@
<item>
<title>Version 0.0.2 (Tomahawk Player Beta - It Lives?)</title>
<sparkle:releaseNotesLink>
https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog
https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Mon, 28 Mar 2011 06:13:01 +0100</pubDate>
<enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-0.0.2.tar.bz2" sparkle:version="0.0.2" length="19835237" type="application/octet-stream" sparkle:dsaSignature="MCwCFGb6yhKUO3+lH3eNaURvwtctLVMUAhQM8mp8yEwcU3ZoaJMTqb387dYccA==" />
<enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-0.0.2.tar.bz2" sparkle:version="0.0.2" length="19831287" type="application/octet-stream" sparkle:dsaSignature="MC0CFC0Hwq9x9BWMF/8sA+c5KfzKoBzFAhUAk9r0IJlxQf9qEJk4IL6bbTWTiuI=" />
</item>
</channel>
</rss>

4
admin/mac/sparkle.rss
View File

@@ -16,10 +16,10 @@
<item>
<title>Version 0.0.2 (Tomahawk Player - It Lives!)</title>
<sparkle:releaseNotesLink>
https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog
https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Mon, 28 Mar 2011 06:13:01 +0100</pubDate>
<enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-0.0.2.tar.bz2" sparkle:version="0.0.2" length="19835237" type="application/octet-stream" sparkle:dsaSignature="MCwCFGb6yhKUO3+lH3eNaURvwtctLVMUAhQM8mp8yEwcU3ZoaJMTqb387dYccA==" />
<enclosure url="http://download.tomahawk-player.org/sparkle/updates/tomahawk-0.0.2.tar.bz2" sparkle:version="0.0.2" length="19831287" type="application/octet-stream" sparkle:dsaSignature="MC0CFC0Hwq9x9BWMF/8sA+c5KfzKoBzFAhUAk9r0IJlxQf9qEJk4IL6bbTWTiuI=" />
</item>
</channel>
</rss>

10
admin/win/sparklewin-beta.rss
View File

@@ -8,10 +8,18 @@
<item>
<title>Version 0.0.1 (Tomahawk Player Beta - It Lives?)</title>
<sparkle:releaseNotesLink>
https://github.com/tomahawk-player/tomahawk/raw/stable/ChangeLog
https://github.com/tomahawk-player/tomahawk/raw/0.0.1/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Fri, 25 Mar 2011 00:00:01 +0100</pubDate>
<enclosure url="http://download.tomahawk-player.org/tomahawk-beta-0.0.1.exe" sparkle:version="0.0.1" />
</item>
<item>
<title>Version 0.0.2 (Tomahawk Player Beta - It Lives?)</title>
<sparkle:releaseNotesLink>
https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Mon, 28 Mar 2011 05:00:02 +0100</pubDate>
<enclosure url="http://download.tomahawk-player.org/tomahawk-0.0.2.exe" sparkle:version="0.0.2" />
</item>
</channel>
</rss>

10
admin/win/sparklewin.rss
View File

@@ -11,7 +11,15 @@
https://github.com/tomahawk-player/tomahawk/raw/0.0.1/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Fri, 25 Mar 2011 00:00:01 +0100</pubDate>
<enclosure url="http://download.tomahawk-player.org/tomahawk-0.0.1.exe" sparkle:version="0.0.1" />
<enclosure url="http://download.tomahawk-player.org/tomahawk-beta-0.0.1.exe" sparkle:version="0.0.1" />
</item>
<item>
<title>Version 0.0.2 (Tomahawk Player - It Lives!)</title>
<sparkle:releaseNotesLink>
https://github.com/tomahawk-player/tomahawk/raw/0.0.2/ChangeLog
</sparkle:releaseNotesLink>
<pubDate>Mon, 28 Mar 2011 05:00:02 +0100</pubDate>
<enclosure url="http://download.tomahawk-player.org/tomahawk-0.0.2.exe" sparkle:version="0.0.2" />
</item>
</channel>
</rss>

27
src/libtomahawk/network/servent.cpp
View File

@@ -92,17 +92,30 @@ bool
Servent::startListening( QHostAddress ha, bool upnp, int port )
{
m_port = port;
// try listening on one port higher as well, to aid debugging
// and let you run 2 instances easily
if( !listen( ha, m_port ) && !listen( ha, ++m_port ) )
int defPort = TomahawkSettings::instance()->defaultPort();
// Listen on both the selected port and, if not the same, the default port -- the latter sometimes necessary for zeroconf
// TODO: only listen on both when zeroconf sip is enabled
// TODO: use a real zeroconf system instead of a simple UDP broadcast?
if( !listen( ha, m_port ) )
{
qDebug() << "Failed to listen on port" << m_port;
qDebug() << "Error string is " << errorString();
return false;
bool defPortAlso = false;
if( m_port != defPort )
defPortAlso = listen( ha, defPort );
if( !defPortAlso )
{
qDebug() << "Failed to listen on both port " << m_port << " and port " << defPort;
qDebug() << "Error string is " << errorString();
return false;
}
else
qDebug() << "Servent listening on port " << defPort << " servent thread:" << thread();
}
else
{
qDebug() << "Servent listening on port" << m_port << " servent thread:" << thread();
bool defPortAlso = listen( ha, defPort );
qDebug() << "Servent listening on port " << m_port << " servent thread:" << thread();
if( defPortAlso )
qDebug() << "Servent also listening on port " << defPort << " servent thread:" << thread();
}
// --lanhack means to advertise your LAN IP over jabber as if it were externallyVisible

6
src/libtomahawk/tomahawksettings.cpp
View File

@@ -377,6 +377,12 @@ TomahawkSettings::setExternalHostname(const QString& externalHostname)
setValue( "network/external-hostname", externalHostname );
}
int
TomahawkSettings::defaultPort() const
{
return 50210;
}
int
TomahawkSettings::externalPort() const
{

1
src/libtomahawk/tomahawksettings.h
View File

@@ -95,6 +95,7 @@ public:
QString externalHostname() const;
void setExternalHostname( const QString& externalHostname );
int defaultPort() const;
int externalPort() const;
void setExternalPort( int externalPort );