Attachment 252196 Details for Bug 280143 – Fix data type

[patch] Fix data type

kodi.patch (text/plain), 3.47 KB, created by yzrh on 2024-07-20 21:19:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: yzrh

Created: 2024-07-20 21:19:55 UTC

Size: 3.47 KB

patch

obsolete

>diff -urN a/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp b/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp
>--- a/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp	1970-01-01 00:00:00.000000000 +0000
>+++ b/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.cpp	2024-07-20 20:48:59.465157000 +0000
>@@ -0,0 +1,47 @@
>+--- xbmc/music/tags/TagLibVFSStream.cpp.orig	2024-07-20 12:15:29 UTC
>++++ xbmc/music/tags/TagLibVFSStream.cpp
>+@@ -59,7 +59,7 @@ FileName TagLibVFSStream::name() const
>+  * Reads a block of size \a length at the current get pointer.
>+  */
>+ #if (TAGLIB_MAJOR_VERSION >= 2)
>+-ByteVector TagLibVFSStream::readBlock(unsigned long length)
>++ByteVector TagLibVFSStream::readBlock(size_t length)
>+ #else
>+ ByteVector TagLibVFSStream::readBlock(TagLib::ulong length)
>+ #endif
>+@@ -282,7 +282,7 @@ bool TagLibVFSStream::isOpen() const
>+  *
>+  * \see Position
>+  */
>+-void TagLibVFSStream::seek(long offset, Position p)
>++void TagLibVFSStream::seek(TagLib::offset_t offset, Position p)
>+ {
>+   const long fileLen = length();
>+   if (m_bIsReadOnly && fileLen > 0)
>+@@ -340,7 +340,7 @@ void TagLibVFSStream::clear()
>+ /*!
>+  * Returns the current offset within the file.
>+  */
>+-long TagLibVFSStream::tell() const
>++TagLib::offset_t TagLibVFSStream::tell() const
>+ {
>+   int64_t pos = m_file.GetPosition();
>+   if(pos > LONG_MAX)
>+@@ -352,7 +352,7 @@ long TagLibVFSStream::tell() const
>+ /*!
>+  * Returns the length of the file.
>+  */
>+-long TagLibVFSStream::length()
>++TagLib::offset_t TagLibVFSStream::length()
>+ {
>+   return (long)m_file.GetLength();
>+ }
>+@@ -360,7 +360,7 @@ long TagLibVFSStream::length()
>+ /*!
>+  * Truncates the file to a \a length.
>+  */
>+-void TagLibVFSStream::truncate(long length)
>++void TagLibVFSStream::truncate(TagLib::offset_t length)
>+ {
>+   m_file.Truncate(length);
>+ }
>diff -urN a/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h b/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h
>--- a/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h	1970-01-01 00:00:00.000000000 +0000
>+++ b/multimedia/kodi/files/patch-xbmc_music_tags_TagLibVFSStream.h	2024-07-05 11:35:25.249062000 +0000
>@@ -0,0 +1,41 @@
>+--- xbmc/music/tags/TagLibVFSStream.h.orig	2024-06-28 10:37:37 UTC
>++++ xbmc/music/tags/TagLibVFSStream.h
>+@@ -38,7 +38,7 @@ namespace MUSIC_INFO
>+      * Reads a block of size \a length at the current get pointer.
>+      */
>+ #if (TAGLIB_MAJOR_VERSION >= 2)
>+-    TagLib::ByteVector readBlock(unsigned long length) override;
>++    TagLib::ByteVector readBlock(size_t length) override;
>+ #else
>+     TagLib::ByteVector readBlock(TagLib::ulong length) override;
>+ #endif
>+@@ -99,7 +99,7 @@ namespace MUSIC_INFO
>+      *
>+      * \see Position
>+      */
>+-    void seek(long offset, TagLib::IOStream::Position p = Beginning) override;
>++    void seek(TagLib::offset_t offset, TagLib::IOStream::Position p = Beginning) override;
>+ 
>+     /*!
>+      * Reset the end-of-file and error flags on the file.
>+@@ -109,17 +109,17 @@ namespace MUSIC_INFO
>+     /*!
>+      * Returns the current offset within the file.
>+      */
>+-    long tell() const override;
>++    TagLib::offset_t tell() const override;
>+ 
>+     /*!
>+      * Returns the length of the file.
>+      */
>+-    long length() override;
>++    TagLib::offset_t length() override;
>+ 
>+     /*!
>+      * Truncates the file to a \a length.
>+      */
>+-    void truncate(long length) override;
>++    void truncate(TagLib::offset_t length) override;
>+ 
>+   protected:
>+     /*!

Actions: View | Diff

Attachments on bug 280143: 251887 | 251888 | 252196