Commit graph

477 commits

Author SHA1 Message Date
Jaroslav Kysela
61ea74a6e5 hdajackretask: Add missing header files to tar-ball distribution
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-09-06 17:19:10 +02:00
Jaroslav Kysela
c799e978c8 Release v1.0.26
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-09-06 09:53:16 +02:00
Takashi Iwai
aa795cb827 hda-verb: Don't include sys/io.h for PPC
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2012-07-31 11:04:38 +02:00
Jaroslav Kysela
65219ca2de hda-verb: Add missing MYNAME definition for packaging
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-07-17 18:48:20 +02:00
Karsten Wiese
845c3186a7 usx2yloader: make fxload work without deprecated usbfs
Use $DEVNAME instead of $DEVICE in script tascam_fw.

Signed-off-by: Karsten Wiese <fzuuzf@googlemail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2012-04-27 14:32:14 +02:00
Takashi Iwai
43135b17d8 Update .gitignore for hda-verb
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2012-04-20 15:56:53 +02:00
Takashi Iwai
2996581ce2 Convert hda-verb to use automake
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2012-04-20 15:56:45 +02:00
Takashi Iwai
f8d648a84b Add hdajackretask files to .gitignore
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2012-04-20 15:53:36 +02:00
Takashi Iwai
21e250bfbc Import hda-verb 0.4 to alsa-tools repo
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2012-04-20 15:48:01 +02:00
David Henningsson
d06008f397 hdajackretask: Use autotools
Start to use autotools as build system, just like the other programs
in the alsa-tools suite.

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
2012-04-13 12:42:38 +02:00
David Henningsson
7aa4a74f88 hdajackretask: Add new program for easy retask of hda pin nodes
Most HDA Intel soundcards are to some degree retaskable, i e can be
used for more than one thing. This tool is a GUI to make it easy to
retask your jacks - e g, turn your Mic jack into an extra Headphone,
or why not make them both line outs and connect them to your surround
receiver?

Signed-off-by: David Henningsson <david.henningsson@canonical.com>
2012-03-22 17:47:02 +01:00
Raymond Yau
a680841d4a alsa-tools: hwmixvolume - update README for au88x0
- Need to use alsa-driver kernel 3.4 for Aureal sound cards

Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2012-03-13 10:49:20 +01:00
Jaroslav Kysela
50fb5772e6 Release v1.0.25
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-01-25 08:57:04 +01:00
Jaroslav Kysela
234fa1f79a Remove configure.in-gtk2 from Makefiles...
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-01-23 11:45:15 +01:00
Jaroslav Kysela
3375a08a4c More build fixes (gtk1 check removal from echomixer), cvscompile removal
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-01-23 11:40:34 +01:00
Jaroslav Kysela
52384d8479 envy24control: support gtk1 only in configure.in-gtk1
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2012-01-20 12:39:09 +01:00
Adrian Knoth
15aaaba184 hdspmixer: Fix temporary RPM constant
RPM in hdsp.h's HDSP_IO_Type is 4, not 5. This patch isn't exactly
necessary here, because the constant is only used internally, but to
avoid confusion if somebody ever reads the code, let's use the correct
value.

Note that we'll drop it after the next alsa-lib release.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-07-29 19:23:42 +02:00
Adrian Knoth
1d37a85054 hdsploader: Fix temporary RPM constant
RPM in HDSP_IO_Type (enum from hdsp.h) is 4, not 5.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-07-29 19:23:42 +02:00
Adrian Knoth
21df31ab4f hdsploader: Temporary define for RPM
Right now (1.0.24.1), alsa-lib's hdsp.h doesn't know about the RPM. To
avoid a strong dependency on unreleased code, temporary provide the
define here.

It can be dropped as soon as a new version of alsa-lib will be released,
thus effectively making it the required minimum version for alsa-tools.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-07-29 07:40:10 +02:00
Adrian Knoth
da8a50938d hdsploader: Add support for RME RPM
Augment hdsploader to support the RME RPM devices. The firmware is
already present in alsa-firmware, so we can directly load it.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-07-29 07:39:51 +02:00
Adrian Knoth
53bcd9d16c hdspmixer: Add support for RME RPM
This patch adds support for the RME RPM devices. It's mostly based on
Florian Faber's previous patch against hdspmixer 1.0.23,
forwarded-ported to the current hdspmixer code.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-07-29 07:39:35 +02:00
Adrian Knoth
cb40769c93 hdspmixer: Handle preset files used in 1.0.24 and 1.0.24.1
As an addition to the previous commit, let's also cover the 3rd case
when a preset file was written with hdspmixer v1.0.24 or v1.0.24.1.

In this case, no magic header will be present, but the file size would
differ from the pre 1.0.24 format.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-04-14 12:01:04 +02:00
Adrian Knoth
7c6912449a hdspmixer: Handle channel count in old (v1.0.23) preset file format
When reading a preset file, v1.0.23 only used 26 channels instead of 64.
Reading 64 channels from a 26 channel file won't work, hence set it
depending on the file format version.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-04-14 12:00:52 +02:00
Adrian Knoth
25bd81562a hdspmixer: Fix read/write from/to preset files on MADI-like cards
The old hdspmixer (prior to e24e56795e,
that is pre-1.0.24) has used the hard-coded value "14" for
reading/storing 14 ints from/to preset files, however, it's actually
HDSP_MAX_DEST that should be used.

HDSP_MAX_DEST was bumped from 14 to 32 to allow for MADI cards (32
stereo pairs equal 64 output channels on MADI cards)

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-04-14 12:00:26 +02:00
Adrian Knoth
f9147bfc2c hdspmixer: Initialize headphones out in presets
Cards like the multiface/digiface have additional headphones out. Those
were not initialized in the presets due to wrong loop boundaries:
maxdest represents the amount of physical stereo pairs, and chnls is
either equal or less, so the output fader array needs more iterations
than the playback section.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-04-06 08:22:41 +02:00
Adrian Knoth
92413b739e hdspmixer: Recall 1st preset on all cards, not just on the first
With the new "store current settings to the virtual 9th preset" before
switching cards code, one needs to make sure the actual mixer state is
loaded with sane values, either from the preset file or a generic
builtin preset.

Calling preset_change(1) is sufficient, setting all the required data.
However, in case of more than one RME card in the system, one needs to
call this function for each card, otherwise, some of the cards store
uninitialized data to the 9th preset, resulting in a weird mixer state
afterwards.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-04-06 08:22:33 +02:00
Adrian Knoth
7a865ce040 hdspmixer: Save preset before switching cards
When running with more than one card, switching cards would lose any
changes made to the current card. To avoid this inconvenience, save the
current settings to the virtual 9th preset and restore them when
switching back.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-04-06 08:22:15 +02:00
Adrian Knoth
0b018d9a23 hdspmixer: Add a 9th pseudo preset
When switching cards, all current settings are lost. To have a place
where to store them, let's add a virtual 9th preset which can be used as
a temporary scratch pad.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-04-06 08:22:06 +02:00
Tim Blechmann
c975369874 hdspmixer: fix drawing problems with black background
- use foreground color instead of black
- HDSPMixerSelector: set colors before setting labels

Signed-off-by: Tim Blechmann <tim@klingt.org>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-04-06 08:20:50 +02:00
Tim Blechmann
210cb5f447 hdspconf: more string constant fixes
Signed-off-by: Tim Blechmann <tim@klingt.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-28 12:25:22 +02:00
Tim Blechmann
3ee59653ec hdspconf: use foreground color instead of black
if the background color of the color scheme is black, black text is hard
to read. using the foreground color fixes this problem

Signed-off-by: Tim Blechmann <tim@klingt.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-28 12:25:12 +02:00
Tim Blechmann
e6c8241752 hdspconf: fix some string constant conversions
Signed-off-by: Tim Blechmann <tim@klingt.org>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-28 12:24:51 +02:00
Adrian Knoth
8f446f99e5 hdspmixer: Update NEWS file.
Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-22 13:03:04 +01:00
Adrian Knoth
287bc091e9 hdspmixer: Save and restore level meter settings
Each preset can have a different level meter setting (FS samples for
OVR, release rate, minimum level and so on).

These settings were not saved/restore to/from the on-disk file. This
patch adds the missing functionality.

Unfortunately, the current on-disk format is a 1:1 binary dump from
memory without any header information. In other words, this commit will
break backward compatibility with older hdspmixers, that is, new preset
files cannot be read by older versions of hdspmixer. However, we can
still read the old mix files and save them in the new format.

I hence bumped the version, so users know to re-create their files after
upgrading to 1.11.

Bug discovered by Raphaël Doursenaud from ematech.fr.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-22 13:01:45 +01:00
Adrian Knoth
6cc4d395f4 hdspmixer: Use constant instead of hardcoded number of cards.
Again, use MAX_CARDS instead of "3", just in case MAX_CARDS should
change some day.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-22 13:01:32 +01:00
Adrian Knoth
015579556d hdspmixer: Improve pixmaps
- Added tick marks at 4dB intervals
- Small fixes and cleanup to buttons
- Better ALSA branding

