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
46d00dd8
Commit
46d00dd8
authored
Oct 14, 2021
by
Max Kellermann
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
player/CrossFade: move code to CanCrossFadeSong()
parent
ec52b134
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
2 deletions
+15
-2
CrossFade.cxx
src/player/CrossFade.cxx
+8
-2
CrossFade.hxx
src/player/CrossFade.hxx
+7
-0
No files found.
src/player/CrossFade.cxx
View file @
46d00dd8
...
...
@@ -30,6 +30,13 @@
static
constexpr
Domain
cross_fade_domain
(
"cross_fade"
);
inline
bool
CrossFadeSettings
::
CanCrossFadeSong
(
SignedSongTime
total_time
)
const
noexcept
{
return
!
total_time
.
IsNegative
()
&&
duration
>=
std
::
chrono
::
duration_cast
<
FloatDuration
>
(
total_time
);
}
gcc_pure
static
FloatDuration
mixramp_interpolate
(
const
char
*
ramp_list
,
float
required_db
)
noexcept
...
...
@@ -97,8 +104,7 @@ CrossFadeSettings::Calculate(SignedSongTime total_time,
unsigned
int
chunks
=
0
;
if
(
!
IsEnabled
()
||
total_time
.
IsNegative
()
||
duration
>=
std
::
chrono
::
duration_cast
<
FloatDuration
>
(
total_time
)
||
!
CanCrossFadeSong
(
total_time
)
||
/* we can't crossfade when the audio formats are different */
af
!=
old_format
)
return
0
;
...
...
src/player/CrossFade.hxx
View file @
46d00dd8
...
...
@@ -64,6 +64,13 @@ struct CrossFadeSettings {
const
char
*
mixramp_prev_end
,
AudioFormat
af
,
AudioFormat
old_format
,
unsigned
max_chunks
)
const
noexcept
;
private
:
/**
* Can the described song be cross-faded?
*/
[[
gnu
::
pure
]]
bool
CanCrossFadeSong
(
SignedSongTime
total_time
)
const
noexcept
;
};
#endif
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