Commit graph

175 commits

Author SHA1 Message Date
Takashi Iwai
b8f567461e alsamixer - Fix uninitialized variable warning
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-05-27 14:16:30 +02:00
Clemens Ladisch
5b6b5fd14b alsamixer: show channel names for multichannel controls
For multichannel mixer controls, add the channel name to each screen
control.

Also make some other small changes.

Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
2009-05-25 10:26:22 +02:00
Simon Hengel
8e0eb860ef ALSA: Added vi-like key bindings to alsamixer.
* Added 'j' as an alias for KEY_DOWN
* Added 'k' as an alias for KEY_UP

Signed-off-by: Simon Hengel <simon.hengel@gmx.net>
Signed-off-by: Takashi Iwai <tiwai@suse.de>
2009-04-20 14:53:38 +02:00
Diego E. 'Flameeyes' Pettenò
6232f1c96c Make some static tables and strings constants.
By doing this we move them from the .data section to .rodata setion,
or from .data.rel to .data.rel.ro.

The .rodata section is mapped directly from the on-disk file, which is
always a save, while .data.rel.ro is mapped directly when using
prelink, which is a save in a lot of cases.

Signed-off-by: Diego E. 'Flameeyes' Pettenò <flameeyes@gmail.com>
2008-11-21 13:10:02 +01:00
Takashi Iwai
8e3e09dd0b Add check of ncurses*-config
The recent ncurses package provides ncurses*-config program to give the
proper cflags and libs.  Let's use them if available.

Right now, the ncurses version (5) is hard-coded.  It should be better
to be variable as well, but it'd be messy.  Hope the ncurses version won't
change rapidly.
2008-04-16 14:39:41 +02:00
Clemens Ladisch
fb1c2d53a1 alsamixer: add 8-channel support
Add support for playback volume controls with 8 channels.
This allows controlling the side channels on 7.1 devices.
2008-01-07 12:28:43 +01:00
Jaroslav Kysela
48de580a7b Changed Jaroslav Kysela's e-mail from perex@suse.cz to perex@perex.cz 2007-10-15 10:25:17 +02:00
Takashi Iwai
cbb2d555df alsamixer - Handle capture enums separately
The capture enum controls should appear only in capture and all views.
This is a fix for Input Source enum controls.
2007-08-29 14:49:55 +02:00
Jaroslav Kysela
8d0fb15b2b amixer/alsamixer - updated go scripts for debugging 2007-07-11 10:12:24 +02:00
Takashi Iwai
53eb911fb7 alsamixer - Fix duplicated appearance in All view mode
Fixed the duplicated appearances of common volumes / switches
in ALL view mode.
2007-05-18 16:58:02 +02:00
Jaroslav Kysela
a08925f7a8 alsamixer: cosmetic fix 2006-10-04 09:34:02 +02:00
Takashi Iwai
cb9cb72466 Show the mute dB state correctly
Show the mute dB state correctly as 'mute' in the status line.
2006-08-25 12:39:34 +02:00
Jaroslav Kysela
e45ba7e644 amixer - show dB values for simple mixer interface (which is default) 2006-07-27 11:02:00 +02:00
Takashi Iwai
9fb30e388f Fix compile warnings
Fix trivial compile warnings.
2005-12-16 18:44:14 +00:00
James Courtier-Dutton
bd7a1e9847 Implement dB gain level display.
DONE: If alsa-lib and alsa-driver support it,
      alsamixer now displays dB gain levels for all mixer controls.
