Updated mserv to 0.33nb4:

Ensure reset message is flushed before restart starts, and fix volume
	control to correctly report new value so 'volume -' and 'volume +'
	will always reduce/increase the volume by the minimum value.
This commit is contained in:
abs 2002-08-02 23:01:45 +00:00
parent 5d15456078
commit bd2ebfb5ba
13 changed files with 69 additions and 48 deletions

View file

@ -1,8 +1,8 @@
# $NetBSD: Makefile,v 1.4 2002/07/31 14:02:44 abs Exp $
# $NetBSD: Makefile,v 1.5 2002/08/02 23:01:45 abs Exp $
#
DISTNAME= mserv-0.33
PKGREVISION= 3
PKGREVISION= 4
CATEGORIES= audio
MASTER_SITES= http://www.mserv.org/download/

View file

@ -1,14 +1,15 @@
$NetBSD: distinfo,v 1.4 2002/07/31 14:02:44 abs Exp $
$NetBSD: distinfo,v 1.5 2002/08/02 23:01:46 abs Exp $
SHA1 (mserv-0.33.tar.gz) = 4aa66852057942341d9da9c6f839d7ee250f6785
Size (mserv-0.33.tar.gz) = 136456 bytes
SHA1 (patch-aa) = 3048bb4253bdd1825495782ba1c3e26bbfb68255
SHA1 (patch-ab) = cf95b1db0f6c5d58c45805195aaa6321d80abdaa
SHA1 (patch-ab) = 920641a518272fc3b10c0d1fca4f4b926dd26c35
SHA1 (patch-ac) = a8c5fa8039b92318afae6e48329e799e3acc226a
SHA1 (patch-ad) = 59497df92f71a54b34752086a27db1e05482e7dc
SHA1 (patch-ae) = 6954c13dc501ff0ea55cee19301d584130ca0d24
SHA1 (patch-af) = 819c178948b6aff9352ef35b45e13ab8f0ff84df
SHA1 (patch-ag) = e4e2f19bc1b14b20d5a03f7362026a61ffb291bc
SHA1 (patch-ah) = a1cf71e18c3775738af68328aa423277ddb21372
SHA1 (patch-ai) = eed5668942fdc801685aeda8aa2c31ec24d03729
SHA1 (patch-aj) = 91080a55922bbd46a4ba55dc4641dfa0171a553e
SHA1 (patch-ah) = ca0dc3be3c02f82d033cab93aaa454d6918d45de
SHA1 (patch-ai) = 572ef68fe6efe77a6f8af71d8136ceb2310ce1d9
SHA1 (patch-aj) = eed5668942fdc801685aeda8aa2c31ec24d03729
SHA1 (patch-ak) = 91080a55922bbd46a4ba55dc4641dfa0171a553e

View file

@ -1,4 +1,4 @@
$NetBSD: patch-aa,v 1.3 2002/07/31 14:02:44 abs Exp $
$NetBSD: patch-aa,v 1.4 2002/08/02 23:01:46 abs Exp $
--- Makefile.orig Sat Jul 15 19:29:10 2000
+++ Makefile

View file

