March 2011 - Alsa-devel - mailman.alsa-project.org

[alsa-devel] snd-hda-intel + pc-speaker regression since kernel 2.6.35
by Halim Sahin 29 Mar '11

29 Mar '11

Hello all, Sorry for bringing up this topic again but in my case a working speaker is needed for accessiblity puposes. The internal pc speaker of my samsung n140 netbook worked since kernel version 2.6.34. Tested with 2.6.35/36 no pc speaker works and I see no beep control in alsamixer Today I've installed a fresh 2.6.38 kernel with same results. It would be really nice if some of you could fix this! alsamixer shows the following: Card: HDA Intel F1: Help Chip: Realtek ALC269 F2: System information Attached you find the output of alsa-info. My snd-hda-intel is build into the kernel. There no output of loaded alsa modules. BR. Halim

1 0

[alsa-devel] [PATCH 0/2] Adding support for ASoC drivers on SPEAr13XX platform
by Rajeev Kumar 29 Mar '11

29 Mar '11

This patchset contains two patches which add support for ASoC sound drivers on ST's SPEAr13XX platform. Details of the SPEAr13XX platforms can be seen here: http://www.st.com/internet/mcu/product/250658.jsp The ARCH and PLATFORM specific code for SPEAr13XX are already under review in Russell King's ARM mailing list. Please review the same and consider for mainline inclusion. Rajeev Kumar (2): sound: asoc: Adding support for SPEAr13XX ASoC driver sound: asoc: Adding support for STA529 Audio Codec sound/soc/Kconfig | 20 +-- sound/soc/Makefile | 1 + sound/soc/codecs/Kconfig | 5 + sound/soc/codecs/Makefile | 2 + sound/soc/codecs/sta529.c | 366 ++++++++++++++++++++++++ sound/soc/codecs/sta529.h | 61 ++++ sound/soc/spear/Kconfig | 19 ++ sound/soc/spear/Makefile | 6 + sound/soc/spear/evb_sta529.c | 135 +++++++++ sound/soc/spear/spear13xx-i2s.c | 598 +++++++++++++++++++++++++++++++++++++++ sound/soc/spear/spear13xx-i2s.h | 22 ++ sound/soc/spear/spear13xx-pcm.c | 496 ++++++++++++++++++++++++++++++++ sound/soc/spear/spear13xx-pcm.h | 54 ++++ 13 files changed, 1767 insertions(+), 18 deletions(-) create mode 100644 sound/soc/codecs/sta529.c create mode 100644 sound/soc/codecs/sta529.h create mode 100644 sound/soc/spear/Kconfig create mode 100644 sound/soc/spear/Makefile create mode 100644 sound/soc/spear/evb_sta529.c create mode 100644 sound/soc/spear/spear13xx-i2s.c create mode 100644 sound/soc/spear/spear13xx-i2s.h create mode 100644 sound/soc/spear/spear13xx-pcm.c create mode 100644 sound/soc/spear/spear13xx-pcm.h

3 15

[alsa-devel] [PATCH alsa-python] alsamixer: Fix bad PyArg_ParseTuple format strings
by Forest Bond 29 Mar '11

29 Mar '11

A number of calls to PyArg_ParseTuple use "I" for ints and "L" for long ints. Fix these to be "i" and "l" respectively. Signed-off-by: Forest Bond <forest.bond(a)rapidrollout.com> --- pyalsa/alsamixer.c | 46 +++++++++++++++++++++++----------------------- 1 files changed, 23 insertions(+), 23 deletions(-) diff --git a/pyalsa/alsamixer.c b/pyalsa/alsamixer.c index 81719a7..d686f16 100644 --- a/pyalsa/alsamixer.c +++ b/pyalsa/alsamixer.c @@ -372,7 +372,7 @@ pyalsamixerelement_ismono(struct pyalsamixerelement *pyelem, PyObject *args) { int res, dir = 0; - if (!PyArg_ParseTuple(args, "|I", &dir)) + if (!PyArg_ParseTuple(args, "|i", &dir)) return NULL; if (dir == 0) @@ -393,7 +393,7 @@ pyalsamixerelement_haschannel(struct pyalsamixerelement *pyelem, PyObject *args) { int res, dir = 0, chn = SND_MIXER_SCHN_MONO; - if (!PyArg_ParseTuple(args, "|II", &chn, &dir)) + if (!PyArg_ParseTuple(args, "|ii", &chn, &dir)) return NULL; if (dir == 0) @@ -415,7 +415,7 @@ pyalsamixerelement_hasvolume(struct pyalsamixerelement *pyelem, PyObject *args) { int res, dir = 0; - if (!PyArg_ParseTuple(args, "|I", &dir)) + if (!PyArg_ParseTuple(args, "|i", &dir)) return NULL; if (dir == 0) @@ -444,7 +444,7 @@ pyalsamixerelement_hasswitch(struct pyalsamixerelement *pyelem, PyObject *args) { int res, dir = 0; - if (!PyArg_ParseTuple(args, "|I", &dir)) + if (!PyArg_ParseTuple(args, "|i", &dir)) return NULL; if (dir == 0) @@ -473,7 +473,7 @@ pyalsamixerelement_askvoldB(struct pyalsamixerelement *pyelem, PyObject *args) int res, dir = 0; long volume, val; - if (!PyArg_ParseTuple(args, "|LI", &volume, &dir)) + if (!PyArg_ParseTuple(args, "|li", &volume, &dir)) return NULL; if (dir == 0) @@ -496,7 +496,7 @@ pyalsamixerelement_askdBvol(struct pyalsamixerelement *pyelem, PyObject *args) int res, xdir = -1, dir = 0; long dBvolume, val; - if (!PyArg_ParseTuple(args, "|LII", &dBvolume, &xdir, &dir)) + if (!PyArg_ParseTuple(args, "|lii", &dBvolume, &xdir, &dir)) return NULL; if (dir == 0) @@ -519,7 +519,7 @@ pyalsamixerelement_getvolume(struct pyalsamixerelement *pyelem, PyObject *args) int res, dir = 0, chn = SND_MIXER_SCHN_MONO; long val; - if (!PyArg_ParseTuple(args, "|II", &chn, &dir)) + if (!PyArg_ParseTuple(args, "|ii", &chn, &dir)) return NULL; if (dir == 0) @@ -543,7 +543,7 @@ pyalsamixerelement_getvolumetuple(struct pyalsamixerelement *pyelem, PyObject *a long val; PyObject *t; - if (!PyArg_ParseTuple(args, "|I", &dir)) + if (!PyArg_ParseTuple(args, "|i", &dir)) return NULL; if (dir == 0) { @@ -617,7 +617,7 @@ pyalsamixerelement_getvolumearray(struct pyalsamixerelement *pyelem, PyObject *a long val; PyObject *t, *l; - if (!PyArg_ParseTuple(args, "|I", &dir)) + if (!PyArg_ParseTuple(args, "|i", &dir)) return NULL; if (dir == 0) { @@ -694,7 +694,7 @@ pyalsamixerelement_setvolume(struct pyalsamixerelement *pyelem, PyObject *args) int res, dir = 0, chn = SND_MIXER_SCHN_MONO; long val; - if (!PyArg_ParseTuple(args, "L|II", &val, &chn, &dir)) + if (!PyArg_ParseTuple(args, "l|ii", &val, &chn, &dir)) return NULL; if (dir == 0) res = snd_mixer_selem_set_playback_volume(pyelem->elem, chn, val); @@ -718,7 +718,7 @@ pyalsamixerelement_setvolumetuple(struct pyalsamixerelement *pyelem, PyObject *a int i, res, dir = 0; long val; - if (!PyArg_ParseTuple(args, "O|I", &t, &dir)) + if (!PyArg_ParseTuple(args, "O|i", &t, &dir)) return NULL; if (!PyTuple_Check(t) && !PyList_Check(t)) return PyErr_Format(PyExc_RuntimeError, "Volume values in tuple are expected!"); @@ -770,7 +770,7 @@ pyalsamixerelement_setvolumeall(struct pyalsamixerelement *pyelem, PyObject *arg int res, dir = 0; long val; - if (!PyArg_ParseTuple(args, "L|I", &val, &dir)) + if (!PyArg_ParseTuple(args, "l|i", &val, &dir)) return NULL; if (dir == 0) res = snd_mixer_selem_set_playback_volume_all(pyelem->elem, val); @@ -791,7 +791,7 @@ pyalsamixerelement_getrange(struct pyalsamixerelement *pyelem, PyObject *args) long min, max; PyObject *t; - if (!PyArg_ParseTuple(args, "|I", &dir)) + if (!PyArg_ParseTuple(args, "|i", &dir)) return NULL; if (dir == 0) res = snd_mixer_selem_get_playback_volume_range(pyelem->elem, &min, &max); @@ -816,7 +816,7 @@ pyalsamixerelement_setrange(struct pyalsamixerelement *pyelem, PyObject *args) int dir = 0, res; long min, max; - if (!PyArg_ParseTuple(args, "LL|I", &min, &max, &dir)) + if (!PyArg_ParseTuple(args, "ll|i", &min, &max, &dir)) return NULL; if (dir == 0) res = snd_mixer_selem_set_playback_volume_range(pyelem->elem, min, max); @@ -835,7 +835,7 @@ pyalsamixerelement_getswitch(struct pyalsamixerelement *pyelem, PyObject *args) { int res, dir = 0, chn = SND_MIXER_SCHN_MONO, val; - if (!PyArg_ParseTuple(args, "|II", &chn, &dir)) + if (!PyArg_ParseTuple(args, "|ii", &chn, &dir)) return NULL; if (dir == 0) @@ -862,7 +862,7 @@ pyalsamixerelement_getswitchtuple(struct pyalsamixerelement *pyelem, PyObject *a int res, dir = 0, i, last, val; PyObject *t; - if (!PyArg_ParseTuple(args, "|I", &dir)) + if (!PyArg_ParseTuple(args, "|i", &dir)) return NULL; if (dir == 0) { @@ -934,7 +934,7 @@ pyalsamixerelement_setswitch(struct pyalsamixerelement *pyelem, PyObject *args) { int res, dir = 0, chn = SND_MIXER_SCHN_MONO, val; - if (!PyArg_ParseTuple(args, "I|II", &val, &chn, &dir)) + if (!PyArg_ParseTuple(args, "i|ii", &val, &chn, &dir)) return NULL; if (dir == 0) res = snd_mixer_selem_set_playback_switch(pyelem->elem, chn, val); @@ -954,7 +954,7 @@ pyalsamixerelement_setswitchtuple(struct pyalsamixerelement *pyelem, PyObject *a PyObject *t, *o; int i, res, dir = 0, val; - if (!PyArg_ParseTuple(args, "O|I", &t, &dir)) + if (!PyArg_ParseTuple(args, "O|i", &t, &dir)) return NULL; if (!PyTuple_Check(t)) return PyErr_Format(PyExc_RuntimeError, "Switch state values in tuple are expected!"); @@ -982,7 +982,7 @@ pyalsamixerelement_setswitchall(struct pyalsamixerelement *pyelem, PyObject *arg { int res, dir = 0, val; - if (!PyArg_ParseTuple(args, "I|I", &val, &dir)) + if (!PyArg_ParseTuple(args, "i|i", &val, &dir)) return NULL; if (dir == 0) res = snd_mixer_selem_set_playback_switch_all(pyelem->elem, val); @@ -1002,7 +1002,7 @@ pyalsamixerelement_getvolumedb(struct pyalsamixerelement *pyelem, PyObject *args int res, dir = 0, chn = SND_MIXER_SCHN_MONO; long val; - if (!PyArg_ParseTuple(args, "|II", &chn, &dir)) + if (!PyArg_ParseTuple(args, "|ii", &chn, &dir)) return NULL; if (dir == 0) @@ -1025,7 +1025,7 @@ pyalsamixerelement_setvolumedb(struct pyalsamixerelement *pyelem, PyObject *args int res, dir = 0, dir1 = 0, chn = SND_MIXER_SCHN_MONO; long val; - if (!PyArg_ParseTuple(args, "L|III", &val, &chn, &dir, &dir1)) + if (!PyArg_ParseTuple(args, "l|iii", &val, &chn, &dir, &dir1)) return NULL; if (dir == 0) res = snd_mixer_selem_set_playback_dB(pyelem->elem, chn, val, dir1); @@ -1045,7 +1045,7 @@ pyalsamixerelement_setvolumealldb(struct pyalsamixerelement *pyelem, PyObject *a int res, dir = 0, dir1 = 0; long val; - if (!PyArg_ParseTuple(args, "L|II", &val, &dir, &dir1)) + if (!PyArg_ParseTuple(args, "l|ii", &val, &dir, &dir1)) return NULL; if (dir == 0) res = snd_mixer_selem_set_playback_dB_all(pyelem->elem, val, dir1); @@ -1066,7 +1066,7 @@ pyalsamixerelement_getrangedb(struct pyalsamixerelement *pyelem, PyObject *args) long min, max; PyObject *t; - if (!PyArg_ParseTuple(args, "|I", &dir)) + if (!PyArg_ParseTuple(args, "|i", &dir)) return NULL; if (dir == 0) res = snd_mixer_selem_get_playback_dB_range(pyelem->elem, &min, &max); -- 1.7.0.4

2 1

[alsa-devel] capture file size is 44 bytes only from "arecord audio.wav"
by hong zhang 29 Mar '11

29 Mar '11

List, I create a HDMI interface for TI davinic SoC. But capture file, my.wav, size is only 44 bytes after "arecord my.wav". 1. "arecord -l" display interface as: root@c6a816x-evm:~# arecord -l **** List of CAPTURE Hardware Devices **** card 0: hdmi [TI81XX hdmi], device 0: HDMI McASP Receive hdmi_sii9135-0 [] Subdevices: 1/1 Subdevice #0: subdevice #0 2. root@c6a816x-evm:/dev/snd# ls controlC0 pcmC0D0c timer I check sound/soc/davinci and see snd_pcm_lib_ioctl() is useless. Could anyone please give me hint where to start debug? Thanks. ---henry

1 0

[alsa-devel] Problems with snd_hda_intel in Linux kernel 2.6.38
by Svante Signell 29 Mar '11

29 Mar '11

Trying again to get this message to the alsa-devel list, as recommended by the Debian maintainer of the kernel, without being subscribed. Does alsa not have a bug report page? Booting kernel 2.6.38 hangs at: During boot of kernel 2.6.38 (and 2.6.37) udev bugs out: Waiting for /dev to be fully populated BUG: Unable to handle kernel paging request at ffffc90013cd8000 axz_probe+ ... [snd_hda_intel] ...lots of output lost... udevadm timeout 180 sec ... udevd[390]: worker [439] failed while handling '/devices/pci0000:80/0000:80:01.0' No sound card is recognized after the timeout of the boot as shown above. According to the /proc/asound/cards there are no sound cards See bug Debian bug #619034 for more information. http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=619034 This problem was also reported as Debian bug #613979, as kernel ticket https://bugzilla.kernel.org/show_bug.cgi?id=30552 and sent to this mailing list in February 2011. snd_hda_intel works properly with 2.6.32-5-amd64 (and earlier kernels).

1 0

[alsa-devel] ASoC updates for 2.6.39
by Mark Brown 28 Mar '11

28 Mar '11

The following changes since commit 333802e90d3f0366c4a1cb767e2783d2e1df73a8: ASoC: Support !REGULATOR build for sgtl5000 (2011-03-22 18:26:30 +0000) are available in the git repository at: git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound-2.6.git for-2.6.39 Mark Brown (1): ASoC: Explicitly say registerless widgets have no register Wolfram Sang (2): ASoC: imx: set watermarks for mx2-dma ASoC: imx: fix burstsize for DMA include/sound/soc-dapm.h | 16 ++++++++-------- sound/soc/imx/imx-pcm-dma-mx2.c | 9 +++++++-- sound/soc/imx/imx-ssi.h | 3 --- 3 files changed, 15 insertions(+), 13 deletions(-)

2 1

[alsa-devel] [PATCH 1/2] ASoC: soc-cache: Fix indentation issues
by Dimitris Papastamos 28 Mar '11

28 Mar '11

Signed-off-by: Dimitris Papastamos <dp(a)opensource.wolfsonmicro.com> --- sound/soc/soc-cache.c | 18 +++++++++--------- 1 files changed, 9 insertions(+), 9 deletions(-) diff --git a/sound/soc/soc-cache.c b/sound/soc/soc-cache.c index 1210a6f..22c0b95 100644 --- a/sound/soc/soc-cache.c +++ b/sound/soc/soc-cache.c @@ -93,13 +93,13 @@ static unsigned int do_hw_read(struct snd_soc_codec *codec, unsigned int reg) } static unsigned int snd_soc_4_12_read(struct snd_soc_codec *codec, - unsigned int reg) + unsigned int reg) { return do_hw_read(codec, reg); } static int snd_soc_4_12_write(struct snd_soc_codec *codec, unsigned int reg, - unsigned int value) + unsigned int value) { u8 data[2]; @@ -111,7 +111,7 @@ static int snd_soc_4_12_write(struct snd_soc_codec *codec, unsigned int reg, #if defined(CONFIG_SPI_MASTER) static int snd_soc_4_12_spi_write(void *control_data, const char *data, - int len) + int len) { u8 msg[2]; @@ -209,7 +209,7 @@ static unsigned int snd_soc_8_16_read(struct snd_soc_codec *codec, #if defined(CONFIG_SPI_MASTER) static int snd_soc_8_16_spi_write(void *control_data, const char *data, - int len) + int len) { u8 msg[3]; @@ -257,7 +257,7 @@ static unsigned int do_i2c_read(struct snd_soc_codec *codec, #if defined(CONFIG_I2C) || (defined(CONFIG_I2C_MODULE) && defined(MODULE)) static unsigned int snd_soc_8_8_read_i2c(struct snd_soc_codec *codec, - unsigned int r) + unsigned int r) { u8 reg = r; u8 data; @@ -307,13 +307,13 @@ static unsigned int snd_soc_16_8_read_i2c(struct snd_soc_codec *codec, #endif static unsigned int snd_soc_16_8_read(struct snd_soc_codec *codec, - unsigned int reg) + unsigned int reg) { return do_hw_read(codec, reg); } static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg, - unsigned int value) + unsigned int value) { u8 data[3]; @@ -327,7 +327,7 @@ static int snd_soc_16_8_write(struct snd_soc_codec *codec, unsigned int reg, #if defined(CONFIG_SPI_MASTER) static int snd_soc_16_8_spi_write(void *control_data, const char *data, - int len) + int len) { u8 msg[3]; @@ -379,7 +379,7 @@ static int snd_soc_16_16_write(struct snd_soc_codec *codec, unsigned int reg, #if defined(CONFIG_SPI_MASTER) static int snd_soc_16_16_spi_write(void *control_data, const char *data, - int len) + int len) { u8 msg[4]; -- 1.7.4.1

1 1

[alsa-devel] getting dynamic state from ac97 bus ops
by Mike Frysinger 28 Mar '11

28 Mar '11

is there an obvious way that i'm missing to get at the bus state from the funcs in the global soc_ac97_ops structure ? the ac97 bus drivers that i see in the tree simply have a global variable for state and that sort of defeats the purpose of having multi-instance support in the first place ... -mike

2 3

[alsa-devel] [PATCH] hdspconf: more string constant fixes
by Tim Blechmann 28 Mar '11

28 Mar '11

Signed-off-by: Tim Blechmann <tim(a)klingt.org> --- hdspconf/pixmaps/alsalogo.xpm | 2 +- hdspconf/pixmaps/lad_banner.xpm | 2 +- hdspconf/pixmaps/rme.xpm | 2 +- hdspconf/src/HC_PrefSyncRef.h | 6 +++--- hdspconf/src/HC_XpmRenderer.cxx | 6 +++--- hdspconf/src/HC_XpmRenderer.h | 8 ++++---- hdspconf/src/pixmaps.h | 10 +++++----- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/hdspconf/pixmaps/alsalogo.xpm b/hdspconf/pixmaps/alsalogo.xpm index b32c32d..cd22dd2 100644 --- a/hdspconf/pixmaps/alsalogo.xpm +++ b/hdspconf/pixmaps/alsalogo.xpm @@ -1,5 +1,5 @@ /* XPM */ -char * alsalogo_xpm[] = { +const char * alsalogo_xpm[] = { "50 50 398 2", " c None", ". c #C0C0C0", diff --git a/hdspconf/pixmaps/lad_banner.xpm b/hdspconf/pixmaps/lad_banner.xpm index 8bb8545..11d4357 100644 --- a/hdspconf/pixmaps/lad_banner.xpm +++ b/hdspconf/pixmaps/lad_banner.xpm @@ -1,5 +1,5 @@ /* XPM */ -char * lad_banner_xpm[] = { +const char * lad_banner_xpm[] = { "113 39 1833 2", " c None", ". c #C0C0C0", diff --git a/hdspconf/pixmaps/rme.xpm b/hdspconf/pixmaps/rme.xpm index a892603..b94fa7e 100644 --- a/hdspconf/pixmaps/rme.xpm +++ b/hdspconf/pixmaps/rme.xpm @@ -1,5 +1,5 @@ /* XPM */ -char * rme_xpm[] = { +const char * rme_xpm[] = { "113 35 2300 2", " c None", ". c #030505", diff --git a/hdspconf/src/HC_PrefSyncRef.h b/hdspconf/src/HC_PrefSyncRef.h index 5ef8875..8c3a71f 100644 --- a/hdspconf/src/HC_PrefSyncRef.h +++ b/hdspconf/src/HC_PrefSyncRef.h @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -42,7 +42,7 @@ public: Fl_Round_Button *adat_sync; void setRef(int r); private: - char *adat_name; + const char *adat_name; }; #endif diff --git a/hdspconf/src/HC_XpmRenderer.cxx b/hdspconf/src/HC_XpmRenderer.cxx index 72742f8..ed66d4d 100644 --- a/hdspconf/src/HC_XpmRenderer.cxx +++ b/hdspconf/src/HC_XpmRenderer.cxx @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -21,7 +21,7 @@ #pragma implementation #include "HC_XpmRenderer.h" -HC_XpmRenderer::HC_XpmRenderer(int x, int y, int w, int h, char * const *xpm):Fl_Widget(x, y, w, h) +HC_XpmRenderer::HC_XpmRenderer(int x, int y, int w, int h, const char * const *xpm):Fl_Widget(x, y, w, h) { pixmap = xpm; } diff --git a/hdspconf/src/HC_XpmRenderer.h b/hdspconf/src/HC_XpmRenderer.h index 3c6f768..1e18541 100644 --- a/hdspconf/src/HC_XpmRenderer.h +++ b/hdspconf/src/HC_XpmRenderer.h @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -30,10 +30,10 @@ class HC_XpmRenderer:public Fl_Widget { public: - HC_XpmRenderer(int x, int y, int w, int h, char * const *xpm); + HC_XpmRenderer(int x, int y, int w, int h, const char * const *xpm); void draw(); private: - char * const *pixmap; + const char * const *pixmap; }; #endif diff --git a/hdspconf/src/pixmaps.h b/hdspconf/src/pixmaps.h index c193ed2..4c5aa65 100644 --- a/hdspconf/src/pixmaps.h +++ b/hdspconf/src/pixmaps.h @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -21,9 +21,9 @@ #ifndef pixmaps_H #define pixmaps_H -extern char * rme_xpm[]; -extern char * alsalogo_xpm[]; -extern char * lad_banner_xpm[]; +extern const char * rme_xpm[]; +extern const char * alsalogo_xpm[]; +extern const char * lad_banner_xpm[]; #endif -- 1.7.1

2 1

[alsa-devel] [PATCH 1/2] hdspconf: fix some string constant conversions
by Tim Blechmann 28 Mar '11

28 Mar '11

Signed-off-by: Tim Blechmann <tim(a)klingt.org> --- hdspconf/src/HC_BreakoutCable.cxx | 8 ++++---- hdspconf/src/HC_CardPane.cxx | 20 ++++++++++---------- hdspconf/src/HC_ClockSource.cxx | 14 +++++++------- hdspconf/src/HC_SpdifFreq.cxx | 6 +++--- hdspconf/src/HC_SyncCheck.cxx | 8 ++++---- hdspconf/src/HC_SystemClock.cxx | 6 +++--- hdspconf/src/labels.cxx | 12 ++++++------ hdspconf/src/labels.h | 12 ++++++------ 8 files changed, 43 insertions(+), 43 deletions(-) diff --git a/hdspconf/src/HC_BreakoutCable.cxx b/hdspconf/src/HC_BreakoutCable.cxx index 89d3ec8..0d7edcb 100644 --- a/hdspconf/src/HC_BreakoutCable.cxx +++ b/hdspconf/src/HC_BreakoutCable.cxx @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -21,7 +21,7 @@ #pragma implementation #include "HC_BreakoutCable.h" -static void setXlrStatus(char *ctl_name, int val, int card_index) +static void setXlrStatus(const char *ctl_name, int val, int card_index) { int err; char card_name[6]; @@ -67,7 +67,7 @@ HC_BreakoutCable::HC_BreakoutCable(int x, int y, int w, int h):Fl_Group(x, y, w, xlr = new Fl_Check_Button(x+15, y, w-30, 20, "XLR"); xlr->labelsize(10); xlr->callback(xlr_cb, (void *)parent()); - end(); + end(); } void HC_BreakoutCable::setXlr(unsigned char val) diff --git a/hdspconf/src/HC_CardPane.cxx b/hdspconf/src/HC_CardPane.cxx index 8371dbc..1e346b7 100644 --- a/hdspconf/src/HC_CardPane.cxx +++ b/hdspconf/src/HC_CardPane.cxx @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -21,7 +21,7 @@ #pragma implementation #include "HC_CardPane.h" -extern char *card_names[5]; +extern const char *card_names[5]; HC_CardPane::HC_CardPane(int alsa_idx, int idx, HDSP_IO_Type t):Fl_Group(PANE_X, PANE_Y, PANE_W, PANE_H) { @@ -39,20 +39,20 @@ HC_CardPane::HC_CardPane(int alsa_idx, int idx, HDSP_IO_Type t):Fl_Group(PANE_X, spdif_in = new HC_SpdifIn(x()+166, y()+20, 148, V_STEP*3); spdif_out = new HC_SpdifOut(x()+166, y()+40+V_STEP*3, 148, V_STEP*4); spdif_freq = new HC_SpdifFreq(x()+166, y()+60+V_STEP*7, 148, V_STEP); - + sync_ref = new HC_PrefSyncRef(x()+323, y()+20, 148, V_STEP*4); autosync_ref = new HC_AutoSyncRef(x()+323, y()+40+V_STEP*4, 148, V_STEP*2); system_clock = new HC_SystemClock(x()+323, y()+60+V_STEP*6, 148, V_STEP*2); } else if (type == Digiface) { - + clock_source = new HC_ClockSource(x()+9, y()+20, 148, V_STEP*7); sync_check = new HC_SyncCheck(x()+9, y()+40+V_STEP*7, 148, V_STEP*6); spdif_in = new HC_SpdifIn(x()+166, y()+20, 148, V_STEP*3); spdif_out = new HC_SpdifOut(x()+166, y()+40+V_STEP*3, 148, V_STEP*4); spdif_freq = new HC_SpdifFreq(x()+166, y()+60+V_STEP*7, 148, V_STEP); - + sync_ref = new HC_PrefSyncRef(x()+323, y()+20, 148, V_STEP*6); autosync_ref = new HC_AutoSyncRef(x()+323, y()+40+V_STEP*6, 148, V_STEP*2); system_clock = new HC_SystemClock(x()+323, y()+60+V_STEP*8, 148, V_STEP*2); @@ -65,7 +65,7 @@ HC_CardPane::HC_CardPane(int alsa_idx, int idx, HDSP_IO_Type t):Fl_Group(PANE_X, spdif_in = new HC_SpdifIn(x()+166, y()+20, 148, V_STEP*3); spdif_out = new HC_SpdifOut(x()+166, y()+40+V_STEP*3, 148, V_STEP*4); spdif_freq = new HC_SpdifFreq(x()+166, y()+60+V_STEP*7, 148, V_STEP); - + aeb = new HC_Aeb(x()+323, y()+20, 148, V_STEP); sync_ref = new HC_PrefSyncRef(x()+323, y()+40+V_STEP, 148, V_STEP*6); autosync_ref = new HC_AutoSyncRef(x()+323, y()+60+V_STEP*7, 148, V_STEP*2); @@ -78,17 +78,17 @@ HC_CardPane::HC_CardPane(int alsa_idx, int idx, HDSP_IO_Type t):Fl_Group(PANE_X, spdif_in = new HC_SpdifIn(x()+126, y()+20, 110, V_STEP*4); spdif_out = new HC_SpdifOut(x()+126, y()+40+V_STEP*4, 110, V_STEP*4); spdif_freq = new HC_SpdifFreq(x()+126, y()+60+V_STEP*8, 110, V_STEP); - + aeb = new HC_Aeb(x()+244, y()+20, 110, V_STEP); sync_ref = new HC_PrefSyncRef(x()+244, y()+40+V_STEP, 110, V_STEP*3); autosync_ref = new HC_AutoSyncRef(x()+244, y()+60+V_STEP*4, 110, V_STEP*2); system_clock = new HC_SystemClock(x()+244, y()+80+V_STEP*6, 110, V_STEP*2); - + breakout_cable = new HC_BreakoutCable(x()+362, y()+20, 110, V_STEP); input_level = new HC_InputLevel(x()+362, y()+40+V_STEP, 110, V_STEP*3); output_level = new HC_OutputLevel(x()+362, y()+60+V_STEP*4, 110, V_STEP*3); phones = new HC_Phones(x()+362, y()+80+V_STEP*7, 110, V_STEP*3); - + } end(); } diff --git a/hdspconf/src/HC_ClockSource.cxx b/hdspconf/src/HC_ClockSource.cxx index 4bb978a..d7b2a07 100644 --- a/hdspconf/src/HC_ClockSource.cxx +++ b/hdspconf/src/HC_ClockSource.cxx @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -21,7 +21,7 @@ #pragma implementation #include "HC_ClockSource.h" -extern char *freqs[10]; +extern const char *freqs[10]; void clock_source_cb(Fl_Widget *w, void *arg) { @@ -55,7 +55,7 @@ void clock_source_cb(Fl_Widget *w, void *arg) } else if (source == cs->khz192) { src = 9; } - + snprintf(card_name, 6, "hw:%i", pane->alsa_index); snd_ctl_elem_value_alloca(&ctl); snd_ctl_elem_id_alloca(&id); @@ -67,7 +67,7 @@ void clock_source_cb(Fl_Widget *w, void *arg) if ((err = snd_ctl_open(&handle, card_name, SND_CTL_NONBLOCK)) < 0) { fprintf(stderr, "Error opening ctl interface on card %s\n", card_name); return; - } + } if ((err = snd_ctl_elem_write(handle, ctl)) < 0) { snd_ctl_elem_id_set_interface(id, SND_CTL_ELEM_IFACE_PCM); snd_ctl_elem_value_set_id(ctl, id); @@ -111,7 +111,7 @@ HC_ClockSource::HC_ClockSource(int x, int y, int w, int h):Fl_Group(x, y, w, h, khz176_4->labelsize(10); khz176_4->type(FL_RADIO_BUTTON); khz192 = new Fl_Round_Button(x+10, y+V_STEP*i++, w-20, V_STEP, freqs[9]); - khz192->callback(clock_source_cb, (void *)this); + khz192->callback(clock_source_cb, (void *)this); khz192->labelsize(10); khz192->type(FL_RADIO_BUTTON); } @@ -129,7 +129,7 @@ HC_ClockSource::HC_ClockSource(int x, int y, int w, int h):Fl_Group(x, y, w, h, khz88_2->type(FL_RADIO_BUTTON); khz96->labelsize(10); khz96->type(FL_RADIO_BUTTON); - end(); + end(); } void HC_ClockSource::setSource(unsigned char s) diff --git a/hdspconf/src/HC_SpdifFreq.cxx b/hdspconf/src/HC_SpdifFreq.cxx index 0fed38f..b607d65 100644 --- a/hdspconf/src/HC_SpdifFreq.cxx +++ b/hdspconf/src/HC_SpdifFreq.cxx @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -21,7 +21,7 @@ #pragma implementation #include "HC_SpdifFreq.h" -extern char *freqs[10]; +extern const char *freqs[10]; HC_SpdifFreq::HC_SpdifFreq(int x, int y, int w, int h):Fl_Widget(x, y, w, h, "SPDIF Freq.") { diff --git a/hdspconf/src/HC_SyncCheck.cxx b/hdspconf/src/HC_SyncCheck.cxx index 4a088ba..111c9bc 100644 --- a/hdspconf/src/HC_SyncCheck.cxx +++ b/hdspconf/src/HC_SyncCheck.cxx @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -21,7 +21,7 @@ #pragma implementation #include "HC_SyncCheck.h" -extern char *lock_status[3]; +extern const char *lock_status[3]; HC_SyncCheck::HC_SyncCheck(int x, int y, int w, int h):Fl_Widget(x, y, w, h, "SyncCheck") { @@ -35,7 +35,7 @@ HC_SyncCheck::HC_SyncCheck(int x, int y, int w, int h):Fl_Widget(x, y, w, h, "Sy adat_name = "ADAT In"; } else { adat_name = "ADAT1 In"; - } + } h_step = (int)(w/2.0f); draw_box = Fl::get_boxtype(FL_ENGRAVED_FRAME); label("SyncCheck"); diff --git a/hdspconf/src/HC_SystemClock.cxx b/hdspconf/src/HC_SystemClock.cxx index f1f88bb..d549a6f 100644 --- a/hdspconf/src/HC_SystemClock.cxx +++ b/hdspconf/src/HC_SystemClock.cxx @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -21,7 +21,7 @@ #pragma implementation #include "HC_SystemClock.h" -extern char *freqs[10]; +extern const char *freqs[10]; HC_SystemClock::HC_SystemClock(int x, int y, int w, int h):Fl_Widget(x, y, w, h, "System Clock") { diff --git a/hdspconf/src/labels.cxx b/hdspconf/src/labels.cxx index 59880b6..f8900be 100644 --- a/hdspconf/src/labels.cxx +++ b/hdspconf/src/labels.cxx @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -20,7 +20,7 @@ #include "labels.h" -char *card_names[5] = { +const char *card_names[5] = { "Digiface", "Multiface", "HDSP9652", @@ -28,7 +28,7 @@ char *card_names[5] = { "Undefined", }; -char *freqs[10] = { +const char *freqs[10] = { "32.0 kHz", "44.1 kHz", "48.0 kHz", @@ -41,7 +41,7 @@ char *freqs[10] = { "192.0 kHz", }; -char *ref[7] = { +const char *ref[7] = { "Word Clock", "ADAT Sync", "SPDIF", @@ -51,7 +51,7 @@ char *ref[7] = { "ADAT3" }; -char *lock_status[3] = { +const char *lock_status[3] = { "No Lock", "Lock", "Sync" diff --git a/hdspconf/src/labels.h b/hdspconf/src/labels.h index 42964c0..da996f9 100644 --- a/hdspconf/src/labels.h +++ b/hdspconf/src/labels.h @@ -1,8 +1,8 @@ /* * HDSPConf - * + * * Copyright (C) 2003 Thomas Charbonnel (thomas(a)undata.org) - * + * * 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 @@ -21,10 +21,10 @@ #ifndef LABELS_H #define LABELS_H -extern char *card_names[5]; -extern char *freqs[10]; -extern char *ref[7]; -extern char *lock_status[3]; +extern const char *card_names[5]; +extern const char *freqs[10]; +extern const char *ref[7]; +extern const char *lock_status[3]; #endif -- 1.7.1

2 2