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
dfc09a37
Commit
dfc09a37
authored
Nov 11, 2009
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
decoder/vorbis: removed the OggCallbackData typedef
Use the struct name instead.
parent
8588c216
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
6 deletions
+7
-6
vorbis_plugin.c
src/decoder/vorbis_plugin.c
+7
-6
No files found.
src/decoder/vorbis_plugin.c
View file @
dfc09a37
...
@@ -57,17 +57,17 @@
...
@@ -57,17 +57,17 @@
#define OGG_DECODE_USE_BIGENDIAN 0
#define OGG_DECODE_USE_BIGENDIAN 0
#endif
#endif
typedef
struct
_OggCallbackD
ata
{
struct
vorbis_decoder_d
ata
{
struct
decoder
*
decoder
;
struct
decoder
*
decoder
;
struct
input_stream
*
input_stream
;
struct
input_stream
*
input_stream
;
bool
seekable
;
bool
seekable
;
}
OggCallbackData
;
};
static
size_t
ogg_read_cb
(
void
*
ptr
,
size_t
size
,
size_t
nmemb
,
void
*
vdata
)
static
size_t
ogg_read_cb
(
void
*
ptr
,
size_t
size
,
size_t
nmemb
,
void
*
vdata
)
{
{
struct
vorbis_decoder_data
*
data
=
(
struct
vorbis_decoder_data
*
)
vdata
;
size_t
ret
;
size_t
ret
;
OggCallbackData
*
data
=
(
OggCallbackData
*
)
vdata
;
ret
=
decoder_read
(
data
->
decoder
,
data
->
input_stream
,
ptr
,
size
*
nmemb
);
ret
=
decoder_read
(
data
->
decoder
,
data
->
input_stream
,
ptr
,
size
*
nmemb
);
...
@@ -78,7 +78,7 @@ static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *vdata)
...
@@ -78,7 +78,7 @@ static size_t ogg_read_cb(void *ptr, size_t size, size_t nmemb, void *vdata)
static
int
ogg_seek_cb
(
void
*
vdata
,
ogg_int64_t
offset
,
int
whence
)
static
int
ogg_seek_cb
(
void
*
vdata
,
ogg_int64_t
offset
,
int
whence
)
{
{
const
OggCallbackData
*
data
=
(
const
OggCallbackData
*
)
vdata
;
struct
vorbis_decoder_data
*
data
=
(
struct
vorbis_decoder_data
*
)
vdata
;
return
data
->
seekable
&&
return
data
->
seekable
&&
decoder_get_command
(
data
->
decoder
)
!=
DECODE_COMMAND_STOP
&&
decoder_get_command
(
data
->
decoder
)
!=
DECODE_COMMAND_STOP
&&
...
@@ -94,7 +94,8 @@ static int ogg_close_cb(G_GNUC_UNUSED void *vdata)
...
@@ -94,7 +94,8 @@ static int ogg_close_cb(G_GNUC_UNUSED void *vdata)
static
long
ogg_tell_cb
(
void
*
vdata
)
static
long
ogg_tell_cb
(
void
*
vdata
)
{
{
const
OggCallbackData
*
data
=
(
const
OggCallbackData
*
)
vdata
;
const
struct
vorbis_decoder_data
*
data
=
(
const
struct
vorbis_decoder_data
*
)
vdata
;
return
(
long
)
data
->
input_stream
->
offset
;
return
(
long
)
data
->
input_stream
->
offset
;
}
}
...
@@ -244,7 +245,7 @@ vorbis_stream_decode(struct decoder *decoder,
...
@@ -244,7 +245,7 @@ vorbis_stream_decode(struct decoder *decoder,
{
{
OggVorbis_File
vf
;
OggVorbis_File
vf
;
ov_callbacks
callbacks
;
ov_callbacks
callbacks
;
OggCallbackD
ata
data
;
struct
vorbis_decoder_d
ata
data
;
struct
audio_format
audio_format
;
struct
audio_format
audio_format
;
int
current_section
;
int
current_section
;
int
prev_section
=
-
1
;
int
prev_section
=
-
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