From 655cae6737903aac20835588f82ca592cbdbde99 Mon Sep 17 00:00:00 2001 Message-Id: <655cae6737903aac20835588f82ca592cbdbde99.1717144346.git.mdw@distorted.org.uk> From: Mark Wooding Date: Tue, 2 Oct 2007 22:27:56 +0100 Subject: [PATCH] docs update Organization: Straylight/Edgeware From: Richard Kettlewell --- CHANGES | 28 +++++++++++++++------------- README | 11 +++++++---- README.mac | 2 ++ doc/disobedience.1.in | 19 +++++++++++++++++++ scripts/inst | 2 +- 5 files changed, 44 insertions(+), 18 deletions(-) diff --git a/CHANGES b/CHANGES index 7ea23b2..0ab3194 100644 --- a/CHANGES +++ b/CHANGES @@ -4,9 +4,6 @@ See ChangeLog.d/* for detailed revision history. ** General -There is a new client, 'Disobedience', that depends on the GTK+ library. -Feedback on the interface would be very welcome. - Tracks can now have tags associated with them. See tags in disorder(1) or the preferences documentation for the web interface or Disobedience. @@ -15,6 +12,21 @@ documentation for any interface) as well as by word search. It is possible to limit random play by tag (see required-tags and prohibited-tags in disorder_config(5)). +** Disobedience + +There is a new client, 'Disobedience', that depends on the GTK+ library. +Feedback on the interface would be very welcome. + +** Web Interface + +The "New" screen display tracks recently added to the database. From +here they can be played or their preferences changed. + +** Network Play + +DisOrder can broadcast audio over a network, allowing it to be played on +multiple client machines. See README.streams for details. + ** Server Cache slow file lookups in the server. Should help installations with @@ -41,16 +53,6 @@ tracks kept on the queue to be controlled. There is a new utility disorder-decode which can decode OGG, MP3, WAV and FLAC. The example config file uses it. -** Web Interface - -The "New" screen display tracks recently added to the database. From -here they can be played or their preferences changed. - -** Network Play - -DisOrder can broadcast audio over a network, allowing it to be played on -multiple client machines. See README.streams for details. - ** disorderfm There is a new command line tool called 'disorderfm' which is designed diff --git a/README b/README index df19803..89cb90f 100644 --- a/README +++ b/README @@ -80,16 +80,19 @@ NOTE: If you are upgrading from an earlier version, see README.upgrades. --without-gtk Don't build GTK+ client (Disobedience) --without-python Don't build Python support - See README.client for setting up a standalone client. + See README.client for setting up a standalone client (or read the + disobedience man page). + + The server is only built by default under Linux. See README.mac concerning + its use under OS X. 2. Install it. Most of the installation is done via the install target: make installdirs install - The CGI interface has to be installed separately, and you must use Libtool - to install it. For instance: + The CGI interface has to be installed separately: - ./libtool --mode=install install -m 755 clients/disorder.cgi /usr/local/lib/cgi-bin/disorder + install -m 755 clients/disorder.cgi /usr/local/lib/cgi-bin/disorder Depending on how your system is configured you may need to link the disorder libao driver into the right directory: diff --git a/README.mac b/README.mac index 137b155..2a17cc1 100644 --- a/README.mac +++ b/README.mac @@ -8,6 +8,8 @@ it is not recommended that you run the server on this platform. Things you will need to do: +configure with --with-server. + Make sure that ~jukebox/Library/Logs/CrashReporter/ (or whatever) exists and is writable by the jukebox user. diff --git a/doc/disobedience.1.in b/doc/disobedience.1.in index db7c27b..eea2f40 100644 --- a/doc/disobedience.1.in +++ b/doc/disobedience.1.in @@ -153,6 +153,25 @@ Select all the tracks in the directory (and deselect everything else). .PP Note that these options do not apply recursively - only the tracks in the relevant directory are affected, not those in its subdirectories. +.SS "Added Tab" +This displays a list of tracks recently added to the server's database. The +most recently added track is at the top. +.PP +Left clicking a track will select it. CTRL and SHIFT work as above to select +muliple files. +.PP +Right clicking over a track will pop up a menu with the following options: +.TP +.B "Track properties" +Edit properties of selected tracks. See +.B "Properties Window" +below. +.TP +.B "Play track" +Play selected tracks. +.TP +.B "Select All Tracks" +Select all tracks. .SS "Properties Window" This window contains details of one or more tracks and allows them to be edited. diff --git a/scripts/inst b/scripts/inst index 31dc4c9..cc0d8d6 100755 --- a/scripts/inst +++ b/scripts/inst @@ -24,5 +24,5 @@ set -x make "$@" make check really make "$@" install -really ./libtool --mode=install install -m 755 server/disorder.cgi /home/jukebox/public_html/index.cgi +really install -m 755 server/disorder.cgi /home/jukebox/public_html/index.cgi really ldconfig -- [mdw]