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
649a037e
Commit
649a037e
authored
Jul 19, 2006
by
J. Alexander Treuman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Use ERROR only once for our ogg vorbis errors, so we don't get a timestamp mid line
git-svn-id:
https://svn.musicpd.org/mpd/trunk@4402
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
9f6364af
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
9 additions
and
7 deletions
+9
-7
oggvorbis_plugin.c
src/inputPlugins/oggvorbis_plugin.c
+9
-7
No files found.
src/inputPlugins/oggvorbis_plugin.c
View file @
649a037e
...
...
@@ -240,6 +240,7 @@ static int oggvorbis_decode(OutputBuffer * cb, DecoderControl * dc,
long
test
;
ReplayGainInfo
*
replayGainInfo
=
NULL
;
char
**
comments
;
char
*
errorStr
;
data
.
inStream
=
inStream
;
data
.
dc
=
dc
;
...
...
@@ -252,27 +253,28 @@ static int oggvorbis_decode(OutputBuffer * cb, DecoderControl * dc,
if
((
ret
=
ov_open_callbacks
(
&
data
,
&
vf
,
NULL
,
0
,
callbacks
))
<
0
)
{
closeInputStream
(
inStream
);
if
(
!
dc
->
stop
)
{
ERROR
(
"Error decoding Ogg Vorbis stream: "
);
switch
(
ret
)
{
case
OV_EREAD
:
ERROR
(
"read error
\n
"
)
;
errorStr
=
"read error"
;
break
;
case
OV_ENOTVORBIS
:
ERROR
(
"not vorbis stream
\n
"
)
;
errorStr
=
"not vorbis stream"
;
break
;
case
OV_EVERSION
:
ERROR
(
"vorbis version mismatch
\n
"
)
;
errorStr
=
"vorbis version mismatch"
;
break
;
case
OV_EBADHEADER
:
ERROR
(
"invalid vorbis header
\n
"
)
;
errorStr
=
"invalid vorbis header"
;
break
;
case
OV_EFAULT
:
ERROR
(
"internal logic error
\n
"
)
;
errorStr
=
"internal logic error"
;
break
;
default:
ERROR
(
"unknown error
\n
"
)
;
errorStr
=
"unknown error"
;
break
;
}
ERROR
(
"Error decoding Ogg Vorbis stream: %s
\n
"
,
errorStr
);
return
-
1
;
}
else
{
...
...
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