dmaax/ladybird
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

LibMedia: Qualify AK::SeekMode to differentiate from Media::SeekMode

Browse source
This commit is contained in:
Zaggy1024 2026-04-26 15:49:34 -05:00 committed by Gregory Bertilson
parent a06f87d728
commit a286f30663
4 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
Libraries/LibMedia/IncrementallyPopulatedStream.cpp
View file

@ -259,16 +259,16 @@ IncrementallyPopulatedStream::Cursor::~Cursor()
VERIFY(m_stream->m_cursors.remove_first_matching([&](Cursor const& cursor) { return this == &cursor; }));
}
DecoderErrorOr<void> IncrementallyPopulatedStream::Cursor::seek(i64 offset, SeekMode mode)
DecoderErrorOr<void> IncrementallyPopulatedStream::Cursor::seek(i64 offset, AK::SeekMode mode)
{
switch (mode) {
case SeekMode::SetPosition:
case AK::SeekMode::SetPosition:
m_position = offset;
break;
case SeekMode::FromCurrentPosition:
case AK::SeekMode::FromCurrentPosition:
m_position += offset;
break;
case SeekMode::FromEndPosition:
case AK::SeekMode::FromEndPosition:
m_position = this->size() + offset;
break;
default:

2
Libraries/LibMedia/IncrementallyPopulatedStream.h
View file

@ -51,7 +51,7 @@ public:
public:
~Cursor();
virtual DecoderErrorOr<void> seek(i64 offset, SeekMode mode) override;
virtual DecoderErrorOr<void> seek(i64 offset, AK::SeekMode mode) override;
virtual DecoderErrorOr<size_t> read_into(Bytes bytes) override;
virtual size_t position() const override { return m_position; }

2
Libraries/LibMedia/MediaStream.h
View file

@ -17,7 +17,7 @@ class MediaStreamCursor : public AtomicRefCounted<MediaStreamCursor> {
public:
virtual ~MediaStreamCursor() = default;
virtual DecoderErrorOr<void> seek(i64 offset, SeekMode) = 0;
virtual DecoderErrorOr<void> seek(i64 offset, AK::SeekMode) = 0;
virtual DecoderErrorOr<size_t> read_into(Bytes) = 0;
virtual size_t position() const = 0;
virtual size_t size() const = 0;

8
Libraries/LibMedia/ReadonlyBytesCursor.h
View file

@ -19,15 +19,15 @@ public:
{
}
virtual DecoderErrorOr<void> seek(i64 offset, SeekMode mode) override
virtual DecoderErrorOr<void> seek(i64 offset, AK::SeekMode mode) override
{
auto target_position = [&] -> size_t {
switch (mode) {
case SeekMode::SetPosition:
case AK::SeekMode::SetPosition:
return offset;
case SeekMode::FromCurrentPosition:
case AK::SeekMode::FromCurrentPosition:
return m_position + offset;
case SeekMode::FromEndPosition:
case AK::SeekMode::FromEndPosition:
return m_data.size() + offset;
}
VERIFY_NOT_REACHED();