Commit 34452432 authored by Mauro Carvalho Chehab's avatar Mauro Carvalho Chehab

[media] DocBook/audio.xml: synchronize attribute changes

Some attributes suffered some changes since DVBv1. Sync them with the
current API header files.
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 4cde378b
...@@ -21,10 +21,10 @@ the following values, depending on whether we are replaying from an internal (de ...@@ -21,10 +21,10 @@ the following values, depending on whether we are replaying from an internal (de
external (user write) source. external (user write) source.
</para> </para>
<programlisting> <programlisting>
typedef enum { typedef enum {
AUDIO_SOURCE_DEMUX, AUDIO_SOURCE_DEMUX,
AUDIO_SOURCE_MEMORY AUDIO_SOURCE_MEMORY
} audio_stream_source_t; } audio_stream_source_t;
</programlisting> </programlisting>
<para>AUDIO_SOURCE_DEMUX selects the demultiplexer (fed either by the frontend or the <para>AUDIO_SOURCE_DEMUX selects the demultiplexer (fed either by the frontend or the
DVR device) as the source of the video stream. If AUDIO_SOURCE_MEMORY DVR device) as the source of the video stream. If AUDIO_SOURCE_MEMORY
...@@ -39,11 +39,11 @@ call. ...@@ -39,11 +39,11 @@ call.
state of audio playback. state of audio playback.
</para> </para>
<programlisting> <programlisting>
typedef enum { typedef enum {
AUDIO_STOPPED, AUDIO_STOPPED,
AUDIO_PLAYING, AUDIO_PLAYING,
AUDIO_PAUSED AUDIO_PAUSED
} audio_play_state_t; } audio_play_state_t;
</programlisting> </programlisting>
</section> </section>
...@@ -53,11 +53,13 @@ state of audio playback. ...@@ -53,11 +53,13 @@ state of audio playback.
following values. following values.
</para> </para>
<programlisting> <programlisting>
typedef enum { typedef enum {
AUDIO_STEREO, AUDIO_STEREO,
AUDIO_MONO_LEFT, AUDIO_MONO_LEFT,
AUDIO_MONO_RIGHT, AUDIO_MONO_RIGHT,
} audio_channel_select_t; AUDIO_MONO,
AUDIO_STEREO_SWAPPED
} audio_channel_select_t;
</programlisting> </programlisting>
</section> </section>
...@@ -67,14 +69,15 @@ following values. ...@@ -67,14 +69,15 @@ following values.
states of the playback operation. states of the playback operation.
</para> </para>
<programlisting> <programlisting>
typedef struct audio_status { typedef struct audio_status {
boolean AV_sync_state; boolean AV_sync_state;
boolean mute_state; boolean mute_state;
audio_play_state_t play_state; audio_play_state_t play_state;
audio_stream_source_t stream_source; audio_stream_source_t stream_source;
audio_channel_select_t channel_select; audio_channel_select_t channel_select;
boolean bypass_mode; boolean bypass_mode;
} audio_status_t; audio_mixer_t mixer_state;
} audio_status_t;
</programlisting> </programlisting>
</section> </section>
...@@ -84,10 +87,10 @@ states of the playback operation. ...@@ -84,10 +87,10 @@ states of the playback operation.
volume. volume.
</para> </para>
<programlisting> <programlisting>
typedef struct audio_mixer { typedef struct audio_mixer {
unsigned int volume_left; unsigned int volume_left;
unsigned int volume_right; unsigned int volume_right;
} audio_mixer_t; } audio_mixer_t;
</programlisting> </programlisting>
</section> </section>
...@@ -114,12 +117,12 @@ bits set according to the hardwares capabilities. ...@@ -114,12 +117,12 @@ bits set according to the hardwares capabilities.
<para>The ioctl AUDIO_SET_KARAOKE uses the following format: <para>The ioctl AUDIO_SET_KARAOKE uses the following format:
</para> </para>
<programlisting> <programlisting>
typedef typedef
struct audio_karaoke{ struct audio_karaoke {
int vocal1; int vocal1;
int vocal2; int vocal2;
int melody; int melody;
} audio_karaoke_t; } audio_karaoke_t;
</programlisting> </programlisting>
<para>If Vocal1 or Vocal2 are non-zero, they get mixed into left and right t at 70% each. If both, <para>If Vocal1 or Vocal2 are non-zero, they get mixed into left and right t at 70% each. If both,
Vocal1 and Vocal2 are non-zero, Vocal1 gets mixed into the left channel and Vocal2 into the Vocal1 and Vocal2 are non-zero, Vocal1 gets mixed into the left channel and Vocal2 into the
......
...@@ -67,7 +67,7 @@ typedef struct audio_status { ...@@ -67,7 +67,7 @@ typedef struct audio_status {
typedef typedef
struct audio_karaoke{ /* if Vocal1 or Vocal2 are non-zero, they get mixed */ struct audio_karaoke { /* if Vocal1 or Vocal2 are non-zero, they get mixed */
int vocal1; /* into left and right t at 70% each */ int vocal1; /* into left and right t at 70% each */
int vocal2; /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/ int vocal2; /* if both, Vocal1 and Vocal2 are non-zero, Vocal1 gets*/
int melody; /* mixed into the left channel and */ int melody; /* mixed into the left channel and */
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment