wine/gecko
0
0
Fork 0
mirror of https://gitlab.winehq.org/wine/wine-gecko.git synced 2024-09-13 09:24:08 -07:00
Code Issues Packages Projects Releases Wiki Activity

Bug 1073081 - Fix -Woverloaded-virtual warnings in the MediaDecoder hierarchy. r=cpearce

Browse Source 
--HG--
extra : source : 9aba1a2b1b23b0640867501b1b92f96fb6d0b13a
This commit is contained in:
Botond Ballo 2014-12-10 13:48:56 -05:00
parent c177fe8e56
commit 624e485820
8 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
dom/media/omx/MediaCodecDecoder.cpp
View File

@ -24,7 +24,7 @@ MediaCodecDecoder::CreateReader()
}
MediaDecoderStateMachine*
MediaCodecDecoder::CreateStateMachine(MediaOmxCommonReader* aReader)
MediaCodecDecoder::CreateStateMachineFromReader(MediaOmxCommonReader* aReader)
{
return new MediaDecoderStateMachine(this, aReader);
}

2
dom/media/omx/MediaCodecDecoder.h
View File

@ -20,7 +20,7 @@ public:
virtual MediaOmxCommonReader* CreateReader();
virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader);
virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader);
};
} // namespace mozilla

2
dom/media/omx/MediaOmxCommonDecoder.cpp
View File

@ -265,7 +265,7 @@ MediaOmxCommonDecoder::CreateStateMachine()
if (mReader != nullptr) {
mReader->SetAudioChannel(GetAudioChannel());
}
return CreateStateMachine(mReader);
return CreateStateMachineFromReader(mReader);
}
} // namespace mozilla

2
dom/media/omx/MediaOmxCommonDecoder.h
View File

@ -41,7 +41,7 @@ public:
virtual MediaDecoderStateMachine* CreateStateMachine();
virtual MediaOmxCommonReader* CreateReader() = 0;
virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader) = 0;
virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader) = 0;
protected:
virtual ~MediaOmxCommonDecoder();

2
dom/media/omx/MediaOmxDecoder.cpp
View File

@ -25,7 +25,7 @@ MediaOmxDecoder::CreateReader()
}
MediaDecoderStateMachine*
MediaOmxDecoder::CreateStateMachine(MediaOmxCommonReader* aReader)
MediaOmxDecoder::CreateStateMachineFromReader(MediaOmxCommonReader* aReader)
{
return new MediaDecoderStateMachine(this, aReader);
}

2
dom/media/omx/MediaOmxDecoder.h
View File

@ -15,7 +15,7 @@ class MediaOmxDecoder : public MediaOmxCommonDecoder
public:
virtual MediaDecoder* Clone();
virtual MediaOmxCommonReader* CreateReader();
virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader);
virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader);
};
} // namespace mozilla

2
dom/media/omx/RtspMediaCodecDecoder.cpp
View File

@ -25,7 +25,7 @@ RtspMediaCodecDecoder::CreateReader()
}
MediaDecoderStateMachine*
RtspMediaCodecDecoder::CreateStateMachine(MediaOmxCommonReader* aReader)
RtspMediaCodecDecoder::CreateStateMachineFromReader(MediaOmxCommonReader* aReader)
{
return new MediaDecoderStateMachine(this, aReader,
mResource->IsRealTime());

2
dom/media/omx/RtspMediaCodecDecoder.h
View File

@ -18,7 +18,7 @@ public:
virtual MediaOmxCommonReader* CreateReader() MOZ_OVERRIDE;
virtual MediaDecoderStateMachine* CreateStateMachine(MediaOmxCommonReader* aReader) MOZ_OVERRIDE;
virtual MediaDecoderStateMachine* CreateStateMachineFromReader(MediaOmxCommonReader* aReader) MOZ_OVERRIDE;
virtual void ApplyStateToStateMachine(PlayState aState) MOZ_OVERRIDE;
};