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 1202286 - Part 0 - Add some explicit namespace references to keep the compiler and IntelliSense happy. r=esawin

Browse Source 
DecoderTraits.cpp pulls in MP3Demuxer.h which in turn pulls in mp4_demuxer/ByteReader.h. In that context, for some reason the ByteReader can't find the definition for MediaByteBuffer unless it is prefixed with the proper namespace.

MP3Demuxer.cpp itself compiles fine, but for some reason in Visual Studio IntelliSense complains about TimeUnit and TimeIntervals being undefined unless the using statement uses the full namespace hierarchy.

Also fix a small typo.
This commit is contained in:
Jan Henning 2015-10-01 11:29:48 +02:00
parent 7014f86655
commit 7db1515f35
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dom/media/MP3Demuxer.cpp
View File

@ -26,8 +26,8 @@ PRLogModuleInfo* gMP3DemuxerLog;
#define MP3DEMUXER_LOGV(msg, ...)
#endif
using media::TimeUnit;
using media::TimeIntervals;
using mozilla::media::TimeUnit;
using mozilla::media::TimeIntervals;
namespace mozilla {
namespace mp3 {

2
dom/media/MP3Demuxer.h
View File

@ -324,7 +324,7 @@ private:
// MPEG streams.
class MP3TrackDemuxer : public MediaTrackDemuxer {
public:
// Constructor, expecing a valid media resource.
// Constructor, expecting a valid media resource.
explicit MP3TrackDemuxer(MediaResource* aSource);
// Initializes the track demuxer by reading the first frame for meta data.

2
media/libstagefright/binding/include/mp4_demuxer/ByteReader.h
View File

@ -33,7 +33,7 @@ public:
: mPtr(aData.Elements()), mRemaining(aData.Length()), mLength(aData.Length())
{
}
explicit ByteReader(const MediaByteBuffer* aData)
explicit ByteReader(const mozilla::MediaByteBuffer* aData)
: mPtr(aData->Elements()), mRemaining(aData->Length()), mLength(aData->Length())
{
}