cleanup

diff --git a/README b/README
index e580d44281ac207f29d7fbd8a65a8446f9a3cc60..62a2b395a51a5f492459aa6c173f419de0445302 100644 (file)
--- a/README
+++ b/README
@@ -50,10 +50,6 @@ Note that you must edit the config file with right parameters before executing.
 You can find an example for the XML file in the directory "example/" of this
 application (maybe in /usr/share/deefuzzer if installed with the help of install.py)
 
-DeeFuzzer can also be run as a deamon using deefuzzer-deamon:
-
-    $ deefuzzer-deamon example/myfuzz.xml &
-
 Since 0.3, deefuzzer doesn't print anything into the shell, then a right <log> parameter
 is needed in the XML config file.
 

diff --git a/deefuzzer-deamon.sh b/deefuzzer-deamon.sh
deleted file mode 100755 (executable)
index 4e2f9a6..0000000
--- a/deefuzzer-deamon.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/bin/bash
-
-conf_file=$1
-log_file=/tmp/deefuzzer.log
-
-set -e
-ulimit -c unlimited
-while true; do
-  deefuzzer $1 > /dev/null
-  sleep 3
-done

diff --git a/example/deefuzz_test_mp3_station.xml b/example/deefuzz_test_mp3_station.xml
deleted file mode 100644 (file)
index 6521cd6..0000000
--- a/example/deefuzz_test_mp3_station.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-    <station>
-        <infos>
-            <short_name>deefuzz$number</short_name>
-            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
-            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
-            <url>http://studio.parisson.com</url>
-            <genre>Techno House Dance Electronic Trance Mix Live</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/momo/music/music4/mp3/janob/80s/tmp</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-            <rss_dir>/tmp/rss</rss_dir>
-            <rss_enclosure>0</rss_enclosure>
-        </media>
-    </station>

diff --git a/example/test_mp3.xml b/example/test_mp3.xml
deleted file mode 100644 (file)
index c2bb82a..0000000
--- a/example/test_mp3.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<deefuzzer>
-    <log>/tmp/deefuzz.log</log>
-    <station>
-        <infos>
-            <short_name>My_Station_1</short_name>
-            <name>My best funky station</name>
-            <description>My personal best funky playlist ever !</description>
-            <url>http://mydomain.com</url>
-            <genre>Other</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>1</public>
-        </server>
-        <media>
-            <dir>/path/to/dir</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-        </media>
-    </station>
-    <station>
-        <infos>
-            <short_name>My_Station_2</short_name>
-            <name>My best funky station</name>
-            <description>My personal best funky playlist ever !</description>
-            <url>http://mydomain.com</url>
-            <genre>Other</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>1</public>
-        </server>
-        <media>
-            <dir>/path/to/dir</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-        </media>
-    </station>
-</deefuzzer>
-

diff --git a/example/test_mp3_8.xml b/example/test_mp3_8.xml
deleted file mode 100644 (file)
index 410b96a..0000000
--- a/example/test_mp3_8.xml
+++ /dev/null
@@ -1,211 +0,0 @@
-<deefuzzer>
-    <log>/tmp/deefuzz.log</log>
-    <station>
-        <infos>
-            <short_name>deefuzz_1</short_name>
-            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
-            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
-            <url>http://studio.parisson.com</url>
-            <genre>Techno House Dance Electronic Trance Mix Live</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/momo/music/music4/mp3/janob/80s/tmp</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-            <rss_dir>/tmp/rss/</rss_dir>
-            <rss_enclosure>0</rss_enclosure>
-        </media>
-    </station>
-    <station>
-        <infos>
-            <short_name>deefuzz_2</short_name>
-            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
-            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
-            <url>http://studio.parisson.com</url>
-            <genre>Techno House Dance Electronic Trance Mix Live</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/momo/music/music4/mp3/janob/80s/tmp</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-            <rss_dir>/tmp/rss/</rss_dir>
-            <rss_enclosure>0</rss_enclosure>
-        </media>
-    </station>
-    <station>
-        <infos>
-            <short_name>deefuzz_3</short_name>
-            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
-            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
-            <url>http://studio.parisson.com</url>
-            <genre>Techno House Dance Electronic Trance Mix Live</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/momo/music/music4/mp3/janob/80s/tmp</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-            <rss_dir>/tmp/rss/</rss_dir>
-            <rss_enclosure>0</rss_enclosure>
-        </media>
-    </station>
-    <station>
-        <infos>
-            <short_name>deefuzz_4</short_name>
-            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
-            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
-            <url>http://studio.parisson.com</url>
-            <genre>Techno House Dance Electronic Trance Mix Live</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/momo/music/music4/mp3/janob/80s/tmp</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-            <rss_dir>/tmp/rss/</rss_dir>
-            <rss_enclosure>0</rss_enclosure>
-        </media>
-    </station>
-    <station>
-        <infos>
-            <short_name>deefuzz_5</short_name>
-            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
-            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
-            <url>http://studio.parisson.com</url>
-            <genre>Techno House Dance Electronic Trance Mix Live</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/momo/music/music4/mp3/janob/80s/tmp</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-            <rss_dir>/tmp/rss/</rss_dir>
-            <rss_enclosure>0</rss_enclosure>
-        </media>
-    </station>
-    <station>
-        <infos>
-            <short_name>deefuzz_6</short_name>
-            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
-            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
-            <url>http://studio.parisson.com</url>
-            <genre>Techno House Dance Electronic Trance Mix Live</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/momo/music/music4/mp3/janob/80s/tmp</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-            <rss_dir>/tmp/rss/</rss_dir>
-            <rss_enclosure>0</rss_enclosure>
-        </media>
-    </station>
-    <station>
-        <infos>
-            <short_name>deefuzz_7</short_name>
-            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
-            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
-            <url>http://studio.parisson.com</url>
-            <genre>Techno House Dance Electronic Trance Mix Live</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/momo/music/music4/mp3/janob/80s/tmp</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-            <rss_dir>/tmp/rss/</rss_dir>
-            <rss_enclosure>0</rss_enclosure>
-        </media>
-    </station>
-    <station>
-        <infos>
-            <short_name>deefuzz_8</short_name>
-            <name>DeeFuzz by Cellar @ Parisson.com - 100% Mix Techno House Electronic Groove !</name>
-            <description>DeeFuzz 100% Mix - The Best Techno House Electronic and Groove Mixes DeeFuzzed by Cellar from Paris 18 Chateau Rouge !</description>
-            <url>http://studio.parisson.com</url>
-            <genre>Techno House Dance Electronic Trance Mix Live</genre>
-        </infos>
-        <server>
-            <host>localhost</host>
-            <port>8000</port>
-            <sourcepassword>source2parisson</sourcepassword>
-            <public>0</public>
-        </server>
-        <media>
-            <dir>/home/momo/music/music4/mp3/janob/80s/tmp</dir>
-            <format>mp3</format>
-            <bitrate>192</bitrate>
-            <ogg_quality>7</ogg_quality>
-            <samplerate>44100</samplerate>
-            <voices>2</voices>
-            <shuffle>1</shuffle>
-            <rss_dir>/tmp/rss/</rss_dir>
-            <rss_enclosure>0</rss_enclosure>
-        </media>
-    </station>
-</deefuzzer>