Changeset 298

Timestamp:

29/09/07 12:50:19 (3 years ago)

Author:

stuarth

Message:

Rebranding for SqueezeCentre?.

Location:

trunk

Files:

• HTML/EN/plugins/LazySearch2/settings/basic.html (modified) (2 diffs)
• INSTALL (modified) (1 diff)
• LazySearch2.zip (modified) (previous)
• Makefile (modified) (6 diffs)
• Plugin.pm (modified) (12 diffs)
• Settings.pm (modified) (2 diffs)
• ebuilds/slimserver-lazysearch2-3.0b1.ebuild (modified) (3 diffs)
• install.xml (modified) (2 diffs)
• strings.txt (modified) (1 diff)
• unlazify.sql (modified) (1 diff)

trunk/HTML/EN/plugins/LazySearch2/settings/basic.html

@@ -1 @@
-[%# Plugin settings template page for LazySearch2 plugin for SlimServer.
+[%# Plugin settings template page for LazySearch2 plugin for SqueezeCentre.
   # Copyright © Stuart Hickinbottom 2004-2007
 
@@ -15 +15 @@
   #
   # You should have received a copy of the GNU General Public License
-  # along with Foobar; if not, write to the Free Software
+  # along with LazySearch2; if not, write to the Free Software
   # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 %]

trunk/INSTALL

@@ -2 +2 @@
 
 This file contains very brief instructions on how to install and activate
-this plugin on SlimServer. For full details please refer to:
+this plugin on SqueezeCentre. For full details please refer to:
 http://www.hickinbottom.com/lazysearch
 
-1. Make sure you are running SlimServer 7.0 or later (you need different
-versions of the plugin for earlier versions of SlimServer - see the website if
-that applies to you).
+1. Make sure you are running SqueezeCentre 7.0 or later (you need different
+versions of the plugin for earlier versions of SqueezeCentre (or SlimServer as it was previously called) - see the website if that applies to you).
 
 2. Extract the ZIP file (being sure to preserve the paths in the ZIP file), and
-copy the resulting LazySearch2 directory to your SlimServer plugins directory.
-Windows: C:\Program Files\SlimServer\Server\Plugins
-Linux: it depends, but something like /usr/local/slimserver/Plugins
+copy the resulting LazySearch2 directory to your SqueezeCentre plugins
+directory.
+
+Windows: C:\Program Files\SqueezeCentre\Server\Plugins
+Linux: it depends, but something like /usr/local/squeezecentre/Plugins
 MacOSX: ~/Library/SlimDevices/Plugins (I believe you need to do this
-  as the user that you originally installed SlimServer as.
+  as the user that you originally installed SqueezeCentre as.
 
-3. Restart SlimServer to make sure it has seen the new plugin.
-Windows: use the 'services' applet in the control panel, or the SlimServer
-  tray icon in the bottom-right of the screen if you have it running.
-Linux: it depends, but something like '/etc/init.d/slimserver restart'.
+3. Restart SqueezeCentre to make sure it has seen the new plugin.
+Windows: use the 'services' applet in the control panel, or the SqueezeCentre
+         tray icon in the bottom-right of the screen if you have it running.
+Linux: it depends, but something like '/etc/init.d/squeezecentre restart'.
 Mac OS X: use the standard OSX 'System Properties' menu.
 
 4. Make sure the plugin is present and enabled on the 'Server Settings/Plugins'
-page on the SlimServer web interface.
+page on the SqueezeCentre web interface.
 
 5. Start using the plugin when the initial background scan has finished.

trunk/Makefile

@@ -1 @@
-# Makefile for LazySearch2 plugin for SlimServer 7.0 (and later)
+# Makefile for LazySearch2 plugin for SqueezeCentre 7.0 (and later)
 # Copyright © Stuart Hickinbottom 2004-2007
 
@@ -15 +15 @@
 #
 # You should have received a copy of the GNU General Public License
-# along with Foobar; if not, write to the Free Software
+# along with LazySearch2; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
 # $Id$
 
-VERSION=3.0b2
+VERSION=3.0b3
 PERLSOURCE=Plugin.pm Settings.pm
 HTMLSOURCE=HTML/EN/plugins/LazySearch2/settings/basic.html HTML/EN/plugins/LazySearch2/settings/logo.jpg
@@ -26 +26 @@
 RELEASEDIR=releases
 STAGEDIR=stage
-SLIMDIR=/usr/local/slimserver7/server
+SLIMDIR=/usr/local/squeezecenter/server
 PLUGINSDIR=$(SLIMDIR)/Plugins
 PLUGINDIR=LazySearch2
@@ -34 +34 @@
 SVNDISTFILE=LazySearch2.zip
 LATESTLINK=$(RELEASEDIR)/LazySearch2-7_0-latest.zip
-PREFS=/etc/slimserver7.pref
+PREFS=/etc/squeezecenter.pref
 
 .SILENT:
@@ -66 +66 @@
     echo "You're Beautiful..."
 
-# Install the plugin in SlimServer.
+# Install the plugin in SqueezeCentre.
 install: make-stage
     echo Installing plugin...
@@ -74 +74 @@
     sudo chmod -R -w "$(PLUGINSDIR)/$(PLUGINDIR)"
 
-# Restart SlimServer, quite forcefully. This is obviously quite
+# Restart SqueezeCentre, quite forcefully. This is obviously quite
 # Gentoo-specific.
 restart:
-    echo "Forcefully restarting SlimServer..."
-    sudo /etc/init.d/slimserver7 stop
-    sudo /etc/init.d/slimserver7 zap
+    echo "Forcefully restarting SqueezeCentre..."
+    sudo /etc/init.d/squeezeslave stop
+    sudo /etc/init.d/squeezecenter stop
+    sudo /etc/init.d/squeezecenter zap
     sleep 2
-    sudo sh -c ">/var/log/slimserver7/server.log"
-    sudo sh -c ">/var/log/slimserver7/scanner.log"
-    sudo sh -c ">/var/log/slimserver7/perfmon.log"
-    sudo /etc/init.d/slimserver7 restart
+    sudo sh -c ">/var/log/squeezecenter/server.log"
+    sudo sh -c ">/var/log/squeezecenter/scanner.log"
+    sudo sh -c ">/var/log/squeezecenter/perfmon.log"
+    sudo /etc/init.d/squeezecenter restart
+    sudo /etc/init.d/squeezeslave restart
 
 logtail:
-    echo "Following the end of the SlimServer log..."
-    tail -F /var/log/slimserver7/server.log
+    echo "Following the end of the SqueezeCentre log..."
+    multitail -f /var/log/squeezecenter/server.log
 
 # TODO - fix this for new package layout

trunk/Plugin.pm

@@ -1 @@
-# LazySearch2 Plugin for SlimServer
+# LazySearch2 Plugin for SqueezeCentre
 # Copyright © Stuart Hickinbottom 2004-2007
 
@@ -15 +15 @@
 #
 # You should have received a copy of the GNU General Public License
-# along with Foobar; if not, write to the Free Software
+# along with LazySearch2; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
@@ -216 +216 @@
 );
 
-# Below are functions that are part of the standard SlimServer plugin
+# Below are functions that are part of the standard SqueezeCentreplugin
 # interface.
 
@@ -459 +459 @@
 
     # We restrict the search to include artists related in the roles the
-    # user wants (set through SlimServer preferences).
+    # user wants (set through SqueezeCentre preferences).
     my $roles = Slim::Schema->artistOnlyRoles('TRACKARTIST');
     if ($roles) {
@@ -856 +856 @@
     # Make sure we pop back to the first result - most useful because of the
     # second-row help that is included because it might confuse the user to
-    # see that when the re-enter the search mode (SlimServer will try to resume
-    # the mode on the same row that it was last on).
+    # see that when the re-enter the search mode (SqueezeCentre will try to
+    # resume the mode on the same row that it was last on).
     if ( length( $clientMode{$client}{search_performed} ) == 0 ) {
         $params{initialValue} = $itemsRef->[0];
@@ -1476 +1476 @@
 
     # We restrict the search to include artists related in the roles the
-    # user wants (set through SlimServer preferences).
+    # user wants (set through SqueezeCentre preferences).
     my $roles = Slim::Schema->artistOnlyRoles('TRACKARTIST');
     if ($roles) {
@@ -1655 +1655 @@
 
         # We restrict the search to include artists related in the roles the
-        # user wants (set through SlimServer preferences).
+        # user wants (set through SqueezeCentre preferences).
         my $artistOnlyRoles = Slim::Schema->artistOnlyRoles('TRACKARTIST');
         if ( !defined($artistOnlyRoles) ) {
@@ -1784 +1784 @@
     # the most straightforward way of avoiding having to duplicate all
     # the mixing code in the BrowseDB mode. I've raise bug #4451 to try
-    # to address this in a future SlimServer version.
+    # to address this in a future SqueezeCentre version.
     my $createMix = Slim::Buttons::BrowseDB::getFunctions()->{'create_mix'};
     &$createMix($client);
@@ -1944 +1944 @@
 }
 
-# This is called by SlimServer when a scan has finished. We use this to kick
+# This is called by SqueezeCentre when a scan has finished. We use this to kick
 # off lazification of the database once it's been populated with all music
 # information.
@@ -1972 +1972 @@
 # This function is called when the music database scan has finished. It
 # identifies each artist, track and album that has not yet been encoded into
-# lazy form and schedules a SlimServer background task to encode them.
+# lazy form and schedules a SqueezeCentre background task to encode them.
 sub lazifyDatabase($) {
 
@@ -2103 +2103 @@
 }
 
-# This task function is periodically called by SlimServer when it is 'idle'.
+# This task function is periodically called by SqueezeCentre when it is 'idle'.
 # It works through the IDs of the objects that require encoding. They are
 # encoded in chunks taking a maximum amount of time to keep the server and
@@ -2293 +2293 @@
 
     # Now, if there's any punctuation left in we remove that to aid searching.
-    # We do that by calling the SlimServer method that transforms all
+    # We do that by calling the SqueezeCentre method that transforms all
     # punctuation to spaces, then remove those spaces (since the original
     # spaces are temporarily turned to X's, we'll be able to recover those

trunk/Settings.pm

@@ -1 @@
-# Web settings page handler for LazySearch2 plugin for SlimServer.
+# Web settings page handler for LazySearch2 plugin for SqueezeCentre.
 # Copyright © Stuart Hickinbottom 2004-2007
 
@@ -15 +15 @@
 #
 # You should have received a copy of the GNU General Public License
-# along with Foobar; if not, write to the Free Software
+# along with LazySearch2; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 

trunk/ebuilds/slimserver-lazysearch2-3.0b1.ebuild

@@ -1 @@
-# LazySearch2 Plugin for SlimServer
+# LazySearch2 Plugin for SqueezeCentre
 # Copyright © Stuart Hickinbottom 2004-2007
 #
@@ -8 +8 @@
 SLIMSERVER_VERSION="7.0"
 MY_P="LazySearch2-${PV}"
-DESCRIPTION="A plugin for SlimServer to perform searches more quickly and easily using your player's remote control."
+DESCRIPTION="A plugin for SqueezeCentre to perform searches more quickly and easily using your player's remote control."
 HOMEPAGE="http://www.hickinbottom.com/lazysearch"
 SRC_URI="http://www.hickinbottom.com/lazysearch/${MY_P}.tar.gz"
@@ -17 +17 @@
 DEPEND=""
 RDEPEND="
-    >=media-sound/slimserver-${SLIMSERVER_VERSION}"
+    >=media-sound/squeezecentre-${SLIMSERVER_VERSION}"
 S="${WORKDIR}"
 
 src_install() {
-    cp -r * ${D}/opt/slimserver/Plugins
+    cp -r * ${D}/opt/squeezecentre/Plugins
 }

trunk/install.xml

@@ -17 +17 @@
 
 <!-- You should have received a copy of the GNU General Public License -->
-<!-- along with Foobar; if not, write to the Free Software -->
+<!-- along with LazySearch2; if not, write to the Free Software -->
 <!-- Foundation, Inc., 51 Franklin St, Fifth Floor, -->
 <!-- Boston, MA  02110-1301  USA -->
@@ -39 +39 @@
 
     <targetApplication>
-        <id>SlimServer</id>
+        <id>SqueezeCentre</id>
         <minVersion>7.0a</minVersion>
         <maxVersion>7.0+</maxVersion>

trunk/strings.txt

@@ -15 +15 @@
 #
 # You should have received a copy of the GNU General Public License
-# along with Foobar; if not, write to the Free Software
+# along with LazySearch2; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 

trunk/unlazify.sql

@@ -16 +16 @@
  * 
  * You should have received a copy of the GNU General Public License
- * along with Foobar; if not, write to the Free Software
+ * along with LazySearch2; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  *