Skip to Content.
Sympa Menu

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

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Thomas Orgis <scm AT mail.sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5d422029076c80f7a2942dda557a4cb26f82edc5)
  • Date: Thu, 12 Oct 2006 10:46:10 -0500

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

audio-players/dermixd/BUILD | 2
audio-players/dermixd/DETAILS | 4 -
audio-players/dermixd/HISTORY | 6 +-
audio-players/dermixd/dermixd-1.1.0-beta2.frontend.patch | 41
---------------
audio-players/dermixd/dermixd-1.1.0-beta2.tar.bz2.sig | 0
audio-players/dermixd/dermixd-1.1.0.tar.bz2.sig |binary
audio-players/dermixd/init.d/dermixd | 7 +-
audio-players/dermixd/init.d/dermixd.conf | 4 -
dev/null |binary
9 files changed, 13 insertions(+), 51 deletions(-)

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

dermixd version bump

diff --git a/audio-players/dermixd/BUILD b/audio-players/dermixd/BUILD
index 5a4b0d0..1546126 100755
--- a/audio-players/dermixd/BUILD
+++ b/audio-players/dermixd/BUILD
@@ -1,7 +1,5 @@
#no autotools yet... constructing the build
# choice: gnu, gnu-oss, gnu-alsa
-patch -Np1 < ${SCRIPT_DIRECTORY}/dermixd-1.1.0-beta2.frontend.patch &&
-sedit 's/-pedantic-errors//' Makefile &&
if list_find "$OPTS" --enable-alsa
then
if [[ "$DMD_OSS" == y ]]
diff --git a/audio-players/dermixd/DETAILS b/audio-players/dermixd/DETAILS
index 3aed29c..7e793d3 100755
--- a/audio-players/dermixd/DETAILS
+++ b/audio-players/dermixd/DETAILS
@@ -1,12 +1,12 @@
SPELL=dermixd
- VERSION=1.1.0-beta2
+ VERSION=1.1.0
SOURCE=$SPELL-$VERSION.tar.bz2
SOURCE_DIRECTORY=$BUILD_DIRECTORY/$SPELL-$VERSION
SOURCE_URL[0]=http://thomas.orgis.org/$SPELL/$SOURCE
SOURCE_GPG=thomas.orgis.gpg:${SOURCE}.sig
WEB_SITE=http://thomas.orgis.org/dermixd
ENTERED=20060904
- PATCHLEVEL=2
+ PATCHLEVEL=0
LICENSE[0]="GPL"
SHORT="DerMixD is a multithreading audio playback/mixing daemon."
cat << EOF
diff --git a/audio-players/dermixd/HISTORY b/audio-players/dermixd/HISTORY
index 6b8d7d2..183e216 100644
--- a/audio-players/dermixd/HISTORY
+++ b/audio-players/dermixd/HISTORY
@@ -1,4 +1,8 @@
-2006-06-10 Thomas Orgis <sobukus AT sourcemage.org>
+2006-10-12 Thomas Orgis <sobukus AT sourcemage.org>
+ * DETAILS, init.d/dermixd, init.d/dermixd.conf, BUILD,
+ dermixd-1.1.0.tar.bz2.sig: new version 1.1.0
+
+2006-10-06 Thomas Orgis <sobukus AT sourcemage.org>
* init.d/dermixd, DETAILS: now really fix wrongly named parameters

