Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Thomas Orgis (24db1c983f34a68af8947ba4a7142b0ead9a58c8)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (24db1c983f34a68af8947ba4a7142b0ead9a58c8)
  • Date: Sun, 15 Jun 2014 16:52:08 -0500

GIT changes to master grimoire by Thomas Orgis <sobukus AT sourcemage.org>:

audio-players/dermixd/BUILD | 24 --------------------
audio-players/dermixd/CONFIGURE | 5 ----
audio-players/dermixd/DEPENDS | 14 ++++++------
audio-players/dermixd/DETAILS | 6 ++---
audio-players/dermixd/FINAL | 12 ++++++++++
audio-players/dermixd/HISTORY | 6 +++++
audio-players/dermixd/INSTALL | 30 -------------------------
audio-players/dermixd/PRE_BUILD | 28 ------------------------
audio-players/dermixd/init.d/dermixd | 35
++++++++++++++++--------------
audio-players/dermixd/init.d/dermixd.conf | 28 ++++++++++++++----------
10 files changed, 66 insertions(+), 122 deletions(-)

New commits:
commit 24db1c983f34a68af8947ba4a7142b0ead9a58c8
Author: Thomas Orgis <sobukus AT sourcemage.org>
Commit: Thomas Orgis <sobukus AT sourcemage.org>

dermixd: bump to 2.0.0, adapt to new build system

