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
b97ffddf
Commit
b97ffddf
authored
May 04, 2016
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
encoder/vorbis: use CamelCase
parent
6407b7c5
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
17 additions
and
17 deletions
+17
-17
VorbisEncoderPlugin.cxx
src/encoder/plugins/VorbisEncoderPlugin.cxx
+17
-17
No files found.
src/encoder/plugins/VorbisEncoderPlugin.cxx
View file @
b97ffddf
...
...
@@ -31,7 +31,7 @@
#include <vorbis/vorbisenc.h>
struct
vorbis_e
ncoder
{
struct
VorbisE
ncoder
{
/** the base class */
Encoder
encoder
;
...
...
@@ -50,13 +50,13 @@ struct vorbis_encoder {
OggStream
stream
;
vorbis_e
ncoder
()
:
encoder
(
vorbis_encoder_plugin
)
{}
VorbisE
ncoder
()
:
encoder
(
vorbis_encoder_plugin
)
{}
};
static
constexpr
Domain
vorbis_encoder_domain
(
"vorbis_encoder"
);
static
bool
vorbis_encoder_configure
(
struct
vorbis_e
ncoder
&
encoder
,
vorbis_encoder_configure
(
VorbisE
ncoder
&
encoder
,
const
ConfigBlock
&
block
,
Error
&
error
)
{
const
char
*
value
=
block
.
GetBlockValue
(
"quality"
);
...
...
@@ -107,7 +107,7 @@ vorbis_encoder_configure(struct vorbis_encoder &encoder,
static
Encoder
*
vorbis_encoder_init
(
const
ConfigBlock
&
block
,
Error
&
error
)
{
vorbis_encoder
*
encoder
=
new
vorbis_e
ncoder
();
auto
*
encoder
=
new
VorbisE
ncoder
();
/* load configuration from "block" */
if
(
!
vorbis_encoder_configure
(
*
encoder
,
block
,
error
))
{
...
...
@@ -122,7 +122,7 @@ vorbis_encoder_init(const ConfigBlock &block, Error &error)
static
void
vorbis_encoder_finish
(
Encoder
*
_encoder
)
{
struct
vorbis_encoder
*
encoder
=
(
struct
vorbis_e
ncoder
*
)
_encoder
;
VorbisEncoder
*
encoder
=
(
VorbisE
ncoder
*
)
_encoder
;
/* the real libvorbis/libogg cleanup was already performed by
vorbis_encoder_close(), so no real work here */
...
...
@@ -130,7 +130,7 @@ vorbis_encoder_finish(Encoder *_encoder)
}
static
bool
vorbis_encoder_reinit
(
struct
vorbis_e
ncoder
&
encoder
,
Error
&
error
)
vorbis_encoder_reinit
(
VorbisE
ncoder
&
encoder
,
Error
&
error
)
{
vorbis_info_init
(
&
encoder
.
vi
);
...
...
@@ -168,7 +168,7 @@ vorbis_encoder_reinit(struct vorbis_encoder &encoder, Error &error)
}
static
void
vorbis_encoder_headerout
(
struct
vorbis_e
ncoder
&
encoder
,
vorbis_comment
&
vc
)
vorbis_encoder_headerout
(
VorbisE
ncoder
&
encoder
,
vorbis_comment
&
vc
)
{
ogg_packet
packet
,
comments
,
codebooks
;
...
...
@@ -181,7 +181,7 @@ vorbis_encoder_headerout(struct vorbis_encoder &encoder, vorbis_comment &vc)
}
static
void
vorbis_encoder_send_header
(
struct
vorbis_e
ncoder
&
encoder
)
vorbis_encoder_send_header
(
VorbisE
ncoder
&
encoder
)
{
vorbis_comment
vc
;
...
...
@@ -195,7 +195,7 @@ vorbis_encoder_open(Encoder *_encoder,
AudioFormat
&
audio_format
,
Error
&
error
)
{
struct
vorbis_encoder
&
encoder
=
*
(
struct
vorbis_e
ncoder
*
)
_encoder
;
auto
&
encoder
=
*
(
VorbisE
ncoder
*
)
_encoder
;
audio_format
.
format
=
SampleFormat
::
FLOAT
;
...
...
@@ -210,7 +210,7 @@ vorbis_encoder_open(Encoder *_encoder,
}
static
void
vorbis_encoder_clear
(
struct
vorbis_e
ncoder
&
encoder
)
vorbis_encoder_clear
(
VorbisE
ncoder
&
encoder
)
{
encoder
.
stream
.
Deinitialize
();
vorbis_block_clear
(
&
encoder
.
vb
);
...
...
@@ -221,13 +221,13 @@ vorbis_encoder_clear(struct vorbis_encoder &encoder)
static
void
vorbis_encoder_close
(
Encoder
*
_encoder
)
{
struct
vorbis_encoder
&
encoder
=
*
(
struct
vorbis_e
ncoder
*
)
_encoder
;
auto
&
encoder
=
*
(
VorbisE
ncoder
*
)
_encoder
;
vorbis_encoder_clear
(
encoder
);
}
static
void
vorbis_encoder_blockout
(
struct
vorbis_e
ncoder
&
encoder
)
vorbis_encoder_blockout
(
VorbisE
ncoder
&
encoder
)
{
while
(
vorbis_analysis_blockout
(
&
encoder
.
vd
,
&
encoder
.
vb
)
==
1
)
{
vorbis_analysis
(
&
encoder
.
vb
,
nullptr
);
...
...
@@ -242,7 +242,7 @@ vorbis_encoder_blockout(struct vorbis_encoder &encoder)
static
bool
vorbis_encoder_flush
(
Encoder
*
_encoder
,
gcc_unused
Error
&
error
)
{
struct
vorbis_encoder
&
encoder
=
*
(
struct
vorbis_e
ncoder
*
)
_encoder
;
auto
&
encoder
=
*
(
VorbisE
ncoder
*
)
_encoder
;
encoder
.
stream
.
Flush
();
return
true
;
...
...
@@ -251,7 +251,7 @@ vorbis_encoder_flush(Encoder *_encoder, gcc_unused Error &error)
static
bool
vorbis_encoder_pre_tag
(
Encoder
*
_encoder
,
gcc_unused
Error
&
error
)
{
struct
vorbis_encoder
&
encoder
=
*
(
struct
vorbis_e
ncoder
*
)
_encoder
;
auto
&
encoder
=
*
(
VorbisE
ncoder
*
)
_encoder
;
vorbis_analysis_wrote
(
&
encoder
.
vd
,
0
);
vorbis_encoder_blockout
(
encoder
);
...
...
@@ -281,7 +281,7 @@ static bool
vorbis_encoder_tag
(
Encoder
*
_encoder
,
const
Tag
&
tag
,
gcc_unused
Error
&
error
)
{
struct
vorbis_encoder
&
encoder
=
*
(
struct
vorbis_e
ncoder
*
)
_encoder
;
auto
&
encoder
=
*
(
VorbisE
ncoder
*
)
_encoder
;
vorbis_comment
comment
;
/* write the vorbis_comment object */
...
...
@@ -315,7 +315,7 @@ vorbis_encoder_write(Encoder *_encoder,
const
void
*
data
,
size_t
length
,
gcc_unused
Error
&
error
)
{
struct
vorbis_encoder
&
encoder
=
*
(
struct
vorbis_e
ncoder
*
)
_encoder
;
auto
&
encoder
=
*
(
VorbisE
ncoder
*
)
_encoder
;
unsigned
num_frames
=
length
/
encoder
.
audio_format
.
GetFrameSize
();
...
...
@@ -335,7 +335,7 @@ vorbis_encoder_write(Encoder *_encoder,
static
size_t
vorbis_encoder_read
(
Encoder
*
_encoder
,
void
*
dest
,
size_t
length
)
{
struct
vorbis_encoder
&
encoder
=
*
(
struct
vorbis_e
ncoder
*
)
_encoder
;
auto
&
encoder
=
*
(
VorbisE
ncoder
*
)
_encoder
;
return
encoder
.
stream
.
PageOut
(
dest
,
length
);
}
...
...
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