Merge branch 'master' of https://github.com/albertz/shairport into na…

…med-pipe-2

INSTALL.md

@@ -4,7 +4,7 @@ You need the following installed:
 
  * openssl
  * libao
- * Perl
+ * Perl 5.10 or higher
  * Linux: avahi
  * Windows/Mac OS X: Bonjour
 
@@ -23,7 +23,7 @@ Perl modules (install from CPAN if needed e.g. `perl -MCPAN -e 'install X'`):
 ## Mac OS X:
 
  * install XCode
- * install [Homebrew](https://github.com/mxcl/homebrew) or [Macports](http:https://www.macports.org/)
+ * install [Homebrew](https://github.com/mxcl/homebrew) or [MacPorts](http:https://www.macports.org/)
  * type:
 
  $ export ARCHFLAGS="-arch x86_64" (replace x86_64 by your arch)

README.md

@@ -1,19 +1,20 @@
-Shairport v0.05
+ShairPort v0.05
 ==============
 James Laird <[email protected]>
 April 13, 2011
 
 What it is
 ----------
-This program emulates an Airport Express for the purpose of streaming music from iTunes and compatible iPods. It implements a server for the Apple RAOP protocol.
+This program emulates an AirPort Express for the purpose of streaming music from iTunes and compatible iPods. It implements a server for the Apple RAOP protocol.
+ShairPort does not support AirPlay v2 (video and photo streaming).
 
-It probably supports multiple simultaneous streams, if your audio output chain (as detected by libao) does so.
+It supports multiple simultaneous streams, if your audio output chain (as detected by libao) does so.
 
 How to use it
 -------------
 `perl shairport.pl`. See INSTALL.md for further information.
 
-The triangle-in-rectangle Airtunes logo will appear in the iTunes status bar of any machine on the network, or on iPod play controls screen. Choose your access point name to start streaming to the Shairport instance.
+The triangle-in-rectangle AirTunes (now AirPlay) logo will appear in the iTunes status bar of any machine on the network, or on iPod play controls screen. Choose your access point name to start streaming to the ShairPort instance.
 
 Thanks
 ------

shairport.pl

@@ -23,6 +23,8 @@
 # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
 # OTHER DEALINGS IN THE SOFTWARE.
 
+use 5.10.0;
+
 use Getopt::Long;
 use FindBin;
 
@@ -61,7 +63,7 @@
  "h|help" => \$help);
 
 sub usage {
- print "Shairport version $shairportversion - Airport Express emulator\n".
+ print "ShairPort version $shairportversion - Airport Express emulator\n".
  "Usage:\n".
  "$0 [OPTION...]\n".
  "\n".
@@ -265,7 +267,7 @@ sub conn_handle_request {
  my ($fh, $conn) = @_;
 
  my $req = $conn->{req};;
- my $clen = $req->header('content-length') || 0;
+ my $clen = $req->header('content-length') // 0;
  if ($clen > 0 && !length($req->content)) {
  $conn->{req_need} = $clen;
  return; # need more!