hrev52444 adds 2 changesets to branch 'master'
old head: 80abc9a90788515d15ffbacacdc0c2f6b36e097b
new head: 59125d3cedbd60772564bd5bedb6d4a2f7315549
overview:
https://git.haiku-os.org/haiku/log/?qt=range&q=59125d3cedbd+%5E80abc9a90788
----------------------------------------------------------------------------
e5e2a570ba12: ReaderPlugin: Private stuff should stay private
* Polishment since we are making this ABI public,
I'd rather remove any previous hack.
59125d3cedbd: MediaWriter: Private stuff should stay private
[ Barrett17 <b.vitruvio@xxxxxxxxx> ]
----------------------------------------------------------------------------
3 files changed, 2 insertions(+), 4 deletions(-)
headers/os/codec/ReaderPlugin.h | 1 -
headers/os/codec/WriterPlugin.h | 1 -
src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp | 4 ++--
############################################################################
Commit: e5e2a570ba12b2fb3528455c200ffce4bea22013
URL: https://git.haiku-os.org/haiku/commit/?id=e5e2a570ba12
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Sun Oct 28 14:09:24 2018 UTC
ReaderPlugin: Private stuff should stay private
* Polishment since we are making this ABI public,
I'd rather remove any previous hack.
----------------------------------------------------------------------------
diff --git a/headers/os/codec/ReaderPlugin.h b/headers/os/codec/ReaderPlugin.h
index 708d5b76ba..9991ef7135 100644
--- a/headers/os/codec/ReaderPlugin.h
+++ b/headers/os/codec/ReaderPlugin.h
@@ -57,7 +57,6 @@ private:
virtual void _ReservedReader4();
virtual void _ReservedReader5();
-public: // XXX for test programs only
void Setup(BDataIO* source);
BDataIO* fSource;
############################################################################
Revision: hrev52444
Commit: 59125d3cedbd60772564bd5bedb6d4a2f7315549
URL: https://git.haiku-os.org/haiku/commit/?id=59125d3cedbd
Author: Barrett17 <b.vitruvio@xxxxxxxxx>
Date: Sun Oct 28 14:22:38 2018 UTC
MediaWriter: Private stuff should stay private
----------------------------------------------------------------------------
diff --git a/headers/os/codec/WriterPlugin.h b/headers/os/codec/WriterPlugin.h
index f906bc913d..3112d19cf8 100644
--- a/headers/os/codec/WriterPlugin.h
+++ b/headers/os/codec/WriterPlugin.h
@@ -47,7 +47,6 @@ private:
virtual void _ReservedWriter4();
virtual void _ReservedWriter5();
-public: // XXX for test programs only
void Setup(BDataIO* target);
BDataIO* fTarget;
diff --git a/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
b/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
index 61e4c14a77..59153ce65a 100644
--- a/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
+++ b/src/add-ons/media/plugins/ffmpeg/AVFormatWriter.cpp
@@ -590,7 +590,7 @@ AVFormatWriter::_Write(void* cookie, uint8* buffer, int
bufferSize)
AVFormatWriter* writer = reinterpret_cast<AVFormatWriter*>(cookie);
- ssize_t written = writer->fTarget->Write(buffer, bufferSize);
+ ssize_t written = writer->Target()->Write(buffer, bufferSize);
TRACE_IO(" written: %ld\n", written);
return (int)written;
@@ -606,7 +606,7 @@ AVFormatWriter::_Seek(void* cookie, off_t offset, int
whence)
AVFormatWriter* writer = reinterpret_cast<AVFormatWriter*>(cookie);
- BMediaIO* mediaIO = dynamic_cast<BMediaIO*>(writer->fTarget);
+ BMediaIO* mediaIO = dynamic_cast<BMediaIO*>(writer->Target());
if (mediaIO == NULL)
return -1;
