Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
M
mpd
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Registry
Registry
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Иван Мажукин
mpd
Commits
fa246e02
Commit
fa246e02
authored
Sep 08, 2008
by
Eric Wong
Committed by
Max Kellermann
Sep 08, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
alsa: capitalize "ALSA" consistently in messages
That's the name of this project.
parent
7bd98c08
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
8 additions
and
8 deletions
+8
-8
audioOutput_alsa.c
src/audioOutputs/audioOutput_alsa.c
+8
-8
No files found.
src/audioOutputs/audioOutput_alsa.c
View file @
fa246e02
...
...
@@ -110,7 +110,7 @@ static int alsa_testDefault(void)
snd_config_update_free_global
();
if
(
ret
)
{
WARNING
(
"Error opening default
alsa
device: %s
\n
"
,
WARNING
(
"Error opening default
ALSA
device: %s
\n
"
,
snd_strerror
(
-
ret
));
return
-
1
;
}
else
...
...
@@ -182,7 +182,7 @@ configure_hw:
err
=
snd_pcm_hw_params_set_access
(
ad
->
pcmHandle
,
hwparams
,
SND_PCM_ACCESS_MMAP_INTERLEAVED
);
if
(
err
<
0
)
{
ERROR
(
"Cannot set mmap'ed mode on
alsa
device
\"
%s
\"
: "
ERROR
(
"Cannot set mmap'ed mode on
ALSA
device
\"
%s
\"
: "
" %s
\n
"
,
ad
->
device
,
snd_strerror
(
-
err
));
ERROR
(
"Falling back to direct write mode
\n
"
);
ad
->
useMmap
=
0
;
...
...
@@ -297,7 +297,7 @@ configure_hw:
audioOutput
->
open
=
1
;
DEBUG
(
"
alsa
device
\"
%s
\"
will be playing %i bit, %i channel audio at "
DEBUG
(
"
ALSA
device
\"
%s
\"
will be playing %i bit, %i channel audio at "
"%i Hz
\n
"
,
ad
->
device
,
(
int
)
audioFormat
->
bits
,
channels
,
sampleRate
);
...
...
@@ -305,10 +305,10 @@ configure_hw:
error:
if
(
cmd
)
{
ERROR
(
"Error opening
alsa
device
\"
%s
\"
(%s): %s
\n
"
,
ERROR
(
"Error opening
ALSA
device
\"
%s
\"
(%s): %s
\n
"
,
ad
->
device
,
cmd
,
snd_strerror
(
-
err
));
}
else
{
ERROR
(
"Error opening
alsa
device
\"
%s
\"
: %s
\n
"
,
ad
->
device
,
ERROR
(
"Error opening
ALSA
device
\"
%s
\"
: %s
\n
"
,
ad
->
device
,
snd_strerror
(
-
err
));
}
fail:
...
...
@@ -322,9 +322,9 @@ fail:
static
int
alsa_errorRecovery
(
AlsaData
*
ad
,
int
err
)
{
if
(
err
==
-
EPIPE
)
{
DEBUG
(
"Underrun on
alsa
device
\"
%s
\"\n
"
,
ad
->
device
);
DEBUG
(
"Underrun on
ALSA
device
\"
%s
\"\n
"
,
ad
->
device
);
}
else
if
(
err
==
-
ESTRPIPE
)
{
DEBUG
(
"
alsa
device
\"
%s
\"
was suspended
\n
"
,
ad
->
device
);
DEBUG
(
"
ALSA
device
\"
%s
\"
was suspended
\n
"
,
ad
->
device
);
}
switch
(
snd_pcm_state
(
ad
->
pcmHandle
))
{
...
...
@@ -395,7 +395,7 @@ static int alsa_playAudio(struct audio_output *audioOutput,
if
(
ret
<
0
)
{
if
(
alsa_errorRecovery
(
ad
,
ret
)
<
0
)
{
ERROR
(
"closing
alsa
device
\"
%s
\"
due to write "
ERROR
(
"closing
ALSA
device
\"
%s
\"
due to write "
"error: %s
\n
"
,
ad
->
device
,
snd_strerror
(
-
errno
));
alsa_closeDevice
(
audioOutput
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment