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
2b4a410b
Commit
2b4a410b
authored
Nov 08, 2008
by
Laszlo Ashin
Committed by
Max Kellermann
Nov 08, 2008
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
wavpack: put braces around one line code blocks
I think this makes the code more easily modifiable and prevents some annoying mistakes.
parent
d68df99e
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
27 additions
and
15 deletions
+27
-15
wavpack_plugin.c
src/decoder/wavpack_plugin.c
+27
-15
No files found.
src/decoder/wavpack_plugin.c
View file @
2b4a410b
...
@@ -60,8 +60,9 @@ format_samples_int(int bytes_per_sample, void *buffer, uint32_t samcnt)
...
@@ -60,8 +60,9 @@ format_samples_int(int bytes_per_sample, void *buffer, uint32_t samcnt)
switch
(
bytes_per_sample
)
{
switch
(
bytes_per_sample
)
{
case
1
:
case
1
:
while
(
samcnt
--
)
while
(
samcnt
--
)
{
*
dst
++
=
*
src
++
;
*
dst
++
=
*
src
++
;
}
break
;
break
;
case
2
:
case
2
:
while
(
samcnt
--
)
{
while
(
samcnt
--
)
{
...
@@ -95,7 +96,6 @@ format_samples_int(int bytes_per_sample, void *buffer, uint32_t samcnt)
...
@@ -95,7 +96,6 @@ format_samples_int(int bytes_per_sample, void *buffer, uint32_t samcnt)
#ifdef WORDS_BIGENDIAN
#ifdef WORDS_BIGENDIAN
*
dst
++
=
(
uchar
)(
temp
>>
24
);
*
dst
++
=
(
uchar
)(
temp
>>
24
);
*
dst
++
=
(
uchar
)(
temp
>>
16
);
*
dst
++
=
(
uchar
)(
temp
>>
16
);
#else
#else
*
dst
++
=
(
uchar
)(
temp
>>
16
);
*
dst
++
=
(
uchar
)(
temp
>>
16
);
*
dst
++
=
(
uchar
)(
temp
>>
24
);
*
dst
++
=
(
uchar
)(
temp
>>
24
);
...
@@ -142,13 +142,15 @@ wavpack_decode(struct decoder * decoder, WavpackContext *wpc, bool canseek,
...
@@ -142,13 +142,15 @@ wavpack_decode(struct decoder * decoder, WavpackContext *wpc, bool canseek,
audio_format
.
channels
=
WavpackGetReducedChannels
(
wpc
);
audio_format
.
channels
=
WavpackGetReducedChannels
(
wpc
);
audio_format
.
bits
=
WavpackGetBitsPerSample
(
wpc
);
audio_format
.
bits
=
WavpackGetBitsPerSample
(
wpc
);
if
(
audio_format
.
bits
>
16
)
if
(
audio_format
.
bits
>
16
)
{
audio_format
.
bits
=
16
;
audio_format
.
bits
=
16
;
}
if
((
WavpackGetMode
(
wpc
)
&
MODE_FLOAT
)
==
MODE_FLOAT
)
if
((
WavpackGetMode
(
wpc
)
&
MODE_FLOAT
)
==
MODE_FLOAT
)
{
format_samples
=
format_samples_float
;
format_samples
=
format_samples_float
;
else
}
else
{
format_samples
=
format_samples_int
;
format_samples
=
format_samples_int
;
}
/*
/*
if ((WavpackGetMode(wpc) & MODE_WVC) == MODE_WVC)
if ((WavpackGetMode(wpc) & MODE_WVC) == MODE_WVC)
ERROR("decoding WITH wvc!!!\n");
ERROR("decoding WITH wvc!!!\n");
...
@@ -159,8 +161,9 @@ wavpack_decode(struct decoder * decoder, WavpackContext *wpc, bool canseek,
...
@@ -159,8 +161,9 @@ wavpack_decode(struct decoder * decoder, WavpackContext *wpc, bool canseek,
bytes_per_sample
=
WavpackGetBytesPerSample
(
wpc
);
bytes_per_sample
=
WavpackGetBytesPerSample
(
wpc
);
outsamplesize
=
bytes_per_sample
;
outsamplesize
=
bytes_per_sample
;
if
(
outsamplesize
>
2
)
if
(
outsamplesize
>
2
)
{
outsamplesize
=
2
;
outsamplesize
=
2
;
}
outsamplesize
*=
audio_format
.
channels
;
outsamplesize
*=
audio_format
.
channels
;
samplesreq
=
sizeof
(
chunk
)
/
(
4
*
audio_format
.
channels
);
samplesreq
=
sizeof
(
chunk
)
/
(
4
*
audio_format
.
channels
);
...
@@ -180,15 +183,17 @@ wavpack_decode(struct decoder * decoder, WavpackContext *wpc, bool canseek,
...
@@ -180,15 +183,17 @@ wavpack_decode(struct decoder * decoder, WavpackContext *wpc, bool canseek,
if
(
WavpackSeekSample
(
wpc
,
where
))
{
if
(
WavpackSeekSample
(
wpc
,
where
))
{
position
=
where
;
position
=
where
;
decoder_command_finished
(
decoder
);
decoder_command_finished
(
decoder
);
}
else
}
else
{
decoder_seek_error
(
decoder
);
decoder_seek_error
(
decoder
);
}
}
else
{
}
else
{
decoder_seek_error
(
decoder
);
decoder_seek_error
(
decoder
);
}
}
}
}
if
(
decoder_get_command
(
decoder
)
==
DECODE_COMMAND_STOP
)
if
(
decoder_get_command
(
decoder
)
==
DECODE_COMMAND_STOP
)
{
break
;
break
;
}
samplesgot
=
WavpackUnpackSamples
(
wpc
,
samplesgot
=
WavpackUnpackSamples
(
wpc
,
(
int32_t
*
)
chunk
,
samplesreq
);
(
int32_t
*
)
chunk
,
samplesreq
);
...
@@ -267,8 +272,9 @@ wavpack_replaygain(WavpackContext *wpc)
...
@@ -267,8 +272,9 @@ wavpack_replaygain(WavpackContext *wpc)
}
}
if
(
found
)
if
(
found
)
{
return
replay_gain_info
;
return
replay_gain_info
;
}
freeReplayGainInfo
(
replay_gain_info
);
freeReplayGainInfo
(
replay_gain_info
);
...
@@ -359,9 +365,10 @@ wavpack_input_read_bytes(void *id, void *data, int32_t bcount)
...
@@ -359,9 +365,10 @@ wavpack_input_read_bytes(void *id, void *data, int32_t bcount)
while
(
bcount
>
0
)
{
while
(
bcount
>
0
)
{
size_t
nbytes
=
decoder_read
(
isp
->
decoder
,
isp
->
is
,
size_t
nbytes
=
decoder_read
(
isp
->
decoder
,
isp
->
is
,
buf
,
bcount
);
buf
,
bcount
);
if
(
nbytes
==
0
)
if
(
nbytes
==
0
)
{
/* EOF, error or a decoder command */
/* EOF, error or a decoder command */
break
;
break
;
}
i
+=
nbytes
;
i
+=
nbytes
;
bcount
-=
nbytes
;
bcount
-=
nbytes
;
...
@@ -443,8 +450,9 @@ wavpack_trydecode(struct input_stream *is)
...
@@ -443,8 +450,9 @@ wavpack_trydecode(struct input_stream *is)
wavpack_input_init
(
&
isp
,
NULL
,
is
);
wavpack_input_init
(
&
isp
,
NULL
,
is
);
wpc
=
WavpackOpenFileInputEx
(
&
mpd_is_reader
,
&
isp
,
NULL
,
error
,
wpc
=
WavpackOpenFileInputEx
(
&
mpd_is_reader
,
&
isp
,
NULL
,
error
,
OPEN_STREAMING
,
0
);
OPEN_STREAMING
,
0
);
if
(
wpc
==
NULL
)
if
(
wpc
==
NULL
)
{
return
false
;
return
false
;
}
WavpackCloseFile
(
wpc
);
WavpackCloseFile
(
wpc
);
...
@@ -467,15 +475,17 @@ wavpack_open_wvc(struct decoder *decoder, struct input_stream *is_wvc,
...
@@ -467,15 +475,17 @@ wavpack_open_wvc(struct decoder *decoder, struct input_stream *is_wvc,
* single files. utf8url is not absolute file path :/
* single files. utf8url is not absolute file path :/
*/
*/
utf8url
=
decoder_get_url
(
decoder
,
tmp
);
utf8url
=
decoder_get_url
(
decoder
,
tmp
);
if
(
utf8url
==
NULL
)
if
(
utf8url
==
NULL
)
{
return
false
;
return
false
;
}
wvc_url
=
g_strconcat
(
utf8url
,
"c"
,
NULL
);
wvc_url
=
g_strconcat
(
utf8url
,
"c"
,
NULL
);
ret
=
input_stream_open
(
is_wvc
,
wvc_url
);
ret
=
input_stream_open
(
is_wvc
,
wvc_url
);
g_free
(
wvc_url
);
g_free
(
wvc_url
);
if
(
!
ret
)
if
(
!
ret
)
{
return
false
;
return
false
;
}
/*
/*
* And we try to buffer in order to get know
* And we try to buffer in order to get know
...
@@ -524,8 +534,9 @@ wavpack_streamdecode(struct decoder * decoder, struct input_stream *is)
...
@@ -524,8 +534,9 @@ wavpack_streamdecode(struct decoder * decoder, struct input_stream *is)
wavpack_decode
(
decoder
,
wpc
,
canseek
,
NULL
);
wavpack_decode
(
decoder
,
wpc
,
canseek
,
NULL
);
WavpackCloseFile
(
wpc
);
WavpackCloseFile
(
wpc
);
if
(
open_flags
&
OPEN_WVC
)
if
(
open_flags
&
OPEN_WVC
)
{
input_stream_close
(
&
is_wvc
);
input_stream_close
(
&
is_wvc
);
}
return
true
;
return
true
;
}
}
...
@@ -553,8 +564,9 @@ wavpack_filedecode(struct decoder *decoder, const char *fname)
...
@@ -553,8 +564,9 @@ wavpack_filedecode(struct decoder *decoder, const char *fname)
wavpack_decode
(
decoder
,
wpc
,
true
,
replay_gain_info
);
wavpack_decode
(
decoder
,
wpc
,
true
,
replay_gain_info
);
if
(
replay_gain_info
)
if
(
replay_gain_info
)
{
freeReplayGainInfo
(
replay_gain_info
);
freeReplayGainInfo
(
replay_gain_info
);
}
WavpackCloseFile
(
wpc
);
WavpackCloseFile
(
wpc
);
...
...
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