[Slim-Checkins] r10197 - in /branches/6.5/server: Changelog6.html Plugins/CLI.pm Slim/Web/HTTP.pm slimserver.pl

[dsully at svn.slimdevices.com]

Author: dsully
Date: Wed Oct  4 15:44:20 2006
New Revision: 10197

URL: http://svn.slimdevices.com?rev=10197&view=rev
Log:
Bug: 4291
Description: Merge from trunk -r 10195:10196

Modified:
    branches/6.5/server/Changelog6.html
    branches/6.5/server/Plugins/CLI.pm
    branches/6.5/server/Slim/Web/HTTP.pm
    branches/6.5/server/slimserver.pl

Modified: branches/6.5/server/Changelog6.html
URL: http://svn.slimdevices.com/branches/6.5/server/Changelog6.html?rev=10197&r1=10196&r2=10197&view=diff
==============================================================================
--- branches/6.5/server/Changelog6.html (original)
+++ branches/6.5/server/Changelog6.html Wed Oct  4 15:44:20 2006
@@ -57,6 +57,7 @@
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4245">#4245</a> - Pressing PLAY on top level browse pushes right</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4270">#4270</a> - Server Information on SB - two items muddled up</li>
 		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4281">#4281</a> - Mix do not work with accented characters in filenames and paths</li>
+		<li><a href="http://bugs.slimdevices.com/show_bug.cgi?id=4291">#4291</a> - if you change the http or cli port, mdns doesn't update its advertisements</li>
 	</ul>
 </ul>
 

Modified: branches/6.5/server/Plugins/CLI.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Plugins/CLI.pm?rev=10197&r1=10196&r2=10197&view=diff
==============================================================================
--- branches/6.5/server/Plugins/CLI.pm (original)
+++ branches/6.5/server/Plugins/CLI.pm Wed Oct  4 15:44:20 2006
@@ -121,7 +121,6 @@
 	return (\%setupGroup, \%setupPrefs);
 }
 
-
 # plugin: shutdown the CLI
 sub shutdownPlugin {
 
@@ -139,6 +138,9 @@
 	
 	# close the socket
 	cli_socket_close();
+
+	# and restart mDNS without the cli port.
+	Slim::Networking::mDNS->startAdvertising;
 }
 
 # plugin strings at the end of the file
@@ -176,7 +178,6 @@
 	}
 }
 
-
 # open or change our socket
 sub cli_socket_change {
 
@@ -198,6 +199,8 @@
 		if ($newport) {
 			cli_socket_open($newport);
 		}
+
+		Slim::Networking::mDNS->startAdvertising;
 	}
 }
 

Modified: branches/6.5/server/Slim/Web/HTTP.pm
URL: http://svn.slimdevices.com/branches/6.5/server/Slim/Web/HTTP.pm?rev=10197&r1=10196&r2=10197&view=diff
==============================================================================
--- branches/6.5/server/Slim/Web/HTTP.pm (original)
+++ branches/6.5/server/Slim/Web/HTTP.pm Wed Oct  4 15:44:20 2006
@@ -186,11 +186,13 @@
 }
 
 sub adjustHTTPPort {
+
 	# do this on a timer so current page can be updated first and it executed outside select
 	Slim::Utils::Timers::setTimer(undef, Time::HiRes::time() + 0.5, \&_adjustHTTPPortCallback);
 }
 
 sub _adjustHTTPPortCallback {
+
 	# if we've already opened a socket, let's close it
 	if ($openedport) {
 
@@ -206,7 +208,11 @@
 
 	# open new port if specified
 	if (Slim::Utils::Prefs::get('httpport')) {
+
 		Slim::Web::HTTP::openport(Slim::Utils::Prefs::get('httpport'), $::httpaddr, $Bin);
+
+		# Need to restart mDNS after changing the HTTP port.
+		Slim::Networking::mDNS->startAdvertising;
 	}
 }
 

Modified: branches/6.5/server/slimserver.pl
URL: http://svn.slimdevices.com/branches/6.5/server/slimserver.pl?rev=10197&r1=10196&r2=10197&view=diff
==============================================================================
--- branches/6.5/server/slimserver.pl (original)
+++ branches/6.5/server/slimserver.pl Wed Oct  4 15:44:20 2006
@@ -401,14 +401,14 @@
 	$::d_server && msg("SlimServer HTTP init...\n");
 	Slim::Web::HTTP::init();
 
+	$::d_server && msg("Source conversion init..\n");
+	Slim::Player::Source::init();
+
+	$::d_server && msg("SlimServer Plugins init...\n");
+	Slim::Utils::PluginManager::init();
+
 	$::d_server && msg("mDNS startAdvertising...\n");
 	Slim::Networking::mDNS->startAdvertising;
-
-	$::d_server && msg("Source conversion init..\n");
-	Slim::Player::Source::init();
-
-	$::d_server && msg("SlimServer Plugins init...\n");
-	Slim::Utils::PluginManager::init();
 
 	$::d_server && msg("SlimServer checkDataSource...\n");
 	checkDataSource();