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
a90685d6
Commit
a90685d6
authored
Aug 03, 2019
by
Max Kellermann
Browse files
Options
Browse Files
Download
Plain Diff
Merge tag 'v0.21.12'
release v0.21.12
parents
fe2f8c08
ae19bda1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
61 additions
and
25 deletions
+61
-25
NEWS
NEWS
+8
-1
meson.build
meson.build
+6
-0
Control.hxx
src/decoder/Control.hxx
+5
-0
MadDecoderPlugin.cxx
src/decoder/plugins/MadDecoderPlugin.cxx
+0
-0
OggVisitor.cxx
src/lib/xiph/OggVisitor.cxx
+2
-2
OggVisitor.hxx
src/lib/xiph/OggVisitor.hxx
+13
-0
JackOutputPlugin.cxx
src/output/plugins/JackOutputPlugin.cxx
+1
-1
Thread.cxx
src/player/Thread.cxx
+13
-0
Compiler.h
src/util/Compiler.h
+0
-12
StaticFifoBuffer.hxx
src/util/StaticFifoBuffer.hxx
+13
-9
No files found.
NEWS
View file @
a90685d6
...
...
@@ -13,9 +13,16 @@ ver 0.22 (not yet released)
- hdcd: new plugin based on FFmpeg's "af_hdcd" for HDCD playback
- volume: convert S16 to S24 to preserve quality and reduce dithering noise
ver 0.21.12 (
not yet released
)
ver 0.21.12 (
2019/08/03
)
* decoder
- mad: update bit rate after seeking
- mad: fix several bugs preventing the plugin from decoding the last frame
- opus: ignore case in replay gain tag names
- opus, vorbis: decode the "end of stream" packet
* output
- jack: fix mono-to-stereo conversion
* player
- don't restart unseekable song after failed seek attempt
* Windows
- support backslash in relative URIs loaded from playlists
...
...
meson.build
View file @
a90685d6
...
...
@@ -15,6 +15,12 @@ version_cxx = vcs_tag(input: 'src/GitVersion.cxx', output: 'GitVersion.cxx')
compiler = meson.get_compiler('cpp')
c_compiler = meson.get_compiler('c')
if compiler.get_id() == 'gcc' and compiler.version().version_compare('<6')
warning('Your GCC version is too old. You need at least version 6.')
elif compiler.get_id() == 'clang' and compiler.version().version_compare('<3')
warning('Your clang version is too old. You need at least version 3.')
endif
conf = configuration_data()
conf.set_quoted('PACKAGE', meson.project_name())
conf.set_quoted('PACKAGE_NAME', meson.project_name())
...
...
src/decoder/Control.hxx
View file @
a90685d6
...
...
@@ -311,6 +311,11 @@ public:
bool
IsCurrentSong
(
const
DetachedSong
&
_song
)
const
noexcept
;
gcc_pure
bool
IsUnseekableCurrentSong
(
const
DetachedSong
&
_song
)
const
noexcept
{
return
!
seekable
&&
IsCurrentSong
(
_song
);
}
gcc_pure
bool
IsSeekableCurrentSong
(
const
DetachedSong
&
_song
)
const
noexcept
{
return
seekable
&&
IsCurrentSong
(
_song
);
}
...
...
src/decoder/plugins/MadDecoderPlugin.cxx
View file @
a90685d6
This diff is collapsed.
Click to expand it.
src/lib/xiph/OggVisitor.cxx
View file @
a90685d6
...
...
@@ -69,12 +69,12 @@ OggVisitor::HandlePacket(const ogg_packet &packet)
/* fail if BOS is missing */
throw
std
::
runtime_error
(
"BOS packet expected"
);
OnOggPacket
(
packet
);
if
(
packet
.
e_o_s
)
{
EndStream
();
return
;
}
OnOggPacket
(
packet
);
}
inline
void
...
...
src/lib/xiph/OggVisitor.hxx
View file @
a90685d6
...
...
@@ -67,8 +67,21 @@ private:
void
HandlePackets
();
protected
:
/**
* Called when the "beginning of stream" packet has been seen.
*
* @param packet the "beginning of stream" packet
*/
virtual
void
OnOggBeginning
(
const
ogg_packet
&
packet
)
=
0
;
/**
* Called for each follow-up packet.
*/
virtual
void
OnOggPacket
(
const
ogg_packet
&
packet
)
=
0
;
/**
* Called after the "end of stream" packet has been processed.
*/
virtual
void
OnOggEnd
()
=
0
;
};
...
...
src/output/plugins/JackOutputPlugin.cxx
View file @
a90685d6
...
...
@@ -539,7 +539,7 @@ JackOutput::Start()
std
::
fill
(
dports
+
num_dports
,
dports
+
audio_format
.
channels
,
dports
[
0
]);
}
else
if
(
num_dports
>
audio_format
.
channels
)
{
if
(
audio_format
.
channels
==
1
&&
num_dports
>
2
)
{
if
(
audio_format
.
channels
==
1
&&
num_dports
>
=
2
)
{
/* mono input file: connect the one source
channel to the both destination channels */
duplicate_port
=
dports
[
1
];
...
...
src/player/Thread.cxx
View file @
a90685d6
...
...
@@ -602,6 +602,19 @@ Player::SeekDecoder(std::unique_lock<Mutex> &lock) noexcept
{
assert
(
pc
.
next_song
!=
nullptr
);
if
(
pc
.
seek_time
>
SongTime
::
zero
()
&&
// TODO: allow this only if the song duration is known
dc
.
IsUnseekableCurrentSong
(
*
pc
.
next_song
))
{
/* seeking into the current song; but we already know
it's not seekable, so let's fail early */
/* note the seek_time>0 check: if seeking to the
beginning, we can simply restart the decoder */
pc
.
next_song
.
reset
();
pc
.
SetError
(
PlayerError
::
DECODER
,
std
::
make_exception_ptr
(
std
::
runtime_error
(
"Not seekable"
)));
pc
.
CommandFinished
();
return
true
;
}
CancelPendingSeek
();
{
...
...
src/util/Compiler.h
View file @
a90685d6
...
...
@@ -57,18 +57,6 @@
(GCC_VERSION > 0 && CLANG_VERSION == 0 && \
GCC_VERSION < GCC_MAKE_VERSION(major, minor, 0))
#ifdef __clang__
# if __clang_major__ < 3
# error Sorry, your clang version is too old. You need at least version 3.1.
# endif
#elif defined(__GNUC__)
# if GCC_OLDER_THAN(6,0)
# error Sorry, your gcc version is too old. You need at least version 6.0.
# endif
#else
# warning Untested compiler. Use at your own risk!
#endif
/**
* Are we building with the specified version of clang or newer?
*/
...
...
src/util/StaticFifoBuffer.hxx
View file @
a90685d6
...
...
@@ -56,11 +56,11 @@ protected:
T
data
[
size
];
public
:
constexpr
size_type
GetCapacity
()
const
{
constexpr
size_type
GetCapacity
()
const
noexcept
{
return
size
;
}
void
Shift
()
{
void
Shift
()
noexcept
{
if
(
head
==
0
)
return
;
...
...
@@ -74,15 +74,15 @@ public:
head
=
0
;
}
void
Clear
()
{
void
Clear
()
noexcept
{
head
=
tail
=
0
;
}
bool
empty
()
cons
t
{
constexpr
bool
empty
()
const
noexcep
t
{
return
head
==
tail
;
}
bool
IsFull
()
cons
t
{
constexpr
bool
IsFull
()
const
noexcep
t
{
return
head
==
0
&&
tail
==
size
;
}
...
...
@@ -90,7 +90,7 @@ public:
* Prepares writing. Returns a buffer range which may be written.
* When you are finished, call Append().
*/
Range
Write
()
{
Range
Write
()
noexcept
{
if
(
empty
())
Clear
();
else
if
(
tail
==
size
)
...
...
@@ -103,7 +103,7 @@ public:
* Expands the tail of the buffer, after data has been written to
* the buffer returned by Write().
*/
void
Append
(
size_type
n
)
{
void
Append
(
size_type
n
)
noexcept
{
assert
(
tail
<=
size
);
assert
(
n
<=
size
);
assert
(
tail
+
n
<=
size
);
...
...
@@ -111,18 +111,22 @@ public:
tail
+=
n
;
}
constexpr
size_type
GetAvailable
()
const
noexcept
{
return
tail
-
head
;
}
/**
* Return a buffer range which may be read. The buffer pointer is
* writable, to allow modifications while parsing.
*/
Range
Read
()
{
constexpr
Range
Read
()
noexcept
{
return
Range
(
data
+
head
,
tail
-
head
);
}
/**
* Marks a chunk as consumed.
*/
void
Consume
(
size_type
n
)
{
void
Consume
(
size_type
n
)
noexcept
{
assert
(
tail
<=
size
);
assert
(
head
<=
tail
);
assert
(
n
<=
tail
);
...
...
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