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
05cbc476
Commit
05cbc476
authored
May 20, 2004
by
Warren Dukes
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
get rid of seekError in DecoderControl
git-svn-id:
https://svn.musicpd.org/mpd/trunk@1101
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
70d43973
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
4 additions
and
14 deletions
+4
-14
aac_decode.c
src/aac_decode.c
+1
-4
decode.c
src/decode.c
+3
-8
decode.h
src/decode.h
+0
-1
mp3_decode.c
src/mp3_decode.c
+0
-1
No files found.
src/aac_decode.c
View file @
05cbc476
...
...
@@ -364,10 +364,7 @@ int aac_decode(OutputBuffer * cb, DecoderControl * dc) {
sendDataToOutputBuffer
(
cb
,
dc
,
sampleBuffer
,
sampleBufferLen
,
time
,
bitRate
);
if
(
dc
->
seek
)
{
dc
->
seekError
=
1
;
dc
->
seek
=
0
;
}
if
(
dc
->
seek
)
dc
->
seek
=
0
;
else
if
(
dc
->
stop
)
{
eof
=
1
;
break
;
...
...
src/decode.c
View file @
05cbc476
...
...
@@ -179,15 +179,11 @@ int decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb,
pc
->
totalTime
-
0
.
1
:
pc
->
seekWhere
;
dc
->
seekWhere
=
0
>
dc
->
seekWhere
?
0
:
dc
->
seekWhere
;
dc
->
seekError
=
0
;
dc
->
seekChunk
=
-
1
;
dc
->
seek
=
1
;
/*pc->bitRate = 0;*/
/*while(*decode_pid>0 && dc->seek) my_usleep(1000);*/
/*if(!dc->seekError) {*/
ret
=
0
;
pc
->
elapsedTime
=
dc
->
seekWhere
;
/*}*/
pc
->
elapsedTime
=
dc
->
seekWhere
;
pc
->
beginTime
=
pc
->
elapsedTime
;
ret
=
0
;
}
}
pc
->
seek
=
0
;
...
...
@@ -228,7 +224,6 @@ int decodeSeek(PlayerControl * pc, DecoderControl * dc, OutputBuffer * cb,
if(pc->seek) { \
pc->totalPlayTime+= pc->elapsedTime-pc->beginTime; \
if(decodeSeek(pc,dc,cb,&decodeWaitedOn) == 0) { \
pc->beginTime = pc->elapsedTime; \
doCrossFade = 0; \
nextChunk = -1; \
bbp = 0; \
...
...
src/decode.h
View file @
05cbc476
...
...
@@ -52,7 +52,6 @@ typedef struct _DecoderControl {
volatile
mpd_uint16
error
;
volatile
mpd_sint8
seek
;
volatile
mpd_sint16
seekChunk
;
volatile
mpd_sint8
seekError
;
volatile
mpd_sint8
cycleLogFiles
;
volatile
double
seekWhere
;
char
file
[
MAXPATHLEN
+
1
];
...
...
src/mp3_decode.c
View file @
05cbc476
...
...
@@ -522,7 +522,6 @@ int mp3Read(mp3DecodeData * data, OutputBuffer * cb, DecoderControl * dc) {
data
->
currentFrame
=
i
;
data
->
muteFrame
=
0
;
}
else
dc
->
seekError
=
1
;
dc
->
seek
=
0
;
}
}
...
...
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