From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sun, 27 Sep 2015 12:35:05 +0000 (+0000)
Subject: Merge branch 'refs/heads/t/taggers'
X-Git-Tag: v0.5.6~100
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=486314426fcd25e5271fd65a982f8b321585e195

Merge branch 'refs/heads/t/taggers'

Cooking in next since 2015-04-26.

* refs/heads/t/taggers:
  aac: Fix compilation without libmp4v2.
  The mp4 tagger.
  The mp3 tagger.
  The flac tagger.
  The ogg/speex tagger.
  The ogg/vorbis tagger.
  The ogg/opus tagger.
  The wma tagger.
---

486314426fcd25e5271fd65a982f8b321585e195
diff --cc NEWS
index d98930c7,22e16ebe..f1940d3d
--- a/NEWS
+++ b/NEWS
@@@ -1,12 -1,9 +1,19 @@@
  NEWS
  ====
  
 ------------------------------------------
 -current master branch "magnetic momentum"
 ------------------------------------------
++------------------------------------------
++current master branch "cascading gradient"
++------------------------------------------
++
++	- para_afh learned to modify meta tags of mp3 wma ogg spx
++	  opus flac aac files.
++
 +--------------------------------------
 +0.5.5 (2015-09-20) "magnetic momentum"
 +--------------------------------------
 +
 +Many new features and a lot of other improvements.
 +
  	- On Linux systems, local sockets are now created in the
  	  abstract name space by default. This allows to get rid of
  	  the socket specials in /var/paraslash.
diff --cc web/about.in.html
index 5936f932,00000000..2c72f281
mode 100644,000000..100644
--- a/web/about.in.html
+++ b/web/about.in.html
@@@ -1,23 -1,0 +1,23 @@@
 +<h1>About</h1>
 +<hr>
 +
 +Paraslash is a collection of network audio streaming tools for Unix
 +systems. It is written in C and released under the GPLv2.
 +
 +<ul>
 +	<li> Runs on Linux, Mac OS, FreeBSD, NetBSD </li>
 +	<li> Mp3, ogg/vorbis, ogg/speex, aac (m4a), wma, flac and ogg/opus support </li>
 +	<li> http, dccp and udp network streaming </li>
- 	<li> Stand-alone decoder/player </li>
++	<li> Stand-alone decoder, player, tagger </li>
 +	<li> Curses-based gui (<a href="gui.png">screenshot</a>) </li>
 +	<li> Integrated volume normalizer, fader, alarm clock </li>
 +	<li> Sophisticated audio file selector </li>
 +	<li> Command line interface with tab-completion </li>
 +	<li> Open source and well documented </li>
 +</ul>
 +
 +<b> Author: </b> Andr&eacute; Noll,
 +<a href="mailto:maan@tuebingen.mpg.de">maan@tuebingen.mpg.de</a>
 +<br>
 +Comments and bug reports are welcome. Please provide the version of
 +paraslash you are using and relevant parts of the logs.