i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

MediaInput/Output: Inherit base virtually

Browse Source
This commit is contained in:
Dario Casalinuovo
2016-12-11 19:16:18 +01:00
parent 1e8a560196
commit d1742cc336
2 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
headers/private/media/MediaConnection.h
+2 -2
View File
@@ -119,7 +119,7 @@ private:
}; };
class BMediaInput : public BMediaConnection { class BMediaInput : public virtual BMediaConnection {
public: public:
BMediaInput(); BMediaInput();
@@ -149,7 +149,7 @@ private:
}; };
class BMediaOutput : public BMediaConnection { class BMediaOutput : public virtual BMediaConnection {
public: public:
BMediaOutput(); BMediaOutput();
src/kits/media/MediaClient.cpp
+2 -2
View File
@@ -147,9 +147,9 @@ BMediaClient::Connect(BMediaConnection* ourConnection,
CALLED(); CALLED();
if (ourConnection->IsOutput() && theirConnection.IsInput()) if (ourConnection->IsOutput() && theirConnection.IsInput())
return _ConnectInput((BMediaOutput*)ourConnection, theirConnection); return _ConnectInput(dynamic_cast<BMediaOutput*>(ourConnection), theirConnection);
else if (ourConnection->IsInput() && theirConnection.IsOutput()) else if (ourConnection->IsInput() && theirConnection.IsOutput())
return _ConnectOutput((BMediaInput*)ourConnection, theirConnection); return _ConnectOutput(dynamic_cast<BMediaInput*>(ourConnection), theirConnection);
return B_ERROR; return B_ERROR;
} }