TODO: Implement alsa-lib and alsa-driver parts.
2005-09-10 13:56:57 +00:00
Takashi Iwai
0c4dfcaa97 Use strsignal()
Use strsignal() instead of sys_siglist[] (bug#1400).
2005-09-07 13:42:18 +00:00
Takashi Iwai
87ffccedfd Fix / clean up man pages
Fix / clean up man pages (bug#1386)
2005-09-02 17:36:40 +00:00
Takashi Iwai
39ff48b437 Output help messages to stdout
Output help messages and lists to stdout instead of stderr.
2005-06-23 10:39:16 +00:00
Jaroslav Kysela
fefe0aafaf initial debug script 2005-06-16 11:53:49 +00:00
Jaroslav Kysela
dd97818e6e Added support for abstraction selection
- (basic abst might be the default someday)
2005-06-16 11:53:20 +00:00
Takashi Iwai
74dca8fd02 Fix a wrong display in the last patch
Fixed a wrong item display in the last patch.
2005-06-15 12:53:30 +00:00
Takashi Iwai
11f789c4f9 Fix unexpected abort of alsamixer
Fixed unexpected abort of alsamixer when no playback or capture elements
are available.  Also fixed the wrong use of temporary array in
displaying item name.
2005-06-15 12:49:07 +00:00
Takashi Iwai
7b0c847f1a Fix typos in man pages
Fix typos in man pages (bug #1024)
2005-06-08 13:55:54 +00:00
Takashi Iwai
ff1354844a Fix crash with enum controls
Fix crash in display enum controls.
2005-05-30 16:37:52 +00:00
James Courtier-Dutton
ae524665a9 Comment out a section that causes an assert in alsamixer, until this section of code works. 2005-05-28 16:06:14 +00:00
Takashi Iwai
34e3b1c783 Fix segfault with no-capture devices
Fix segfault on the device without capture controls when the view
is changed to capture mode (bug #1080).
2005-05-23 16:48:17 +00:00
James Courtier-Dutton
f8d4923fa7 Improve display of long text for enums. 2005-05-22 14:16:38 +00:00
Takashi Iwai
53adb97f2e Fix typo
Fixed a typo.
2005-03-30 16:11:11 +00:00
Takashi Iwai
e188eaf097 Show other view names
alsamixer shows all view names in the View: line so that user
can understand what it means.  The currently used view is
shown with brackets and emphasized.
2005-01-31 13:46:05 +00:00
Takashi Iwai
2b83c39265 Fix compile warnings
Fixed compile warnings due to unused variables.
2005-01-13 15:42:25 +00:00
Takashi Iwai
681201610d Support quick volume change
Patch provided by nijel, ALSA BTS #785:

Attached patch adds support for quickly changing volume using 0-9 keys
in simmilar way as aumix does.
2005-01-12 11:08:53 +00:00
Takashi Iwai
c074e5e93d Remove number key assignment
Don't use number keys for alternatives to F1-F5.
The Tab key can be used to toggle view modes, instead.
2005-01-12 11:02:27 +00:00
Clemens Ladisch
f72966589c fix crashes when selecting an empty view
alsamixer would crash when a view without controls was selected
2005-01-10 08:25:27 +00:00
Takashi Iwai
bc70fd0429 Usability improvement
Improved the usability of alsamixer:

- the mute/unmute appears in a separate box below the volume bar
  more obviously
- the capture switch appears below the volume bar, too
- the controls without volume doesn't show volume bars
- fixed bugs with all view mode
- fixed the calculation of volume bar size
- show left/right scrollable status
- code clean up
2005-01-03 12:00:08 +00:00
Takashi Iwai
87584238c2 More descriptions about mixer views and view modes
More descriptions about mixer view and view modes are added.
Corrected some typos.
2004-12-20 13:18:23 +00:00
Takashi Iwai
0b9e7577a3 Add -V option
Add -V option to specify the default view mode.
2004-12-20 13:17:47 +00:00
Takashi Iwai
30b608001f Reinitialize the size calculation at view change
The volume bar and space sizes are recalculated at each time when
the view mode is changed.  This will fix the problem when the view
with fewer volumes is switched to the view with more volumes.
2004-12-15 15:15:56 +00:00
Takashi Iwai
063ff485e2 Assign alternative keys for function keys
Assign number 1-5 keys as alternative keys for the function keys.
Some terminal programs like gnome-terminal doesn't like that apps
use function keys.
2004-12-03 13:34:39 +00:00
Takashi Iwai
7b0c738323 Change the view toggle behavior
Added [F5] key to toggle to "All channels".
Back from help/proc screen keeps the old channel view mode.
2004-12-02 17:27:41 +00:00
Nicolas FRANCOIS
ca5f8cbcfe Fix hyphens in man pages
This patch converts hyphens to minus signs in the man pages (for options,
emails, or command line examples).

This patch also closes one font modifier in iecset.1.
(s/\fIfalse\fI,/\fIfalse\fP,/)

Signed-off-by: Nicolas FRANCOIS <nicolas.francois@centraliens.net>
2004-10-08 16:15:34 +00:00
Takashi Iwai
24f54a9ea6 Assign '?' key for help
Assign '?' key for viewing the help as a synonym for 'h'.
2004-09-24 10:19:29 +00:00
Thomas Hood
9adc21fdb0 mention that commands given to alsamixer in upper case can also be entered in lower case
Signed-off-by: Thomas Hood <jdthood@yahoo.co.uk>
2004-09-24 10:00:42 +00:00
Thomas Hood
3b32c65f4e mention that '<' and '>' mute channels separately only if the hardware supports this
Signed-off-by: Thomas Hood <jdthood@yahoo.co.uk>
2004-09-24 09:36:52 +00:00
Thomas Hood
3e561660cf Correct the description of the function of the spacebar in alsamixer.1
Signed-off-by: Thomas Hood <jdthood@yahoo.co.uk>
2004-09-24 09:33:20 +00:00
Takashi Iwai
398713e136 James Courtier-Dutton <James@superbug.demon.co.uk>:
It causes alsamixer to display 2 different views of the mixer controls.
One view shows only the "Playback" controls, the other view shows only
the "Capture" controls, with a hidden mode (Press F1, then Enter) to
show the old method of all controls together.
2004-08-27 16:29:20 +00:00
Takashi Iwai
e4d3e84845 show single values for mono volumes. 2004-05-11 16:58:48 +00:00
Takashi Iwai
5eafc3ceda Alexander E. Patrakov:
With ncurses 5.4 or later, it is necessary to have the
correct LC_CTYPE setting before calling initscr(). Otherwise, the line
drawing characters and boxes are not visible on Linux console in UTF-8 mode,
and that makes alsamixer totally unusable on such terminal.
2004-02-16 16:44:06 +00:00
Takashi Iwai
d760ae6ee2 - fixed the color of subwindow title. 2004-02-04 19:23:44 +00:00
Takashi Iwai
6a915e89cd - show the version number of the package.
- use ACS_CKBOARD for the volume bars.
- fixed the path of /proc/asound/oss/devices.
- fixed the max length to display the item name.
2004-01-30 16:26:22 +00:00
Jaroslav Kysela
340b2ca3c9 Use float to avoid overflow 2003-08-11 09:42:16 +00:00
Takashi Iwai
4fdde2d0a6 show the mute status in the item line, too. 2003-07-22 16:38:25 +00:00
Jaroslav Kysela
ee36a832c1 Eliot Blennerhassett <bigblen@icqmail.com>: fixed negative ranges 2003-05-28 09:04:52 +00:00
Jaroslav Kysela
04020b86d1 Volume can be lower than zero, too 2003-05-28 07:25:26 +00:00
Jaroslav Kysela
53fb81e39b Here's a new batch of Debian patches, all from David B. Harris.
- add a "Press Escape to quit" string to alsamixer's title, some uses
  couldn't figure out how to exit the program (Debian Bug#178393).
- hide the cursor, which was missplaced and wasn't goodlooking anyway
  (Debian Bug#81169).
- remove trailing spaces from amixer's output (Debian Bug#177518).
- don't ignore second -l/-L flags in aplay (Debian Bug#177521).
2003-02-24 13:51:15 +00:00
Takashi Iwai
dfe70d8fbb - fixed compile warnings on gcc3.3. 2003-02-04 16:03:36 +00:00
Jaroslav Kysela
a439342676 Added POLLNVAL test 2002-12-02 20:18:29 +00:00
Takashi Iwai
870f73612f added a note about ESC key. 2002-11-29 17:32:52 +00:00
Takashi Iwai
ea772415f0 - removed __FUNCTION__; this will lead to many warnings with the
recent gcc...
- disabled the ESC prefix, which never works properly.
2002-11-29 17:32:34 +00:00
Jaroslav Kysela
ed80be2bcf Added detection for POLLERR 2002-11-25 18:16:24 +00:00
Takashi Iwai
ec9ecfc6fa added the handling of enum controls, using the recent addition to
alsa-lib.

now alsamixer can control the enumerated items, such like ice1712's
routing table.

not implemented: enum items with more than two channels.
2002-09-09 14:27:18 +00:00
Takashi Iwai
eab1645366 fixed handling of mono capture-switch on a stereo volume. 2002-03-22 17:34:20 +00:00
Takashi Iwai
7836d64d4d fixed typo. 2002-03-12 13:05:20 +00:00
Takashi Iwai
23d9d20b9c fixed handling of capture switch / volume. 2002-03-12 12:30:49 +00:00
Takashi Iwai
d81f16b7fa fixed / improved handling of capture volumes and switches.
now capture volumes are displayed and controllable as independent
bars from playback volumes.
e.g. on emu10k1 you'll see both "AC97" and "AC97 Capture".

there is still a bug in handling of "Capture Volume" control.
2002-02-27 18:07:11 +00:00
Jaroslav Kysela
e0eb9cc2ff Fixed window resize signal handling and poll handling 2001-12-07 20:13:28 +00:00
Jaroslav Kysela
acf749d325 Fixed view position 2001-12-07 19:53:51 +00:00
Takashi Iwai
cc3f05a4f1 Fixed for the current behavior, options. 2001-11-12 15:59:53 +00:00
Jaroslav Kysela
ca506c695b Added man pages to EXTRA_DIST 2001-11-06 07:51:48 +00:00
Jaroslav Kysela
6bd266995e Changed location of asoundlib.h from sys dir to alsa dir.
(it means that official location is '#include <alsa/asoundlib.h>')
2001-09-11 09:34:14 +00:00
Jaroslav Kysela
29faa915db Removed unused stuff for poll 2001-09-03 12:16:38 +00:00
Jaroslav Kysela
2ecee3b257 Fixed event handling 2001-07-23 13:08:44 +00:00
Takashi Iwai
99137b4df7 More fix to compile - removed snd_enum_incr and snd_int_to_enum macros. 2001-07-11 15:43:01 +00:00
Jaroslav Kysela
9f29bedbfd Cleanups and fixed arguments for *_open() - default. 2001-06-15 08:55:17 +00:00
Abramo Bagnara
009a7fee0a Completed parametric configuration and begun to use it 2001-05-22 09:19:44 +00:00
Jaroslav Kysela
3c7ef9765b Updated 2001-05-15 12:25:43 +00:00
Jaroslav Kysela
88272c9da3 Added -D option and improved -c option 2001-05-15 12:25:25 +00:00
Abramo Bagnara
abcd3a5fb4 More documentation. Tiny change for simple mixer element API (get_range) 2001-03-30 09:43:30 +00:00
Abramo Bagnara
f8ab746deb Added mode argument to open functions where it was missing. First part of CTL documentation 2001-03-26 12:45:50 +00:00
Takashi Iwai
a2c30bf682 close the roof of cabriolet (mixer elements w/o mute). 2001-03-01 17:40:17 +00:00
Abramo Bagnara
4200ac00a4 Updated version number 2001-02-25 22:37:18 +00:00
Abramo Bagnara
b43cf63605 Exit if no elems are available 2001-02-20 08:51:57 +00:00
Abramo Bagnara
536e7b66a5 Changed descriptors_count 2001-02-18 18:32:31 +00:00
Abramo Bagnara
7687662381 Added range specification to simple mixer. Fixes to alsamixer. Added mixer support to alsa-oss 2001-02-18 17:56:38 +00:00
Abramo Bagnara
1a2e4a6199 New simple mixer implementation 2001-02-15 23:05:42 +00:00
Jaroslav Kysela
246c930afb elem_count -> get_count 2001-02-14 13:08:49 +00:00
Jaroslav Kysela
c4212d7496 Recoded alsamixer utility to use the latest alsa-lib's API. 2001-02-14 12:22:47 +00:00
Abramo Bagnara
fbec0a5f8d Completed mixer API. Improved iterators. Renamed control values struct. Rewritten simple elements implementation 2001-02-11 15:45:44 +00:00
Jaroslav Kysela
3fadc219ee Temporary hack for compilation 2001-02-09 13:52:39 +00:00
Abramo Bagnara
012584247c Completed control and mixer API 2001-02-09 11:20:32 +00:00
Abramo Bagnara
7d75ba2c1b Better names for control API 2001-02-07 15:13:17 +00:00
Abramo Bagnara
0ef8943fb0 Control API encapsulation. Better names for kernel API. Simpler PCM hw_params API. Added missing const. 2001-02-06 23:48:29 +00:00
Abramo Bagnara
3df0171dc0 Encapsulated hwdep. Converted all enums to type safety 2001-02-05 15:44:45 +00:00
Jaroslav Kysela
3180b94099 Updates for the latest API (the next device changes). 2000-11-30 19:25:50 +00:00
Abramo Bagnara
86b50130e9 Changed default ctl name to open 2000-11-21 17:15:06 +00:00
Jaroslav Kysela
637b3f828c Merged pcmplug branch. 2000-09-24 09:57:50 +00:00
Jaroslav Kysela
ff3ef012ec Added Item: line 2000-09-18 09:47:46 +00:00
Abramo Bagnara
a6427e6044 Added abstraction layer to controls. Added client/server support to controls. Cleaned private_data use for PCMs. Cleaned aserver 2000-09-11 15:49:33 +00:00
Abramo Bagnara
44ee42e587 Better name for snd_card_get_index. Cleaned error messages 2000-08-25 14:36:58 +00:00
Jaroslav Kysela
eb4a1a6015 Removed debugging lines.. 2000-07-28 20:19:42 +00:00
Jaroslav Kysela
9d5b8f205d Changes reflecting the new control API and kernel mixer API removal. 2000-07-15 10:21:59 +00:00