From d1e4dd95330a462b29d5d2665a988f03f8f7f905 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Sun, 18 Jan 2004 02:42:10 +0000 Subject: [PATCH] Followed Marcus' advice and added a "virtual" to the *Plugin inheritance to allow an add-on to inherit from both, DecoderPlugin and ReaderPlugin at once. git-svn-id: file:///srv/svn/repos/haiku/trunk/current@6122 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- headers/private/media/DecoderPlugin.h | 2 +- headers/private/media/ReaderPlugin.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/headers/private/media/DecoderPlugin.h b/headers/private/media/DecoderPlugin.h index 21804bb2af..b94d47efc6 100644 --- a/headers/private/media/DecoderPlugin.h +++ b/headers/private/media/DecoderPlugin.h @@ -40,7 +40,7 @@ private: }; -class DecoderPlugin : public MediaPlugin +class DecoderPlugin : public virtual MediaPlugin { public: DecoderPlugin(); diff --git a/headers/private/media/ReaderPlugin.h b/headers/private/media/ReaderPlugin.h index 2fe640736d..bd81a4f912 100644 --- a/headers/private/media/ReaderPlugin.h +++ b/headers/private/media/ReaderPlugin.h @@ -47,7 +47,7 @@ public: // XXX for test programs only }; -class ReaderPlugin : public MediaPlugin +class ReaderPlugin : public virtual MediaPlugin { public: virtual Reader *NewReader() = 0;