Skip to contentSkip to conversation

alsabat: rename to avoid naming conflict

PATCH In review [email protected] 3 participants 6 messages Jan 12, 2016 – Jan 25, 2016 Kbuild

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 alsabat: rename to avoid naming conflict

From: "Lu, Han" <[email protected]>

alsa-utils as well as bareos-bat (as well a some Bacula packages) all contain a program called /usr/bin/bat, which causes conflicts on various distributions ("basic audio tester" vs "bareos administration tool"("bacula administration tool")).
Rename to avoid conflict.

.gitignore +1 -1
index 59633c9..822be08 100644
@@ -24,6 +24,7 @@ ABOUT-NLS
 *~
 .deps
 
+alsabat/alsabat
 alsactl/alsactl
 alsactl/alsactl_init.7
 alsactl/alsa-state.service
@@ -36,7 +37,6 @@ amixer/amixer
 aplay/aplay
 aplay/arecord
 aplay/arecord.1
-bat/bat
 iecset/iecset
 seq/aconnect/aconnect
 seq/aplaymidi/aplaymidi
Makefile.am +2 -2
index 3d24b87..b996b8f 100644
@@ -18,8 +18,8 @@ SUBDIRS += aplay iecset speaker-test
 if ALSALOOP
 SUBDIRS += alsaloop
 endif
-if BAT
-SUBDIRS += bat
+if ALSABAT
+SUBDIRS += alsabat
 endif
 endif
 if HAVE_SEQ
alsabat/Makefile.am new file +24 -0
new file mode 100644
index 0000000..ab56c19
@@ -0,0 +1,24 @@
+bin_PROGRAMS = alsabat
+man_MANS = alsabat.1
+
+EXTRA_DIST = alsabat.1
+
+alsabat_SOURCES = \
+	alsabat.c \
+	common.c \
+	analyze.c \
+	signal.c \
+	convert.c \
+	alsa.c
+
+noinst_HEADERS = \
+	common.h \
+	bat-signal.h \
+	alsa.h \
+	convert.h \
+	analyze.h
+
+AM_CPPFLAGS = \
+	      -Wall -I$(top_srcdir)/include
+
+alsabat_LDADD = @FFTW_LIB@
alsabat/alsa.c new file +604 -0

604 lines not on this page · raw message

alsabat/alsa.h new file +20 -0
new file mode 100644
index 0000000..d5c9972
@@ -0,0 +1,20 @@
+/*
+ * Copyright (C) 2013-2015 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+extern int retval_play;
+extern int retval_record;
+
+void *playback_alsa(struct bat *);
+void *record_alsa(struct bat *);
alsabat/alsabat.1 new file +159 -0

159 lines not on this page · raw message

alsabat/alsabat.c new file +610 -0

610 lines not on this page · raw message

alsabat/analyze.c new file +314 -0

314 lines not on this page · raw message

alsabat/analyze.h new file +16 -0
new file mode 100644
index 0000000..3fd03d4
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2013-2015 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+int analyze_capture(struct bat *);
alsabat/bat-signal.h new file +30 -0
new file mode 100644
index 0000000..a295517
@@ -0,0 +1,30 @@
+/*
+ * Copyright (C) 2015 Caleb Crome
+ * Copyright (C) 2013-2015 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+/*
+ * Here's a generic sine wave generator that will work indefinitely
+ * for any frequency.
+ *
+ * Note:  the state & phasor are stored as doubles (and updated as
+ * doubles) because after a million samples the magnitude drifts a
+ * bit.  If we really need floats, it can be done with periodic
+ * renormalization of the state_real+state_imag magnitudes.
+ */
+
+int sin_generator_init(struct sin_generator *, float, float, float);
+float sin_generator_next_sample(struct sin_generator *);
+void sin_generator_vfill(struct sin_generator *, float *, int);
+int generate_sine_wave(struct bat *, int, void *);
alsabat/common.c new file +198 -0

