Commit 581abbaa authored by Takashi Iwai's avatar Takashi Iwai
Browse files

Merge branch 'for-next' into for-linus

parents 84add303 639db596
Loading
Loading
Loading
Loading
+8 −18
Original line number Original line Diff line number Diff line
@@ -655,17 +655,6 @@ development branches in general while the development for the current
and next kernels are found in for-linus and for-next branches,
and next kernels are found in for-linus and for-next branches,
respectively.
respectively.


If you are using the latest Linus tree, it'd be better to pull the
above GIT tree onto it.  If you are using the older kernels, an easy
way to try the latest ALSA code is to build from the snapshot
tarball.  There are daily tarballs and the latest snapshot tarball.
All can be built just like normal alsa-driver release packages, that
is, installed via the usual spells: configure, make and make
install(-modules).  See INSTALL in the package.  The snapshot tarballs
are found at:

- ftp://ftp.suse.com/pub/people/tiwai/snapshot/



Sending a Bug Report
Sending a Bug Report
~~~~~~~~~~~~~~~~~~~~
~~~~~~~~~~~~~~~~~~~~
@@ -699,7 +688,12 @@ problems.
alsa-info
alsa-info
~~~~~~~~~
~~~~~~~~~
The script `alsa-info.sh` is a very useful tool to gather the audio
The script `alsa-info.sh` is a very useful tool to gather the audio
device information.  You can fetch the latest version from:
device information.  It's included in alsa-utils package.  The latest
version can be found on git repository:

- git://git.alsa-project.org/alsa-utils.git

The script can be fetched directly from the following URL, too:


- http://www.alsa-project.org/alsa-info.sh
- http://www.alsa-project.org/alsa-info.sh


@@ -836,15 +830,11 @@ can get a proc-file dump at the current state, get a list of control
(mixer) elements, set/get the control element value, simulate the PCM
(mixer) elements, set/get the control element value, simulate the PCM
operation, the jack plugging simulation, etc.
operation, the jack plugging simulation, etc.


The package is found in:
The program is found in the git repository below:

- ftp://ftp.suse.com/pub/people/tiwai/misc/

A git repository is available:


- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/hda-emu.git
- git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/hda-emu.git


See README file in the tarball for more details about hda-emu
See README file in the repository for more details about hda-emu
program.
program.




+2 −2
Original line number Original line Diff line number Diff line
@@ -149,7 +149,7 @@ Gapless Playback
================
================
When playing thru an album, the decoders have the ability to skip the encoder
When playing thru an album, the decoders have the ability to skip the encoder
delay and padding and directly move from one track content to another. The end
delay and padding and directly move from one track content to another. The end
user can perceive this as gapless playback as we dont have silence while
user can perceive this as gapless playback as we don't have silence while
switching from one track to another
switching from one track to another


Also, there might be low-intensity noises due to encoding. Perfect gapless is
Also, there might be low-intensity noises due to encoding. Perfect gapless is
@@ -184,7 +184,7 @@ Sequence flow for gapless would be:
- Fill data of the first track
- Fill data of the first track
- Trigger start
- Trigger start
- User-space finished sending all,
- User-space finished sending all,
- Indicaite next track data by sending set_next_track
- Indicate next track data by sending set_next_track
- Set metadata of the next track
- Set metadata of the next track
- then call partial_drain to flush most of buffer in DSP
- then call partial_drain to flush most of buffer in DSP
- Fill data of the next track
- Fill data of the next track
+1 −1
Original line number Original line Diff line number Diff line
@@ -132,7 +132,7 @@ SOC_DAPM_SINGLE("HiFi Playback Switch", WM8731_APANA, 4, 1, 0),
SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls,
SND_SOC_DAPM_MIXER("Output Mixer", WM8731_PWR, 4, 1, wm8731_output_mixer_controls,
	ARRAY_SIZE(wm8731_output_mixer_controls)),
	ARRAY_SIZE(wm8731_output_mixer_controls)),


If you dont want the mixer elements prefixed with the name of the mixer widget,
If you don't want the mixer elements prefixed with the name of the mixer widget,
you can use SND_SOC_DAPM_MIXER_NAMED_CTL instead. the parameters are the same
you can use SND_SOC_DAPM_MIXER_NAMED_CTL instead. the parameters are the same
as for SND_SOC_DAPM_MIXER.
as for SND_SOC_DAPM_MIXER.


+1 −1
Original line number Original line Diff line number Diff line
@@ -63,7 +63,7 @@ multiple re-usable component drivers :-
    and any audio DSP drivers for that platform.
    and any audio DSP drivers for that platform.


  * Machine class driver: The machine driver class acts as the glue that
  * Machine class driver: The machine driver class acts as the glue that
    decribes and binds the other component drivers together to form an ALSA
    describes and binds the other component drivers together to form an ALSA
    "sound card device". It handles any machine specific controls and
    "sound card device". It handles any machine specific controls and
    machine level audio events (e.g. turning on an amp at start of playback).
    machine level audio events (e.g. turning on an amp at start of playback).


+1 −1
Original line number Original line Diff line number Diff line
@@ -129,7 +129,7 @@ will be required to issue multiple queries and perform an
interpolation of the results
interpolation of the results


In some hardware-specific configuration, the system timestamp is
In some hardware-specific configuration, the system timestamp is
latched by a low-level audio subsytem, and the information provided
latched by a low-level audio subsystem, and the information provided
back to the driver. Due to potential delays in the communication with
back to the driver. Due to potential delays in the communication with
the hardware, there is a risk of misalignment with the avail and delay
the hardware, there is a risk of misalignment with the avail and delay
information. To make sure applications are not confused, a
information. To make sure applications are not confused, a
Loading