From 2a9e511f8dae8e708b2c31863385f91b7965c582 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Fran=C3=A7ois=20LASSERRE?= <choiz@me.com>
Date: Mon, 4 Aug 2014 21:22:33 +0200
Subject: [PATCH] Remove trailing whitespaces. Reorder each files.

---
 example/deefuzzer.json    |  77 ++++++++++++-----------
 example/deefuzzer.xml     |  78 +++++++++++------------
 example/deefuzzer.yaml    |  48 +++++++-------
 example/deefuzzer_doc.xml | 129 +++++++++++++++++++-------------------
 4 files changed, 167 insertions(+), 165 deletions(-)

diff --git a/example/deefuzzer.json b/example/deefuzzer.json
index 333f112..fd4acfe 100644
--- a/example/deefuzzer.json
+++ b/example/deefuzzer.json
@@ -1,60 +1,61 @@
 {
     "deefuzzer": {
-        "log": "mystation.log", 
-        "m3u": "mystation.m3u", 
+        "log": "/path/to/station.log",
+        "m3u": "/path/to/station.m3u",
         "station": {
             "control": {
-                "mode": 0, 
+                "mode": 0,
                 "port": 16001
-            }, 
+            },
             "infos": {
-                "description": "my_station", 
-                "genre": "music", 
-                "name": "my_station", 
+                "description": "My personal best funky playlist ever !",
+                "genre": "Various Funk Groove",
+                "name": "My best funky station",
+                "short_name": "My_station",
                 "url": "http://parisson.com"
-            }, 
+            },
             "jingles": {
-                "dir": "/path/to/jingles", 
-                "mode": 0, 
+                "dir": "/path/to/jingles",
+                "mode": 0,
                 "shuffle": 1
-            }, 
+            },
             "media": {
-                "bitrate": 96, 
-                "dir": "/path/to/mp3/", 
-                "format": "mp3", 
-                "m3u": "/path/to/m3u_file", 
-                "ogg_quality": 4, 
-                "samplerate": 48000, 
-                "shuffle": 0, 
+                "bitrate": 96,
+                "dir": "/path/to/mp3/",
+                "format": "mp3",
+                "m3u": "/path/to/m3u_file",
+                "ogg_quality": 4,
+                "samplerate": 48000,
+                "shuffle": 0,
                 "voices": "2"
-            }, 
+            },
             "record": {
-                "dir": "/home/telecaster/archives/mp3", 
+                "dir": "/path/to/archives",
                 "mode": 0
-            }, 
+            },
             "relay": {
-                "author": "Inconnu", 
-                "mode": 0, 
+                "author": "Unknown",
+                "mode": 0,
                 "url": "http://127.0.0.1:8000/telecaster_live.mp3"
-            }, 
+            },
             "rss": {
-                "dir": "/var/www/rss", 
-                "enclosure": 0, 
-                "media_url": "http://localhost/rss/"
-            }, 
+                "dir": "/path/to/rss",
+                "enclosure": 1,
+                "media_url": "http://localhost/media/"
+            },
             "server": {
-                "host": "127.0.0.1", 
-                "mountpoint": "monitor", 
-                "port": 8000, 
-                "public": 0, 
-                "sourcepassword": "source2parisson", 
+                "host": "127.0.0.1",
+                "mountpoint": "monitor",
+                "port": 8000,
+                "public": 0,
+                "sourcepassword": "icecast_source_password",
                 "type": "icecast"
-            }, 
+            },
             "twitter": {
-                "key": "76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE", 
-                "mode": 0, 
-                "secret": "4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4", 
-                "tags": "bla bla"
+                "key": "you access token key",
+                "mode": 0,
+                "secret": "your access token secret key",
+                "tags": "parisson deefuzzer"
             }
         }
     }
diff --git a/example/deefuzzer.xml b/example/deefuzzer.xml
index 9b46c57..c3f48bf 100644
--- a/example/deefuzzer.xml
+++ b/example/deefuzzer.xml
@@ -1,61 +1,61 @@
 <deefuzzer>
-    <log>mystation.log</log>
-    <m3u>mystation.m3u</m3u>
-
+    <log>/path/to/station.log</log>
+    <m3u>/path/to/station.m3u</m3u>
     <station>
+        <control>
+            <mode>0</mode>
+            <port>16001</port>
+        </control>
         <infos>
-            <short_name>my_station</short_name>
-            <name>My best funky station</name>
             <description>My personal best funky playlist ever !</description>
-            <url>http://mydomain.com</url>
             <genre>Various Funk Groove</genre>
+            <name>My best funky station</name>
+            <short_name>My_station</short_name>
+            <url>http://parisson.com</url>
         </infos>
-        <server>
-            <type>icecast</type>
-            <host>mydomain.com</host>
-            <port>8000</port>
-            <sourcepassword>icecast_source_password</sourcepassword>
-            <public>1</public>
-        </server>
+        <jingles>
+            <dir>/path/to/jingles</dir>
+            <mode>0</mode>
+            <shuffle>1</shuffle>
+        </jingles>
         <media>
+            <bitrate>96</bitrate>
             <dir>/path/to/mp3/</dir>
             <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
             <m3u>/path/to/m3u_file</m3u>
+            <ogg_quality>4</ogg_quality>
+            <samplerate>48000</samplerate>
+            <shuffle>0</shuffle>
+            <voices>2</voices>
         </media>
+        <record>
+            <dir>/path/to/archives</dir>
+            <mode>0</mode>
+        </record>
+        <relay>
+            <author>Unknown</author>
+            <mode>0</mode>
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+        </relay>
         <rss>
             <dir>/path/to/rss/</dir>
             <enclosure>1</enclosure>
-            <media_url>http://my.domain.com/media/</media_url>
+            <media_url>http://localhost/media/</media_url>
         </rss>
+        <server>
+            <host>127.0.0.1</host>
+            <mountpoint>monitor</mountpoint>
+            <port>8000</port>
+            <public>0</public>
+            <sourcepassword>icecast_source_password</sourcepassword>
+            <type>icecast</type>
+        </server>
         <twitter>
-            <mode>0</mode>
             <key>your access token key</key>
+            <mode>0</mode>
             <secret>your access token secret key</secret>
-            <tags>bla bla</tags>
+            <tags>parisson deefuzzer</tags>
         </twitter>
-        <jingles>
-            <mode>0</mode>
-            <dir>/path/to/jingles</dir>
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <mode>0</mode>
-            <port>1234</port>
-        </control>
-        <relay>
-            <mode>0</mode>
-            <url>http://anotherdomain.com:8000/stream.mp3</url>
-            <author>Me</author>
-        </relay>
-        <record>
-            <mode>0</mode>
-            <dir>/path/to/archives</dir>
-        </record>
     </station>
 
 </deefuzzer>
diff --git a/example/deefuzzer.yaml b/example/deefuzzer.yaml
index c2d5712..d663020 100644
--- a/example/deefuzzer.yaml
+++ b/example/deefuzzer.yaml
@@ -1,47 +1,47 @@
 deefuzzer:
-  log: mystation.log
-  m3u: mystation.m3u
+  log: /path/to/station.log
+  m3u: /path/to/station.m3u
 
   station:
     control: {mode: 0,
              port: 16001}
 
-    server: {host: 127.0.0.1,
-             mountpoint: monitor,
-             port: 8000, public: 0,
-             sourcepassword: source2parisson,
-             type: icecast}
-
-    infos: {name: my_station,
-            description: my_station,
-            genre: music,
+    infos: {description: 'My personal best funky playlist ever!',
+            genre: 'Various Funk Groove',
+            name: 'My best funky station',
+            short_name: "My_station",
             url: 'http://parisson.com'}
 
-    media: {dir: /path/to/mp3/,
-            m3u: /path/to/m3u_file,
+    jingles: {dir: /path/to/jingles,
+              mode: 0,
+              shuffle: 1}
+
+    media: {bitrate: 96,
+            dir: /path/to/mp3/,
             format: mp3,
-            bitrate: 96,
+            m3u: /path/to/m3u_file,
             ogg_quality: 4,
             samplerate: 48000,
             shuffle: 0,
             voices: '2'}
 
-    jingles: {dir: /path/to/jingles,
-              mode: 0,
-              shuffle: 1}
-
-    record: {dir: /home/telecaster/archives/mp3,
+    record: {dir: /path/to/archives,
              mode: 0}
 
-    relay: {author: Inconnu,
+    relay: {author: Unknown,
             mode: 0,
             url: 'http://127.0.0.1:8000/telecaster_live.mp3'}
 
     rss: {dir: /var/www/rss,
           enclosure: 0,
-          media_url: 'http://localhost/rss/'}
+          media_url: 'http://localhost/media/'}
 
+    server: {host: 127.0.0.1,
+             mountpoint: monitor,
+             port: 8000, public: 0,
+             sourcepassword: icecast_source_password,
+             type: icecast}
 
-    twitter: {key: 76728330-OjKgbHtn4II86Ad7pNUGEzfNAkGTW5Wvw38qUmLE,
-              mode: 0, secret: 4egZs1dSM37XVY8zXa016Yueku2fleXF2bx8k25V4,
-              tags: bla bla}
+    twitter: {key: 'your access token key',
+              mode: 0, secret: 'your acess token secret key',
+              tags: 'parisson deefuzzzer'}
diff --git a/example/deefuzzer_doc.xml b/example/deefuzzer_doc.xml
index 71cff54..aa915be 100644
--- a/example/deefuzzer_doc.xml
+++ b/example/deefuzzer_doc.xml
@@ -1,55 +1,73 @@
 <deefuzzer>
     <!-- A path to the log file (need write access rights to the directory) -->
-    <log>/path/to/log/mystation.log</log>
+    <log>/path/to/station.log</log>
     <!-- A path to the M3U playlist file (need write access rights to the directory).
          The file is preferably accessible behind an url,
          for example, http://mydomain.com/m3u/mystation.m3u -->
-    <m3u>/path/to/m3u/mystation.m3u</m3u>
-
+    <m3u>/path/to/station.m3u</m3u>
     <station>
+        <control>
+            <!-- If '1', an OSC controller thread is started to allow external commands
+                See README for more info -->
+            <mode>0</mode>
+            <!-- The port of the OSC server -->
+            <port>16001</port>
+        </control>
         <infos>
-            <!-- The short name of the station. It will define the mount point,
-                 for example http://mydomain.com:8000/my_station.mp3 -->
-            <short_name>my_station</short_name>
+            <!-- The description of the station -->
+            <description>My personal best funky playlist ever!</description>
             <!-- The name (title) of the station -->
             <name>My best funky station</name>
-            <!-- The description of the station -->
-            <description>My personal best funky playlist ever !</description>
+            <!-- The short name of the station. It will define the mount point,
+                 for example http://mydomain.com:8000/my_station.mp3 -->
+            <short_name>My_station</short_name>
             <!-- The website of the station (for metadata) -->
-            <url>http://mydomain.com</url>
+            <url>http://parisson.com</url>
             <!-- The genres of the audio streams -->
             <genre>Various Funk Groove</genre>
         </infos>
-        <server>
-            <!-- The type of the server (icecast or stream-m) -->
-            <type>icecast</type>
-            <!-- The host to send the stream (domain or IP) -->
-            <host>mydomain.com</host>
-            <!-- The port of the Icecast2 server on the host -->
-            <port>8000</port>
-            <!-- The source password of the Icecast2 server on the host -->
-            <sourcepassword>icecast_source_password</sourcepassword>
-            <!-- If '1', the mount point will be publish on yp.icecast.org, '0' for private streams -->
-            <public>1</public>
-        </server>
+        <jingles>
+            <!-- A path to the directory containing jingles media files.
+                The files have to be of the same type of the main media files. -->
+            <dir>/path/to/jingles</dir>
+            <!-- If '1', some media will be played between each main track of the playlist. '0' does nothing. -->
+            <mode>0</mode>
+            <!-- If '1', the jingle playlist will be randomized. '0' for aphanumeric order -->
+            <shuffle>1</shuffle>
+        </jingles>
         <media>
+            <!-- The mean bitrate of the media -->
+            <bitrate>96</bitrate>
             <!-- The path to the directory containing all the media. It will be analyse recursively. -->
             <dir>/path/to/mp3/</dir>
             <!-- The audio format of the media. Can be 'mp3' or 'ogg' -->
             <format>mp3</format>
-            <!-- The mean bitrate of the media -->
-            <bitrate>192</bitrate>
+            <!-- You can also give a M3U playlist file -->
+            <m3u>/path/to/m3u_file</m3u>
             <!-- The ogg quality of the ogg vorbis media -->
-            <ogg_quality>7</ogg_quality>
+            <ogg_quality>4</ogg_quality>
             <!-- The samplerate of the media -->
-            <samplerate>44100</samplerate>
+            <samplerate>48000</samplerate>
+            <!-- If '1', the playlist will be randomized. '0' for aphanumeric order -->
+            <shuffle>0</shuffle>
             <!-- The number of channels - or voices - of the media. '1' for mono, '2' for stereo. -->
             <voices>2</voices>
-            <!-- If '1', the playlist will be randomized. '0' for aphanumeric order -->
-            <shuffle>1</shuffle>
-            <!-- You can also give a M3U playlist file -->
-            <m3u>/path/to/m3u_file</m3u>
         </media>
+        <record>
+            <!-- The directory where files will be recorded -->
+            <dir>/path/to/archives</dir>
+            <!-- If '1', the stream will be recorded, '0' does nothing -->
+            <mode>0</mode>
+        </record>
+        <relay>
+            <!-- The default author of the relay streams -->
+            <author>Unknown</author>
+            <!-- If '1', the station will relay another _existing_ stream.
+            Wonderful for commuting to live sessions. '0' does nothing -->
+            <mode>0</mode>
+            <!-- The URL of the station to relay -->
+            <url>http://127.0.0.1:8000/telecaster_live.mp3</url>
+        </relay>
         <rss>
             <!-- A path to the directory containing RSS (XML) files that is 'currently playing'
                 and 'playlist' feeds (need write access rights to the directory).
@@ -61,49 +79,32 @@
             <enclosure>1</enclosure>
             <!-- the base URL of all media items (optional).
                  Default is station url /media -->
-            <media_url>http://my.domain.com/media/</media_url>
+            <media_url>http://localhost/media/</media_url>
         </rss>
+        <server>
+            <!-- The host to send the stream (domain or IP) -->
+            <host>127.0.0.1</host>
+            <!-- The mountpoint stream -->
+            <mountpoint>monitor</mountpoint>
+            <!-- The port of the Icecast2 server on the host -->
+            <port>8000</port>
+            <!-- If '1', the mount point will be publish on yp.icecast.org, '0' for private streams -->
+            <public>0</public>
+            <!-- The source password of the Icecast2 server on the host -->
+            <sourcepassword>icecast_source_password</sourcepassword>
+            <!-- The type of the server (icecast or stream-m) -->
+            <type>icecast</type>
+        </server>
         <twitter>
-            <!-- If '1', deefuzzer will tweet #nowplaying, new tracks and other things to Twitter. 'O' does nothing. -->
-            <mode>0</mode>
             <!-- Your twitter username -->
             <key>your access token key</key>
+            <!-- If '1', deefuzzer will tweet #nowplaying, new tracks and other things to Twitter. 'O' does nothing. -->
+            <mode>0</mode>
             <!-- Your twitter password -->
             <secret>your access token secret key</secret>
             <!-- These tags will be added to each twitter message -->
-            <tags>bla bla</tags>
+            <tags>parisson deefuzzer</tags>
         </twitter>
-        <jingles>
-            <!-- If '1', some media will be played between each main track of the playlist. '0' does nothing. -->
-            <mode>0</mode>
-            <!-- A path to the directory containing jingles media files.
-                The files have to be of the same type of the main media files. -->
-            <dir>/path/to/jingles</dir>
-            <!-- If '1', the jingle playlist will be randomized. '0' for aphanumeric order -->
-            <shuffle>1</shuffle>
-        </jingles>
-        <control>
-            <!-- If '1', an OSC controller thread is started to allow external commands
-                See README for more info -->
-            <mode>0</mode>
-            <!-- The port of the OSC server -->
-            <port>1234</port>
-        </control>
-        <relay>
-            <!-- If '1', the station will relay another _existing_ stream.
-            Wonderful for commuting to live sessions. '0' does nothing -->
-            <mode>0</mode>
-            <!-- The URL of the station to relay -->
-            <url>http://anotherdomain.com:8000/stream.mp3</url>
-            <!-- The default author of the relay streams -->
-            <author>Me</author>
-        </relay>
-        <record>
-            <!-- If '1', the stream will be recorded, '0' does nothing -->
-            <mode>0</mode>
-            <!-- The directory where files will be recorded -->
-            <dir>/path/to/archives</dir>
-        </record>
     </station>
 
     <!-- Note that you can add many different stations in the same config file, thanks to the multi-threaded architecure ! -->
-- 
2.39.5