@ -1,12 +1,13 @@
$NetBSD: patch-ab,v 1.4 2002/07/31 14:02:44 abs Exp $
$NetBSD: patch-ab,v 1.5 2002/08/02 23:01:46 abs Exp $
--- mserv/cmd.c.orig Wed Jul 31 14:59:21 2002
--- mserv/cmd.c.orig Sat Jul 15 18:52:56 2000
+++ mserv/cmd.c
@@ -2790,6 +2790,7 @@ static void mserv_cmd_reset(t_client *cl
@@ -2789,6 +2789,8 @@ static void mserv_cmd_reset(t_client *cl
mserv_response(cl, "RESETER", NULL);
return;
}
mserv_log("Reset initiated by %s", cl->user);
+ mserv_broadcast("RESETGO", "%s", cl->user);
+ mserv_flush();
mserv_log("Reset initiated by %s", cl->user);
mserv_reset();
mserv_broadcast("RESET", "%s", cl->user);
if (cl->mode != mode_human)

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ac,v 1.2 2002/07/31 14:02:44 abs Exp $
$NetBSD: patch-ac,v 1.3 2002/08/02 23:01:46 abs Exp $
--- mserv/config.h.in.orig Tue Jan 25 19:59:08 2000
+++ mserv/config.h.in

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ad,v 1.2 2002/07/31 14:02:45 abs Exp $
$NetBSD: patch-ad,v 1.3 2002/08/02 23:01:46 abs Exp $
--- mserv/configure.in.orig Tue Jan 25 19:59:11 2000
+++ mserv/configure.in

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ae,v 1.2 2002/07/31 14:02:45 abs Exp $
$NetBSD: patch-ae,v 1.3 2002/08/02 23:01:47 abs Exp $
--- mserv/configure.orig Sat Jul 15 19:33:45 2000
+++ mserv/configure

View file

@ -1,4 +1,4 @@
$NetBSD: patch-af,v 1.2 2002/07/31 14:02:45 abs Exp $
$NetBSD: patch-af,v 1.3 2002/08/02 23:01:47 abs Exp $
--- mserv/defconf.c.orig Thu Jul 13 22:20:42 2000
+++ mserv/defconf.c

View file

@ -1,4 +1,4 @@
$NetBSD: patch-ag,v 1.2 2002/07/31 14:02:45 abs Exp $
$NetBSD: patch-ag,v 1.3 2002/08/02 23:01:47 abs Exp $
--- mserv/defines.h.orig Thu Jul 13 22:35:18 2000
+++ mserv/defines.h

View file

@ -1,6 +1,6 @@
$NetBSD: patch-ah,v 1.2 2002/07/31 14:02:45 abs Exp $
$NetBSD: patch-ah,v 1.3 2002/08/02 23:01:47 abs Exp $
--- mserv/english.lang.orig Wed Jul 31 14:58:06 2002
--- mserv/english.lang.orig Thu Jul 13 23:14:11 2000
+++ mserv/english.lang
@@ -207,3 +207,4 @@ DELAY 636 The delay between tracks has b
FILTER 637 Random play filter set to '%02' by %01 (%03 incl, %04 excl)

View file

@ -1,15 +1,19 @@
$NetBSD: patch-ai,v 1.1 2002/08/01 08:51:20 abs Exp $
$NetBSD: patch-ai,v 1.2 2002/08/02 23:01:47 abs Exp $
--- mserv/mservplay.c.orig Tue Jan 25 19:59:16 2000
+++ mserv/mservplay.c
@@ -14,10 +14,6 @@
#include "defines.h"
#include "misc.h"
-#ifndef PATH_MPG123
-#define PATH_MPG123 "/usr/local/bin/mpg123"
-#endif
-
int main(int argc, char *argv[])
{
const pid_t pid = getpid();
--- mserv/mserv.c.orig Sat Jul 15 18:01:15 2000
+++ mserv/mserv.c
@@ -3370,7 +3370,13 @@ int mserv_setmixer(t_client *cl, int wha
mserv_response(cl, "IOCTLWR", NULL);
return -1;
}
- newval = newval & 0xFF;
+ if (ioctl(mixer_fd, MIXER_READ(what), &newval) == -1) {
+ close(mixer_fd);
+ perror("iotcl read");
+ mserv_response(cl, "IOCTLRD", 0);
+ return -1;
+ }
+ newval = newval & 0xff;
if (type == 0 || newval != curval)
break;
param++;

View file

@ -1,15 +1,15 @@
$NetBSD: patch-aj,v 1.1 2002/08/01 08:51:21 abs Exp $
$NetBSD: patch-aj,v 1.2 2002/08/02 23:01:47 abs Exp $
--- mserv/opt.c.orig Thu Jul 13 22:14:41 2000
+++ mserv/opt.c
@@ -164,8 +164,8 @@ int opt_read(const char *root)
/* special case - player variable is an indirected to another variable */
if ((val = conf_getvalue("player")) == NULL) {
if (mserv_verbose)
- printf("No player specified, defaulting to /usr/local/bin/mpg123\n");
- opt_player = "/usr/local/bin/mpg123";
+ printf("No player specified, defaulting to " PATH_MPG123 "\n");
+ opt_player = PATH_MPG123;
} else {
if ((opt_player = conf_getvalue(val)) == NULL) {
fprintf(stderr, "%s: player setting '%s' not found\n", progname,
--- mserv/mservplay.c.orig Tue Jan 25 19:59:16 2000
+++ mserv/mservplay.c
@@ -14,10 +14,6 @@
#include "defines.h"
#include "misc.h"
-#ifndef PATH_MPG123
-#define PATH_MPG123 "/usr/local/bin/mpg123"
-#endif
-
int main(int argc, char *argv[])
{
const pid_t pid = getpid();

View file

@ -0,0 +1,15 @@
$NetBSD: patch-ak,v 1.1 2002/08/02 23:01:48 abs Exp $
--- mserv/opt.c.orig Thu Jul 13 22:14:41 2000
+++ mserv/opt.c
@@ -164,8 +164,8 @@ int opt_read(const char *root)
/* special case - player variable is an indirected to another variable */
if ((val = conf_getvalue("player")) == NULL) {
if (mserv_verbose)
- printf("No player specified, defaulting to /usr/local/bin/mpg123\n");
- opt_player = "/usr/local/bin/mpg123";
+ printf("No player specified, defaulting to " PATH_MPG123 "\n");
+ opt_player = PATH_MPG123;
} else {
if ((opt_player = conf_getvalue(val)) == NULL) {
fprintf(stderr, "%s: player setting '%s' not found\n", progname,