2006-09-23 Thomas Orgis <sobukus AT sourcemage.org>
diff --git a/audio-players/dermixd/dermixd-1.1.0-beta2.frontend.patch
b/audio-players/dermixd/dermixd-1.1.0-beta2.frontend.patch
deleted file mode 100644
index c343c07..0000000
--- a/audio-players/dermixd/dermixd-1.1.0-beta2.frontend.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-diff -ruN dermixd-1.1.0-beta2.orig/frontend/dermixd-control
dermixd-1.1.0-beta2/frontend/dermixd-control
---- dermixd-1.1.0-beta2.orig/frontend/dermixd-control 2006-09-04
02:42:01.000000000 +0200
-+++ dermixd-1.1.0-beta2/frontend/dermixd-control 2006-09-04
02:43:40.000000000 +0200
-@@ -10,6 +10,7 @@
- use FindBin qw($Bin);
- use lib $Bin.'/../lib/perl';
- use lib $Bin.'/../lib/thorma/perl'; #we may operate withing ThOrMA
-+use lib $Bin.'/../lib/dermixd'; #for standalone DerMixD install
-
- use Socket;
- use Param;
-@@ -18,7 +19,8 @@
- my $param = &Param::Parse
- (
- { 'init', "Simple script for sending mixplayd a command... \n Usage:
$0 [options] command+arg\nThe script tries to be smart at start/seek/pause
commands when no channel is given..." }
-- ,'remote','localhost','R','the (remote) server where mixplayd is
running on'
-+ ,'remote','localhost','R','the (remote) server where dermixd is
running on'
-+ ,'port','8888','p','the port to use'
- ,'verbose',0,'v','be more verbose about the server communication'
- ,'silent',0,'s','do not even give a note on success'
- ,'stay',0,'S','stay connected after commands have been issued (makes
sense for scripting)'
-@@ -33,7 +35,7 @@
- #Thus, returned undef on error... that was somehow not consistent with my
different perl versions (5.6 vs 5.8)
- #so, now checking manually if there is a connection online
-
--my $pal = new
DerMixD::Control({'remote',$param->{remote},'debug',$param->{verbose},'echo',$param->{echo}});
-+my $pal = new
DerMixD::Control({'port',$param->{port},'remote',$param->{remote},'debug',$param->{verbose},'echo',$param->{echo}});
- unless($pal->{online}){die "Not online ($!)\n";}
-
- local(*DAT);
-diff -ruN dermixd-1.1.0-beta2.orig/frontend/simple_player
dermixd-1.1.0-beta2/frontend/simple_player
---- dermixd-1.1.0-beta2.orig/frontend/simple_player 2006-09-04
02:42:01.000000000 +0200
-+++ dermixd-1.1.0-beta2/frontend/simple_player 2006-09-04 02:43:40.000000000
+0200
-@@ -11,6 +11,7 @@
- use lib $Bin.'/../lib/perl';
- use lib $Bin.'/../lib/thorma/perl'; #we may operate withing ThOrMA
- use lib $Bin; #for stand-alone package
-+use lib $Bin.'/../lib/dermixd'; #for standalone DerMixD install
-
- #use Param;
- use DerMixD::Control;
diff --git a/audio-players/dermixd/dermixd-1.1.0-beta2.tar.bz2.sig
b/audio-players/dermixd/dermixd-1.1.0-beta2.tar.bz2.sig
deleted file mode 100644
index 3065dbc..0000000
Binary files a/audio-players/dermixd/dermixd-1.1.0-beta2.tar.bz2.sig and
/dev/null differ
diff --git a/audio-players/dermixd/dermixd-1.1.0.tar.bz2.sig
b/audio-players/dermixd/dermixd-1.1.0.tar.bz2.sig
new file mode 100644
index 0000000..dcdf376
Binary files /dev/null and b/audio-players/dermixd/dermixd-1.1.0.tar.bz2.sig
differ
diff --git a/audio-players/dermixd/init.d/dermixd
b/audio-players/dermixd/init.d/dermixd
index 62f44a7..28d9a4b 100644
--- a/audio-players/dermixd/init.d/dermixd
+++ b/audio-players/dermixd/init.d/dermixd
@@ -4,7 +4,7 @@ PROGRAM=/usr/bin/dermixd
RUNLEVEL=3

CONTROL=/usr/bin/dermixd-control
-#some defaults...
+#some defaults... ok, dermixd should start to read a config file...
PORT=8888
BUFFER=2048
AUDIO_RATE=44100
@@ -13,9 +13,10 @@ DEBUG_OUT=
DEFAULT_OUTPUT=
DEFAULT_OUTFILE=
MPG123_DECODER=/usr/bin/mpg123
-MPG123_PREBUFFER=4
+MPG123_PREBUFFER=2
MPG123_ZEROSCAN=yes
MPG123_ZEROLEVEL=100
+MPG123_GAPLESS=yes
INITIAL_SETUP=yes
OUTPUT_STOPPED=yes
NICE=-5
@@ -29,7 +30,7 @@ REMOTE=no
start()
{
echo "starting DerMixD..."
- COMMAND="$PROGRAM port='$PORT' buffer='$BUFFER'
audio_rate='$AUDIO_RATE' channels='$CHANNELS'
mpg123_input.decoder='$MPG123_DECODER'
mpg123_input.prebuffer='$MPG123_PREBUFFER'
mpg123_input.zeroscan='$MPG123_ZEROSCAN'"
+ 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"
if ! test -z "$DEBUG_OUT"; then COMMAND="$COMMAND
output='$DEBUG_OUT'"; fi
if [[ "$REMOTE" == "yes" ]]; then COMMAND="$COMMAND -r"; fi
if [[ "$INITIAL_SETUP" == "yes" ]]
diff --git a/audio-players/dermixd/init.d/dermixd.conf
b/audio-players/dermixd/init.d/dermixd.conf
index 28501ac..e2cccac 100644
--- a/audio-players/dermixd/init.d/dermixd.conf
+++ b/audio-players/dermixd/init.d/dermixd.conf
@@ -32,8 +32,8 @@ MPG123_DECODER=/usr/bin/mpg123
# skip zero level at beginning and end of tracks to get gapless output?
yes/no
MPG123_ZEROSCAN=yes

-# size of mpg123 prebuffer relative to mixer buffer (needed for zeroscan)
-MPG123_PREBUFFER=4
+# size of mpg123 prebuffer in seconds
+MPG123_PREBUFFER=2

# less that that is zero
# (talking 16 bit audio, that means we have a range of 0 to 32767)



  • [SM-Commit] GIT changes to master grimoire by Thomas Orgis (5d422029076c80f7a2942dda557a4cb26f82edc5), Thomas Orgis, 10/12/2006

Archive powered by MHonArc 2.6.24.

Top of Page