* [PATCH alsa-driver asihpi] Fix StreamGetInfo
@ 2007-08-01 22:35 Eliot Blennerhassett
2007-08-02 12:19 ` Takashi Iwai
0 siblings, 1 reply; 2+ messages in thread
From: Eliot Blennerhassett @ 2007-08-01 22:35 UTC (permalink / raw)
To: alsa-devel
StreamGetInfo queried wrong stream type.
(minor) correct case of Playback and Capture control names
Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
---
diff -r a2861559e4ed pci/asihpi/asihpi.c
--- a/pci/asihpi/asihpi.c Fri Jul 27 08:54:15 2007 +1200
+++ b/pci/asihpi/asihpi.c Thu Aug 02 10:25:24 2007 +1200
@@ -228,11 +228,11 @@ static inline u16 HPI_StreamGetInfoEx(HP
u32 * pdwAuxiliaryData)
{
if (HPI_HandleObject(hStream) == HPI_OBJ_OSTREAM)
- return HPI_InStreamGetInfoEx(hS, hStream, pwState,
+ return HPI_OutStreamGetInfoEx(hS, hStream, pwState,
pdwBufferSize, pdwDataInBuffer,
pdwSampleCount, pdwAuxiliaryData);
else
- return HPI_OutStreamGetInfoEx(hS, hStream, pwState,
+ return HPI_InStreamGetInfoEx(hS, hStream, pwState,
pdwBufferSize, pdwDataInBuffer,
pdwSampleCount, pdwAuxiliaryData);
}
@@ -1201,7 +1201,7 @@ struct hpi_control {
#define ASIHPI_SOURCENODE_STRINGS \
{ \
TEXT("no source"), \
- TEXT("PCM playback"), \
+ TEXT("PCM Playback"), \
TEXT("Line in"), \
TEXT("Digital in"), \
TEXT("Tuner"), \
@@ -1230,7 +1230,7 @@ struct hpi_control {
#define ASIHPI_DESTNODE_STRINGS \
{ \
TEXT("no destination"), \
- TEXT("PCM capture"), \
+ TEXT("PCM Capture"), \
TEXT("Line out"), \
TEXT("Digital out"), \
TEXT("RF"), \
^ permalink raw reply [flat|nested] 2+ messages in thread* Re: [PATCH alsa-driver asihpi] Fix StreamGetInfo
2007-08-01 22:35 [PATCH alsa-driver asihpi] Fix StreamGetInfo Eliot Blennerhassett
@ 2007-08-02 12:19 ` Takashi Iwai
0 siblings, 0 replies; 2+ messages in thread
From: Takashi Iwai @ 2007-08-02 12:19 UTC (permalink / raw)
To: Eliot Blennerhassett; +Cc: alsa-devel
At Thu, 02 Aug 2007 10:35:23 +1200,
Eliot Blennerhassett wrote:
>
> StreamGetInfo queried wrong stream type.
> (minor) correct case of Playback and Capture control names
>
> Signed-off-by: Eliot Blennerhassett <eblennerhassett@audioscience.com>
Thanks, applied to HG tree.
(BTW, the patch was broken due to MUA. Please use attachments if it's
difficult to fix.)
Takashi
> ---
>
> diff -r a2861559e4ed pci/asihpi/asihpi.c
> --- a/pci/asihpi/asihpi.c Fri Jul 27 08:54:15 2007 +1200
> +++ b/pci/asihpi/asihpi.c Thu Aug 02 10:25:24 2007 +1200
> @@ -228,11 +228,11 @@ static inline u16 HPI_StreamGetInfoEx(HP
> u32 * pdwAuxiliaryData)
> {
> if (HPI_HandleObject(hStream) == HPI_OBJ_OSTREAM)
> - return HPI_InStreamGetInfoEx(hS, hStream, pwState,
> + return HPI_OutStreamGetInfoEx(hS, hStream, pwState,
> pdwBufferSize, pdwDataInBuffer,
> pdwSampleCount, pdwAuxiliaryData);
> else
> - return HPI_OutStreamGetInfoEx(hS, hStream, pwState,
> + return HPI_InStreamGetInfoEx(hS, hStream, pwState,
> pdwBufferSize, pdwDataInBuffer,
> pdwSampleCount, pdwAuxiliaryData);
> }
> @@ -1201,7 +1201,7 @@ struct hpi_control {
> #define ASIHPI_SOURCENODE_STRINGS \
> { \
> TEXT("no source"), \
> - TEXT("PCM playback"), \
> + TEXT("PCM Playback"), \
> TEXT("Line in"), \
> TEXT("Digital in"), \
> TEXT("Tuner"), \
> @@ -1230,7 +1230,7 @@ struct hpi_control {
> #define ASIHPI_DESTNODE_STRINGS \
> { \
> TEXT("no destination"), \
> - TEXT("PCM capture"), \
> + TEXT("PCM Capture"), \
> TEXT("Line out"), \
> TEXT("Digital out"), \
> TEXT("RF"), \
> _______________________________________________
> Alsa-devel mailing list
> Alsa-devel@alsa-project.org
> http://mailman.alsa-project.org/mailman/listinfo/alsa-devel
>
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2007-08-02 12:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2007-08-01 22:35 [PATCH alsa-driver asihpi] Fix StreamGetInfo Eliot Blennerhassett
2007-08-02 12:19 ` Takashi Iwai
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.