diff --git a/audio-players/dermixd/BUILD b/audio-players/dermixd/BUILD
deleted file mode 100755
index ce7153c..0000000
--- a/audio-players/dermixd/BUILD
+++ /dev/null
@@ -1,24 +0,0 @@
-#no autotools yet... constructing the build
-# choice: gnu, gnu-oss, gnu-alsa
-if list_find "$OPTS" --enable-alsa
-then
- if [[ "$DMD_OSS" == y ]]
- then
- DMD_BUILD=gnu
- else
- DMD_BUILD=gnu-alsa
- fi
-else
- DMD_BUILD=gnu-oss
-fi &&
-if [[ "$DMD_PRIO" == y ]]; then
- export CPPFLAGS="$CPPFLAGS -DLINUX"
-fi &&
-MAKE_OPT= &&
-if list_find "$OPTS" --enable-sndfile; then
- MAKE_OPT="$MAKE_OPT SNDFILE=yes"
-fi &&
-if list_find "$OPTS" --enable-vorbis; then
- MAKE_OPT="$MAKE_OPT VORBISFILE=yes"
-fi &&
-make $MAKE_OPT $DMD_BUILD
diff --git a/audio-players/dermixd/CONFIGURE b/audio-players/dermixd/CONFIGURE
index 6ef0249..29ef3bc 100755
--- a/audio-players/dermixd/CONFIGURE
+++ b/audio-players/dermixd/CONFIGURE
@@ -1,7 +1,4 @@
-config_query DMD_OSS "Include OSS support (it is forced without ALSA!)" y &&
# I would like to make that depend on yes to init script
# ...and even opt to mod the default config accordingly!
config_query DMD_USER \
-"Create musicdaemon user (init script per default uses it)" y &&
-config_query DMD_PRIO \
-"Enable Linux-specific dropped priority for worker threads (less likely
interruption of mixer/output threads)" n
+"Create musicdaemon user (init script per default uses it)" y
diff --git a/audio-players/dermixd/DEPENDS b/audio-players/dermixd/DEPENDS
index ba3eeea..ac0861a 100755
--- a/audio-players/dermixd/DEPENDS
+++ b/audio-players/dermixd/DEPENDS
@@ -1,8 +1,10 @@
depends -sub CXX gcc &&
+depends perl &&
+depends config-param &&
optional_depends alsa-lib --enable-alsa --disable-alsa "ALSA output" &&
-optional_depends perl --enable-perl --disable-perl "install PERL frontend" &&
-optional_depends mpg123 "" "" "for mpeg input -- \
-need control interface of -thor version or >= 0.60! \
-(you can install mpg123 later without rebuilding)" &&
-optional_depends libvorbis "--enable-vorbis" "--disable-vorbis" "OGG/Vorbis
input" &&
-optional_depends libsndfile "--enable-sndfile" "--disable-sndfile" "sndfile
input"
+optional_depends mpg123 "--enable-mpg123" "--disable-mpg123" "for mpeg input
using libmpg123" &&
+optional_depends libvorbis "--enable-vorbisfile" "--disable-vorbisfile"
"OGG/Vorbis input" &&
+optional_depends libsndfile "--enable-sndfile" "--disable-sndfile" "sndfile
input" &&
+optional_depends file "--enable-magic" "--disable-magic" "identify files
using libmagic" &&
+optional_depends ladspa "--enable-ladspa" "--disable-ladspa" "using LADSPA
plugins" &&
+optional_depends soundtouch "--enable-soundtouch" "--disable-soundtouch"
"timepitch effect"
diff --git a/audio-players/dermixd/DETAILS b/audio-players/dermixd/DETAILS
index 1ebe32a..befa9af 100755
--- a/audio-players/dermixd/DETAILS
+++ b/audio-players/dermixd/DETAILS
@@ -1,5 +1,5 @@
SPELL=dermixd
- VERSION=1.6.2
+ VERSION=2.0.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE2=$SOURCE.sig
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
@@ -16,8 +16,8 @@ cat << EOF
DerMixD takes an arbitrary number of input channels and creates an arbitrary
number of mixes on an arbitrary number of output channels (i.e. audio device
on host machine).
-It is controlled via simple commands on TCP socket (you can talk to it with
-telnet) that are scriptable in a timed manner.
+It is controlled via simple commands on a local or TCP socket (you can talk
+to it with telnet) that are scriptable in a timed manner.
Most important input classes are MPEG audio files/streams via (recent)
mpg123 and libsndfile (there is a sine generator for fun and raw audio input
and on the output side there's OSS and ALSA as well as raw and text
diff --git a/audio-players/dermixd/FINAL b/audio-players/dermixd/FINAL
new file mode 100755
index 0000000..aadaddb
--- /dev/null
+++ b/audio-players/dermixd/FINAL
@@ -0,0 +1,12 @@
+if [[ "$DMD_USER" == "y" ]]
+then
+ create_group audio &&
+ create_account musicdaemon
+# in future modify default config?
+# cp ${SCRIPT_DIRECTORY}/dermixd.conf .
+else
+ create_account nobody
+# sed 's/USER=dermixd/USER=nobody/' \
+# ${SCRIPT_DIRECTORY}/dermixd.conf > dermixd.conf
+fi
+
diff --git a/audio-players/dermixd/HISTORY b/audio-players/dermixd/HISTORY
index db9b7ea..6dd8e91 100644
--- a/audio-players/dermixd/HISTORY
+++ b/audio-players/dermixd/HISTORY
@@ -1,3 +1,9 @@
+2014-06-15 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, DEPENDS: update to 2.0.0
+ * PRE_BUILD, BUILD, INSTALL: not needed anymore
+ * init.d/dermixd, init.d/dermixd.conf: adapt
+ * CONFIGURE, FINAL: reduced to user creation
+
2011-07-30 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
* DEPENDS: changed dependency on g++ to dependency on gcc with
sub-depends on CXX (scripted)
diff --git a/audio-players/dermixd/INSTALL b/audio-players/dermixd/INSTALL
deleted file mode 100755
index bbfbe9f..0000000
--- a/audio-players/dermixd/INSTALL
+++ /dev/null
@@ -1,30 +0,0 @@
-if [[ "$DMD_USER" == "y" ]]
-then
- create_group audio &&
- create_account musicdaemon
-# in future modify default config?
-# cp ${SCRIPT_DIRECTORY}/dermixd.conf .
-else
- create_account nobody
-# sed 's/USER=dermixd/USER=nobody/' \
-# ${SCRIPT_DIRECTORY}/dermixd.conf > dermixd.conf
-fi &&
-
-
-BINDIR=${INSTALL_ROOT}/usr/bin &&
-DOCDIR=${INSTALL_ROOT}/usr/share/doc/dermixd &&
-install -v -d ${BINDIR} &&
-install -v -d ${DOCDIR} &&
-install -v dermixd ${BINDIR} &&
-install -v README BUGS TODO LICENSE CHANGES ${DOCDIR} &&
-if list_find "$OPTS" --enable-perl
-then
- PERLDIR=${INSTALL_ROOT}/usr/lib/dermixd &&
- install -v -d ${PERLDIR} &&
- install -v frontend/simple_player ${BINDIR}/dermixd-play &&
- install -v frontend/dermixd-control ${BINDIR}/dermixd-control &&
- install -v frontend/shuffle ${BINDIR}/shuffle &&
- install -v frontend/Param.pm ${PERLDIR} &&
- install -v -d ${PERLDIR}/DerMixD &&
- install -v frontend/DerMixD/{Base,Control}.pm ${PERLDIR}/DerMixD
-fi
diff --git a/audio-players/dermixd/PRE_BUILD b/audio-players/dermixd/PRE_BUILD
deleted file mode 100755
index c34e659..0000000
--- a/audio-players/dermixd/PRE_BUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-default_pre_build &&
-cd "$SOURCE_DIRECTORY" &&
-# gcc-4.3 hotfix
-echo 'Index: common.hxx
-Index: param.cxx
-===================================================================
---- param.cxx (Revision 442)
-+++ param.cxx (Arbeitskopie)
-@@ -9,6 +9,7 @@
- #include <cstdlib>
- #include <cstdio>
- #include <string>
-+#include <cstring>
- #include <vector>
- using namespace std;
-
-Index: common.hxx
-===================================================================
---- common.hxx (Revision 442)
-+++ common.hxx (Arbeitskopie)
-@@ -16,6 +16,7 @@
- #include <sched.h>
- #include <semaphore.h>
- #include <string>
-+#include <cstring>
- #include <vector>
- #include <queue>
- #include <limits.h>' | patch -Np0
diff --git a/audio-players/dermixd/init.d/dermixd
b/audio-players/dermixd/init.d/dermixd
index 9e88af9..a4d10e7 100644
--- a/audio-players/dermixd/init.d/dermixd
+++ b/audio-players/dermixd/init.d/dermixd
@@ -4,25 +4,27 @@ PROGRAM=/usr/bin/dermixd
RUNLEVEL=3

CONTROL=/usr/bin/dermixd-control
-#some defaults... ok, dermixd should start to read a config file...
+
+# defaults to have something
+USER=musicdaemon
+TCP=yes
PORT=8888
+UNIX=yes
+SOCKET=/tmp/dermixd.socket
+REMOTE=no
BUFFER=2048
AUDIO_RATE=44100
CHANNELS=2
-DEBUG_OUT=
+NICE=-5
+INPUT_ZEROSCAN=no
+INPUT_PREBUFFER=10
+INPUT_ZEROLEVEL=0.01
+INPUT_ZERORANGE=5
+INITIAL_SETUP=yes
DEFAULT_OUTPUT=
DEFAULT_OUTFILE=
-MPG123_DECODER=/usr/bin/mpg123
-MPG123_PREBUFFER=2
-MPG123_ZEROSCAN=yes
-MPG123_ZEROLEVEL=100
-MPG123_GAPLESS=no
-INITIAL_SETUP=yes
OUTPUT_STOPPED=yes
-NICE=-5
-#be on the safe side
-USER=nobody
-REMOTE=no
+#DEBUG_OUT=

. /etc/init.d/smgl_init
. /etc/sysconfig/dermixd
@@ -30,7 +32,7 @@ REMOTE=no
start()
{
echo "starting DerMixD..."
- COMMAND="$PROGRAM port='$PORT' buffer='$BUFFER'
audio_rate='$AUDIO_RATE' channels='$CHANNELS'
mpg123.decoder='$MPG123_DECODER' mpg123.prebuffer='$MPG123_PREBUFFER'
mpg123.zeroscan='$MPG123_ZEROSCAN' mpg123.gapless=$MPG123_GAPLESS"
+ COMMAND="$PROGRAM port='$PORT' socket='$SOCKET' buffer='$BUFFER'
audio_rate='$AUDIO_RATE' channels='$CHANNELS'
input.prebuffer='$INPUT_PREBUFFER' input.zeroscan='$INPUT_ZEROSCAN'
input.zerolevel='$INPUT_ZEROLEVEL' input.zerorange='$INPUT_ZERORANGE'"
if ! test -z "$DEBUG_OUT"; then COMMAND="$COMMAND
output='$DEBUG_OUT'"; fi
if [[ "$REMOTE" == "yes" ]]; then COMMAND="$COMMAND -r"; fi
if [[ "$INITIAL_SETUP" == "yes" ]]
@@ -43,18 +45,19 @@ start()
nice -n $NICE su -s /bin/bash -c "${COMMAND}" ${USER} &&
if [[ "$INITIAL_SETUP" == "yes" ]] && [[ "$OUTPUT_STOPPED" == "yes" ]]
then
- $CONTROL outstop 0
+ $CONTROL outeject 0
fi
+ test -z "$SOCKET" || chmod g+w "$SOCKET"
}

stop()
{
echo "stopping daemon politely"
- $CONTROL --port=${PORT} shutdown
+ $CONTROL --socket="$SOCKET" --port="$PORT" shutdown
}

status()
{
echo "status:"
- $CONTROL --port=${PORT} fullstat
+ $CONTROL -- fullstat
}
diff --git a/audio-players/dermixd/init.d/dermixd.conf
b/audio-players/dermixd/init.d/dermixd.conf
index 4d5ce6b..6e65acc 100644
--- a/audio-players/dermixd/init.d/dermixd.conf
+++ b/audio-players/dermixd/init.d/dermixd.conf
@@ -5,9 +5,18 @@
# but not more! Anyone can send commands per TCP!
USER=musicdaemon

+# enable TCP
+TCP=yes
+
# port to bind to
PORT=8888

+# enable UNIX domain socket
+UNIX=yes
+
+# local socket to use
+SOCKET=/tmp/dermixd.socket
+
# allow non-local connections? yes/no
# Trust your network if enabling that!
REMOTE=no
@@ -26,21 +35,18 @@ NICE=-5

# configuration of the mpeg input

-# path to mpg123 decoder binary
-MPG123_DECODER=/usr/bin/mpg123
-
-# use mpg123's own gapless support?
-MPG123_GAPLESS=no
-
# skip zero level at beginning and end of tracks to get gapless output?
yes/no
-MPG123_ZEROSCAN=yes
+INPUT_ZEROSCAN=no

-# size of mpg123 prebuffer in seconds
-MPG123_PREBUFFER=2
+# size of input prebuffer in seconds
+INPUT_PREBUFFER=10

# less that that is zero
-# (talking 16 bit audio, that means we have a range of 0 to 32767)
-MPG123_ZEROLEVEL=100
+# (relative amplitude)
+INPUT_ZEROLEVEL=0.01
+
+# Range to scan for silence from beginning/end.
+INPUT_ZERORANGE=5

# do create an initial setup of two input channels and one output channel?
yes/no
INITIAL_SETUP=yes



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (24db1c983f34a68af8947ba4a7142b0ead9a58c8), Thomas Orgis, 06/15/2014

Archive powered by MHonArc 2.6.24.

Top of Page