All pixmaps provided by Reuben Martin.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-22 13:01:19 +01:00
Adrian Knoth
5e77f279ba hdspmixer: Fix toggle of master mute and solo buttons
The sensitive area for master mute and solo buttons was slightly off.
Discovered and fixed by Reuben Martin. Thanks for the patch.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-22 13:01:05 +01:00
Adrian Knoth
3771b825c8 hdspmixer: New pixmaps
Reuben Martin has provided me with an updated pixmap set to replace
RME's 1998 style no longer in use by the corresponding Win32 tools.

The Linux pixmaps are based on ardour2. Likewise hdspmixer, ardour2 is
GPLv2.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
2011-03-14 10:32:49 +01:00
Adrian Knoth
7416c3a83c hdspmixer: Show cardname in window title
When running with more than one card, it isn't obvious which card is
shown.

Store the ALSA cardname in the corresponding class and show it in the
window title upon switching cards.

Also, don't show "(null)" but "(unsaved)" in case the user hasn't
selected a preset file.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-08 13:04:56 +01:00
Adrian Knoth
1669acbe34 hdspmixer: [cosmetics] Break code into logic blocks
Convert the if-then-else-if chain into standalone if-then blocks to
improve readability. A switch-case statement would also do the trick,
but it's less readable.

No (intended) semantic change.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-08 13:04:36 +01:00
Adrian Knoth
27f5bbfd9e hdspmixer: Fix code indentation
Only cosmetics, no changed semantics. Indent the whole function to get
rid of a mixture of tabs and spaces.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-08 13:04:29 +01:00
Adrian Knoth
24832bf340 hdspmixer: Provide headphones out on Multiface/Digiface
Both, Multiface and Digiface feature a separate headphone submix, so
reflect this additional pair of channels in the corresponding maps.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-08 13:04:19 +01:00
Adrian Knoth
455a06756f hdspmixer: Introduce output channel count for all cards.
Some cards (like multiface) have more physical output ports than
playback ports, mostly because of additional headphones out.

For those cards, the old abstraction model of channels_input and
channels_output doesn't fit, so let's introduce channels_output.

Of course, channels_output is always 2*max_dest at the given speed_mode
(SS/DS/QS), so one could extend this idea, store all destination
settings in channels_output[3] (one for each speed mode) and rip off the
massive code duplication for setting maxdest or max_dest respectively.

Note that dest_map_whatever_speed_mode's array size indirectly defines
the right value for channels_output (read: even more unwanted
redundancy)

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-08 13:04:12 +01:00
Adrian Knoth
53e4a1a44e hdspmixer: Adjust playback channel count on Multiface.
The multiface has 18/14 (SS/DS) playback channels, matching the native
18/14 I/O ports. Headphones don't count (only for #destinations).

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-08 13:04:02 +01:00
Adrian Knoth
2b10cb8be8 hdspmixer: Fix preset activation segfault on AES(32)
When selecting preset 6 or 7 on AES(32), hdspmixer has caused a segfault
due to indirect out of bound access on the destination label array.

The amount of destinations is the number of physical stereo
pairs, so it's usually half the channel count, in some cases one more if
there are additional headphone jacks.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-08 13:03:43 +01:00
Adrian Knoth
92e0a21b89 hdspmixer: Replace hardcoded 3 by MAX_CARDS
We have a define for the number of cards. Use it.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-08 13:03:26 +01:00
Adrian Knoth
863c47cebe hdspmixer: Fix labels on H9652
The H9652 uses the same layout as the Digiface, except Digiface features
an additional headphones out. That's why the channel mappings are the
same, but Digiface has mexdest=14 while H9652 has maxdest=13 (12 ADAT
pairs, another pair for S/PDIF and headphone-L/R on Digiface)

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-01 13:48:13 +01:00
Adrian Knoth
05d6bc9728 hdspmixer: Lower nesting depth in label assignment
This fix is mostly cosmetic, the long if-then-else-if-chain was rather
confusing. To improve code readability, use simple if-then statements
and leave the function as soon as a match is found.

Clear code would probably use a two-dimensional map, but it seems rather
overengineered.

Last but not least, the non-matching case was augmented by assigning a
generic "1", "2", "3" .. channel naming schema to prevent hdspmixer from
crashing.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-01 13:47:21 +01:00
Adrian Knoth
042363a429 hdspmixer: Make static destination maps extern
To prevent multiple inclusion, make the destmaps global and only
reference them via extern.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-03-01 13:46:50 +01:00
Adrian Knoth
e728f0d073 hdspmixer: Don't use hardcoded number of cards.
We have introduced MAX_CARDS before to make the code more safe and
extendable, so it's just sane to use it all over the place.

Signed-off-by: Adrian Knoth <adi@drcomp.erfurt.thur.de>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2011-02-28 15:55:23 +01:00