diff options
| -rw-r--r-- | include/pcm.h | 14 | ||||
| -rw-r--r-- | include/sound/asound.h | 16 | ||||
| -rw-r--r-- | test/chmap.c | 11 |
3 files changed, 20 insertions, 21 deletions
diff --git a/include/pcm.h b/include/pcm.h index 42bc4e3f..22194fcd 100644 --- a/include/pcm.h +++ b/include/pcm.h @@ -486,18 +486,18 @@ enum snd_pcm_chmap_type { enum snd_pcm_chmap_position { SND_CHMAP_UNKNOWN = 0, /** unspecified */ SND_CHMAP_FL, /** front left */ - SND_CHMAP_FC, /** front center */ SND_CHMAP_FR, /** front right */ - SND_CHMAP_FLC, /** front left center */ - SND_CHMAP_FRC, /* front right center */ SND_CHMAP_RL, /** rear left */ - SND_CHMAP_RC, /** rear center */ SND_CHMAP_RR, /** rear right */ - SND_CHMAP_RLC, /** rear left center */ - SND_CHMAP_RRC, /** rear right center */ + SND_CHMAP_FC, /** front center */ + SND_CHMAP_LFE, /** LFE */ SND_CHMAP_SL, /** side left */ SND_CHMAP_SR, /** side right */ - SND_CHMAP_LFE, /** LFE */ + SND_CHMAP_RC, /** rear center */ + SND_CHMAP_FLC, /** front left center */ + SND_CHMAP_FRC, /** front right center */ + SND_CHMAP_RLC, /** rear left center */ + SND_CHMAP_RRC, /** rear right center */ SND_CHMAP_FLW, /** front left wide */ SND_CHMAP_FRW, /** front right wide */ SND_CHMAP_FLH, /** front left high */ diff --git a/include/sound/asound.h b/include/sound/asound.h index e635c99b..bb6db9d2 100644 --- a/include/sound/asound.h +++ b/include/sound/asound.h @@ -479,20 +479,22 @@ enum { /* channel positions */ enum { + /* this follows the alsa-lib mixer channel value + 1*/ SNDRV_CHMAP_UNKNOWN = 0, SNDRV_CHMAP_FL, /* front left */ - SNDRV_CHMAP_FC, /* front center */ SNDRV_CHMAP_FR, /* front right */ - SNDRV_CHMAP_FLC, /* front left center */ - SNDRV_CHMAP_FRC, /* front right center */ SNDRV_CHMAP_RL, /* rear left */ - SNDRV_CHMAP_RC, /* rear center */ SNDRV_CHMAP_RR, /* rear right */ - SNDRV_CHMAP_RLC, /* rear left center */ - SNDRV_CHMAP_RRC, /* rear right center */ + SNDRV_CHMAP_FC, /* front center */ + SNDRV_CHMAP_LFE, /* LFE */ SNDRV_CHMAP_SL, /* side left */ SNDRV_CHMAP_SR, /* side right */ - SNDRV_CHMAP_LFE, /* LFE */ + SNDRV_CHMAP_RC, /* rear center */ + /* new definitions */ + SNDRV_CHMAP_FLC, /* front left center */ + SNDRV_CHMAP_FRC, /* front right center */ + SNDRV_CHMAP_RLC, /* rear left center */ + SNDRV_CHMAP_RRC, /* rear right center */ SNDRV_CHMAP_FLW, /* front left wide */ SNDRV_CHMAP_FRW, /* front right wide */ SNDRV_CHMAP_FLH, /* front left high */ diff --git a/test/chmap.c b/test/chmap.c index d91297c2..ce665c4c 100644 --- a/test/chmap.c +++ b/test/chmap.c @@ -23,12 +23,9 @@ static void usage(void) static const char * const chname[] = { "Unknown", - "FL", "FC", "FR", - "FLC", "FRC", "RL", "RC", "RR", - "RLC", "RRC", "SL", "SR", "LFE", - "FLW", "FRW", "FLH", - "FCH", "FCH", "FRH", - "TC" + "FL", "FR", "RL", "RR", "FC", "LFE", "SL", "SR", "RC", + "FLC", "FRC", "RLC", "RRC", "FLW", "FRW", "FLH", + "FCH", "FCH", "FRH", "TC" }; #define ARRAY_SIZE(x) (sizeof(x) / sizeof(x[0])) @@ -56,7 +53,7 @@ static int to_channel(const char *name) for (i = 0; i < ARRAY_SIZE(chname); i++) if (!strcmp(chname[i], name)) return i; - return 0; + return SND_CHMAP_UNKNOWN; } static const char *chmap_type(int type) |