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
ca7fdaa9
Commit
ca7fdaa9
authored
Aug 11, 2006
by
Avuton Olrich
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Spelling & Grammar
git-svn-id:
https://svn.musicpd.org/mpd/trunk@4612
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
0cacc359
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
9 additions
and
9 deletions
+9
-9
audioOutput.c
src/audioOutput.c
+1
-1
audioOutput_osx.c
src/audioOutputs/audioOutput_osx.c
+2
-2
audioOutput_shout.c
src/audioOutputs/audioOutput_shout.c
+2
-2
conf.c
src/conf.c
+1
-1
player.c
src/player.c
+1
-1
tag.c
src/tag.c
+1
-1
volume.c
src/volume.c
+1
-1
No files found.
src/audioOutput.c
View file @
ca7fdaa9
...
@@ -59,7 +59,7 @@ void finishAudioOutputPlugins(void)
...
@@ -59,7 +59,7 @@ void finishAudioOutputPlugins(void)
bp = getBlockParam(param, name); \
bp = getBlockParam(param, name); \
if(force && bp == NULL) { \
if(force && bp == NULL) { \
ERROR("couldn't find parameter \"%s\" in audio output " \
ERROR("couldn't find parameter \"%s\" in audio output " \
"definition begining at %i\n", \
"definition begin
n
ing at %i\n", \
name, param->line); \
name, param->line); \
exit(EXIT_FAILURE); \
exit(EXIT_FAILURE); \
} \
} \
...
...
src/audioOutputs/audioOutput_osx.c
View file @
ca7fdaa9
...
@@ -245,7 +245,7 @@ static int osx_openDevice(AudioOutput * audioOutput)
...
@@ -245,7 +245,7 @@ static int osx_openDevice(AudioOutput * audioOutput)
if
(
AudioUnitInitialize
(
od
->
au
)
!=
0
)
{
if
(
AudioUnitInitialize
(
od
->
au
)
!=
0
)
{
CloseComponent
(
od
->
au
);
CloseComponent
(
od
->
au
);
ERROR
(
"Unable to initial
u
ze OS X audio unit
\n
"
);
ERROR
(
"Unable to initial
i
ze OS X audio unit
\n
"
);
return
-
1
;
return
-
1
;
}
}
...
@@ -257,7 +257,7 @@ static int osx_openDevice(AudioOutput * audioOutput)
...
@@ -257,7 +257,7 @@ static int osx_openDevice(AudioOutput * audioOutput)
&
callback
,
sizeof
(
callback
))
!=
0
)
{
&
callback
,
sizeof
(
callback
))
!=
0
)
{
AudioUnitUninitialize
(
od
->
au
);
AudioUnitUninitialize
(
od
->
au
);
CloseComponent
(
od
->
au
);
CloseComponent
(
od
->
au
);
ERROR
(
"unable to set callbak for OS X audio unit
\n
"
);
ERROR
(
"unable to set callba
c
k for OS X audio unit
\n
"
);
return
-
1
;
return
-
1
;
}
}
...
...
src/audioOutputs/audioOutput_shout.c
View file @
ca7fdaa9
...
@@ -423,7 +423,7 @@ static int initEncoder(ShoutData * sd)
...
@@ -423,7 +423,7 @@ static int initEncoder(ShoutData * sd)
sd
->
audioFormat
->
channels
,
sd
->
audioFormat
->
channels
,
sd
->
audioFormat
->
sampleRate
,
sd
->
audioFormat
->
sampleRate
,
sd
->
quality
*
0
.
1
))
{
sd
->
quality
*
0
.
1
))
{
ERROR
(
"problem seting up vorbis encoder for shout
\n
"
);
ERROR
(
"problem set
t
ing up vorbis encoder for shout
\n
"
);
vorbis_info_clear
(
&
(
sd
->
vi
));
vorbis_info_clear
(
&
(
sd
->
vi
));
return
-
1
;
return
-
1
;
}
}
...
@@ -432,7 +432,7 @@ static int initEncoder(ShoutData * sd)
...
@@ -432,7 +432,7 @@ static int initEncoder(ShoutData * sd)
sd
->
audioFormat
->
channels
,
sd
->
audioFormat
->
channels
,
sd
->
audioFormat
->
sampleRate
,
-
1
.
0
,
sd
->
audioFormat
->
sampleRate
,
-
1
.
0
,
sd
->
bitrate
*
1000
,
-
1
.
0
))
{
sd
->
bitrate
*
1000
,
-
1
.
0
))
{
ERROR
(
"problem seting up vorbis encoder for shout
\n
"
);
ERROR
(
"problem set
t
ing up vorbis encoder for shout
\n
"
);
vorbis_info_clear
(
&
(
sd
->
vi
));
vorbis_info_clear
(
&
(
sd
->
vi
));
return
-
1
;
return
-
1
;
}
}
...
...
src/conf.c
View file @
ca7fdaa9
...
@@ -233,7 +233,7 @@ static ConfigParam *readConfigBlock(FILE * fp, int *count, char *string)
...
@@ -233,7 +233,7 @@ static ConfigParam *readConfigBlock(FILE * fp, int *count, char *string)
0
==
strcmp
(
array
[
1
],
CONF_BLOCK_END
))
{
0
==
strcmp
(
array
[
1
],
CONF_BLOCK_END
))
{
ERROR
(
"improperly formatted config file at line %i:"
ERROR
(
"improperly formatted config file at line %i:"
" %s
\n
"
,
*
count
,
string
);
" %s
\n
"
,
*
count
,
string
);
ERROR
(
"in block begining at line %i
\n
"
,
ret
->
line
);
ERROR
(
"in block begin
n
ing at line %i
\n
"
,
ret
->
line
);
exit
(
EXIT_FAILURE
);
exit
(
EXIT_FAILURE
);
}
}
...
...
src/player.c
View file @
ca7fdaa9
...
@@ -307,7 +307,7 @@ char *getPlayerErrorStr(void)
...
@@ -307,7 +307,7 @@ char *getPlayerErrorStr(void)
switch
(
pc
->
error
)
{
switch
(
pc
->
error
)
{
case
PLAYER_ERROR_FILENOTFOUND
:
case
PLAYER_ERROR_FILENOTFOUND
:
snprintf
(
error
,
errorlen
,
snprintf
(
error
,
errorlen
,
"file
\"
%s
\"
does not exist or is inaccesible"
,
"file
\"
%s
\"
does not exist or is inacces
s
ible"
,
pc
->
erroredUrl
);
pc
->
erroredUrl
);
break
;
break
;
case
PLAYER_ERROR_FILE
:
case
PLAYER_ERROR_FILE
:
...
...
src/tag.c
View file @
ca7fdaa9
...
@@ -414,7 +414,7 @@ MpdTag *apeDup(char *file)
...
@@ -414,7 +414,7 @@ MpdTag *apeDup(char *file)
if
(
readLEuint32
(
footer
.
version
)
!=
2000
)
if
(
readLEuint32
(
footer
.
version
)
!=
2000
)
goto
fail
;
goto
fail
;
/* find begining of ape tag */
/* find begin
n
ing of ape tag */
tagLen
=
readLEuint32
(
footer
.
length
);
tagLen
=
readLEuint32
(
footer
.
length
);
if
(
tagLen
<
sizeof
(
footer
))
if
(
tagLen
<
sizeof
(
footer
))
goto
fail
;
goto
fail
;
...
...
src/volume.c
View file @
ca7fdaa9
...
@@ -233,7 +233,7 @@ static int prepAlsaMixer(char *card)
...
@@ -233,7 +233,7 @@ static int prepAlsaMixer(char *card)
if
((
err
=
snd_mixer_attach
(
volume_alsaMixerHandle
,
card
))
<
0
)
{
if
((
err
=
snd_mixer_attach
(
volume_alsaMixerHandle
,
card
))
<
0
)
{
closeAlsaMixer
();
closeAlsaMixer
();
WARNING
(
"problems
problems
attaching alsa mixer: %s
\n
"
,
WARNING
(
"problems attaching alsa mixer: %s
\n
"
,
snd_strerror
(
err
));
snd_strerror
(
err
));
return
-
1
;
return
-
1
;
}
}
...
...
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