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
a5aa5a02
Commit
a5aa5a02
authored
Apr 12, 2008
by
Max Kellermann
Committed by
Eric Wong
Apr 12, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
yet more unsigned integers
git-svn-id:
https://svn.musicpd.org/mpd/trunk@7287
09075e82-0dd4-0310-85a5-a0d7c8717e4f
parent
4e089133
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
9 additions
and
10 deletions
+9
-10
audioOutput_jack.c
src/audioOutputs/audioOutput_jack.c
+1
-1
mp3_plugin.c
src/inputPlugins/mp3_plugin.c
+4
-4
mp4_plugin.c
src/inputPlugins/mp4_plugin.c
+1
-1
pcm_utils.h
src/pcm_utils.h
+2
-2
tag.c
src/tag.c
+1
-2
No files found.
src/audioOutputs/audioOutput_jack.c
View file @
a5aa5a02
...
...
@@ -372,7 +372,7 @@ static int jack_playAudio(AudioOutput * audioOutput, char *buff, int size)
{
JackData
*
jd
=
audioOutput
->
data
;
size_t
space
;
int
i
;
unsigned
int
i
;
short
*
buffer
=
(
short
*
)
buff
;
jack_default_audio_sample_t
sample
;
size_t
samples
=
size
/
4
;
...
...
src/inputPlugins/mp3_plugin.c
View file @
a5aa5a02
...
...
@@ -285,7 +285,7 @@ static ReplayGainInfo *parseId3ReplayGainInfo(struct id3_tag *tag)
#endif
#ifdef HAVE_ID3TAG
static
void
mp3_parseId3Tag
(
mp3DecodeData
*
data
,
si
gned
long
tagsize
,
static
void
mp3_parseId3Tag
(
mp3DecodeData
*
data
,
si
ze_t
tagsize
,
MpdTag
**
mpdTag
,
ReplayGainInfo
**
replayGainInfo
)
{
struct
id3_tag
*
id3Tag
=
NULL
;
...
...
@@ -309,7 +309,7 @@ static void mp3_parseId3Tag(mp3DecodeData * data, signed long tagsize,
mad_stream_skip
(
&
(
data
->
stream
),
count
);
while
(
count
<
tagsize
)
{
in
t
len
;
size_
t
len
;
len
=
readFromInputStream
(
data
->
inStream
,
allocated
+
count
,
(
size_t
)
1
,
...
...
@@ -383,8 +383,8 @@ static int decodeNextFrameHeader(mp3DecodeData * data, MpdTag ** tag,
if
(
tagsize
>
0
)
{
if
(
tag
&&
!
(
*
tag
))
{
mp3_parseId3Tag
(
data
,
tagsize
,
tag
,
replayGainInfo
);
mp3_parseId3Tag
(
data
,
(
size_t
)
tagsize
,
tag
,
replayGainInfo
);
}
else
{
mad_stream_skip
(
&
(
data
->
stream
),
tagsize
);
...
...
src/inputPlugins/mp4_plugin.c
View file @
a5aa5a02
...
...
@@ -260,7 +260,7 @@ static int mp4_decode(OutputBuffer * cb, DecoderControl * dc,
dc
->
state
=
DECODE_STATE_DECODE
;
}
if
(
channels
*
(
dur
+
offset
)
>
frameInfo
.
samples
)
{
if
(
channels
*
(
unsigned
long
)(
dur
+
offset
)
>
frameInfo
.
samples
)
{
dur
=
frameInfo
.
samples
/
channels
;
offset
=
0
;
}
...
...
src/pcm_utils.h
View file @
a5aa5a02
...
...
@@ -35,8 +35,8 @@ typedef struct _ConvState {
size_t
dataInSize
;
size_t
dataOutSize
;
mpd_sint8
lastChannels
;
mpd_
s
int32
lastInSampleRate
;
mpd_
s
int32
lastOutSampleRate
;
mpd_
u
int32
lastInSampleRate
;
mpd_
u
int32
lastOutSampleRate
;
#endif
/* Strict C99 doesn't allow empty structs */
int
error
;
...
...
src/tag.c
View file @
a5aa5a02
...
...
@@ -176,8 +176,7 @@ static MpdTag *getID3Info(
id3_ucs4_t
const
*
ucs4
;
id3_utf8_t
*
utf8
;
union
id3_field
const
*
field
;
unsigned
int
nstrings
;
int
i
;
unsigned
int
nstrings
,
i
;
frame
=
id3_tag_findframe
(
tag
,
id
,
0
);
/* Check frame */
...
...
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