198 lines not on this page · raw message

alsabat/common.h new file +176 -0

176 lines not on this page · raw message

alsabat/convert.c new file +113 -0

113 lines not on this page · raw message

alsabat/convert.h new file +23 -0
new file mode 100644
index 0000000..28828ba
@@ -0,0 +1,23 @@
+/*
+ * Copyright (C) 2013-2015 Intel Corporation
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ */
+
+void convert_uint8_to_double(void *, double *, int);
+void convert_int16_to_double(void *, double *, int);
+void convert_int24_to_double(void *, double *, int);
+void convert_int32_to_double(void *, double *, int);
+void convert_float_to_uint8(float *, void *, int, int);
+void convert_float_to_int16(float *, void *, int, int);
+void convert_float_to_int24(float *, void *, int, int);
+void convert_float_to_int32(float *, void *, int, int);
alsabat/signal.c new file +184 -0

184 lines not on this page · raw message

bat/Makefile.am deleted +0 -24
deleted file mode 100644
index f0dc5ab..0000000
@@ -1,24 +0,0 @@
-bin_PROGRAMS = bat
-man_MANS = bat.1
-
-EXTRA_DIST = bat.1
-
-bat_SOURCES = \
-	bat.c \
-	common.c \
-	analyze.c \
-	signal.c \
-	convert.c \
-	alsa.c
-
-noinst_HEADERS = \
-	common.h \
-	bat-signal.h \
-	alsa.h \
-	convert.h \
-	analyze.h
-
-AM_CPPFLAGS = \
-	      -Wall -I$(top_srcdir)/include
-
-bat_LDADD = @FFTW_LIB@
bat/alsa.c deleted +0 -604

481 lines not on this page · raw message

bat/alsa.h deleted +0 -20
deleted file mode 100644
index d5c9972..0000000

Lines of this file are not shown. View the raw message.

bat/analyze.c deleted +0 -314

314 lines not on this page · raw message

bat/analyze.h deleted +0 -16
deleted file mode 100644
index 3fd03d4..0000000

Lines of this file are not shown. View the raw message.

bat/bat-signal.h deleted +0 -30
deleted file mode 100644
index a295517..0000000

Lines of this file are not shown. View the raw message.

bat/bat.1 deleted +0 -158

158 lines not on this page · raw message

bat/bat.c deleted +0 -610

610 lines not on this page · raw message

bat/common.c deleted +0 -198

198 lines not on this page · raw message

bat/common.h deleted +0 -176

176 lines not on this page · raw message

bat/convert.c deleted +0 -113

113 lines not on this page · raw message

bat/convert.h deleted +0 -23
deleted file mode 100644
index 28828ba..0000000

Lines of this file are not shown. View the raw message.

bat/signal.c deleted +0 -182

182 lines not on this page · raw message

configure.ac +11 -11
index bdb133c..8f3be98 100644

Lines of this file are not shown. View the raw message.

The rest of this diff is not shown. View the raw message.

Signature · 1 line
2.5.0

Part of the diff is not shown here. View the raw message.

#1 lore raw
Quoted 8 lines · On Tue, 12 Jan 2016 04:06:24 +0100, [email protected] wrote:

From: "Lu, Han" <[email protected]>

alsa-utils as well as bareos-bat (as well a some Bacula packages) all contain a program called /usr/bin/bat, which causes conflicts on various distributions ("basic audio tester" vs "bareos administration tool"("bacula administration tool")).
Rename to avoid conflict.

We should get consensus at first.

Also, we don't need to rename the directory or the source files in the tree. What we need to rename is only the target binary.

thanks,

Takashi

#2 lore raw
Quoted 5 lines · Takashi Iwai
Quoted 3 lines · On Tue, 12 Jan 2016 04:06:24 +0100, [email protected] wrote:

From: "Lu, Han" <[email protected]>

Quoted 7 lines
Quoted 5 lines

alsa-utils as well as bareos-bat (as well a some Bacula packages) all contain a program called /usr/bin/bat, which causes conflicts on various distributions ("basic audio tester" vs "bareos administration tool"("bacula administration tool")).
Rename to avoid conflict.

We should get consensus at first.

+1 for alsabat as it should never collide with anything :)

Quoted 8 lines

Also, we don't need to rename the directory or the source files in the tree. What we need to rename is only the target binary.

thanks,

Takashi

#3 lore raw
Quoted 13 lines · Liam Girdwood
Quoted 11 lines · Takashi Iwai
Quoted 8 lines · On Tue, 12 Jan 2016 04:06:24 +0100, [email protected] wrote:

From: "Lu, Han" <[email protected]>

alsa-utils as well as bareos-bat (as well a some Bacula packages) all contain a program called /usr/bin/bat, which causes conflicts on various distributions ("basic audio tester" vs "bareos administration tool"("bacula administration tool")).
Rename to avoid conflict.

Quoted 3 lines
Quoted 1 line

We should get consensus at first.

+1 for alsabat as it should never collide with anything :)

OK, is there anyone against renaming to alsabat?

If no one objects, let's take this.

thanks,

Takashi

author
#4 lore raw
Quoted 25 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Thursday, January 21, 2016 7:49 PM
To: Liam Girdwood
Cc: Lu, Han; [email protected]; [email protected]; alsa- [email protected]; Gautier, Bernard
Subject: Re: [alsa-devel] [PATCH 1/1] alsabat: rename to avoid naming conflict

Quoted 13 lines · Liam Girdwood
Quoted 11 lines · Takashi Iwai
Quoted 8 lines · On Tue, 12 Jan 2016 04:06:24 +0100, [email protected] wrote:

From: "Lu, Han" <[email protected]>

alsa-utils as well as bareos-bat (as well a some Bacula packages) all contain a program called /usr/bin/bat, which causes conflicts on various distributions ("basic audio tester" vs "bareos administration tool"("bacula administration tool")). Rename to avoid conflict.

Quoted 8 lines
Quoted 3 lines
Quoted 1 line

We should get consensus at first.

+1 for alsabat as it should never collide with anything :)

OK, is there anyone against renaming to alsabat?

If no one objects, let's take this.

Sorry, I just tried to change the "bin_PROGRAMS" value from "bat" to "alsabat" but compile failed. The script generates bin and object files recursively, need to hack in the process:

    bat.c --> bat.o (or alsabat.o) --> alsabat

Is there a decent method to do so? Or simply to rename the subfolder and c file too, like my patch v1 did?

BR,
Han

Quoted 4 lines

thanks,

Takashi

author
#5 lore raw
In reply to Takashi Iwai
Quoted 15 lines

-----Original Message-----
From: Takashi Iwai [mailto:[email protected]]
Sent: Wednesday, January 13, 2016 1:01 AM
To: Lu, Han
Cc: [email protected]; Gautier, Bernard; [email protected]; [email protected]; alsa-devel@alsa- project.org
Subject: Re: [alsa-devel] [PATCH 1/1] alsabat: rename to avoid naming conflict

Quoted 3 lines · On Tue, 12 Jan 2016 04:06:24 +0100, [email protected] wrote:

From: "Lu, Han" <[email protected]>

Quoted 7 lines
Quoted 5 lines

alsa-utils as well as bareos-bat (as well a some Bacula packages) all contain a program called /usr/bin/bat, which causes conflicts on various distributions ("basic audio tester" vs "bareos administration tool"("bacula administration tool")).
Rename to avoid conflict.

We should get consensus at first.

Sorry, I was just intend to send a patch for review.

Quoted 4 lines

Also, we don't need to rename the directory or the source files in the tree. What we need to rename is only the target binary.

OK, that would be easier to make change. Thanks.

BR,
Han Lu

Quoted 4 lines

thanks,

Takashi