diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-11-03 13:40:04 +0400 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2012-11-03 13:40:04 +0400 |
| commit | b2bf4a6ba57f82f81916007bf48fa1ff047c9d51 (patch) | |
| tree | 5d9ad7fe99c7e8ffc316e5555cee12e4039a32bd /demuxer | |
| parent | 2b346803036e425e0a183077f406ce6b6d4fb1a7 (diff) | |
Move IAMMediaContent into the proper position in the header, and not in the middle of ITrackInfo
Diffstat (limited to 'demuxer')
| -rw-r--r-- | demuxer/Demuxers/LAVFDemuxer.h | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/demuxer/Demuxers/LAVFDemuxer.h b/demuxer/Demuxers/LAVFDemuxer.h index c2d2765f..3da0dce0 100644 --- a/demuxer/Demuxers/LAVFDemuxer.h +++ b/demuxer/Demuxers/LAVFDemuxer.h @@ -92,6 +92,18 @@ public: // ITrackInfo STDMETHODIMP_(UINT) GetTrackCount(); + // \param aTrackIdx the track index (from 0 to GetTrackCount()-1) + STDMETHODIMP_(BOOL) GetTrackInfo(UINT aTrackIdx, struct TrackElement* pStructureToFill); + + // Get an extended information struct relative to the track type + STDMETHODIMP_(BOOL) GetTrackExtendedInfo(UINT aTrackIdx, void* pStructureToFill); + + STDMETHODIMP_(BSTR) GetTrackCodecID(UINT aTrackIdx) { return NULL; } + STDMETHODIMP_(BSTR) GetTrackName(UINT aTrackIdx); + STDMETHODIMP_(BSTR) GetTrackCodecName(UINT aTrackIdx); + STDMETHODIMP_(BSTR) GetTrackCodecInfoURL(UINT aTrackIdx) { return NULL; } + STDMETHODIMP_(BSTR) GetTrackCodecDownloadURL(UINT aTrackIdx) { return NULL; } + // IAMMediaContent STDMETHODIMP get_AuthorName(BSTR *pbstrAuthorName) { return GetBSTRMetadata("artist", pbstrAuthorName); } STDMETHODIMP get_Title(BSTR *pbstrTitle) { return GetBSTRMetadata("title", pbstrTitle); } @@ -107,18 +119,6 @@ public: STDMETHODIMP get_MoreInfoBannerURL(BSTR *pbstrMoreInfoBannerURL) { return E_NOTIMPL; } STDMETHODIMP get_MoreInfoText(BSTR *pbstrMoreInfoText) { return E_NOTIMPL; } - // \param aTrackIdx the track index (from 0 to GetTrackCount()-1) - STDMETHODIMP_(BOOL) GetTrackInfo(UINT aTrackIdx, struct TrackElement* pStructureToFill); - - // Get an extended information struct relative to the track type - STDMETHODIMP_(BOOL) GetTrackExtendedInfo(UINT aTrackIdx, void* pStructureToFill); - - STDMETHODIMP_(BSTR) GetTrackCodecID(UINT aTrackIdx) { return NULL; } - STDMETHODIMP_(BSTR) GetTrackName(UINT aTrackIdx); - STDMETHODIMP_(BSTR) GetTrackCodecName(UINT aTrackIdx); - STDMETHODIMP_(BSTR) GetTrackCodecInfoURL(UINT aTrackIdx) { return NULL; } - STDMETHODIMP_(BSTR) GetTrackCodecDownloadURL(UINT aTrackIdx) { return NULL; } - STDMETHODIMP OpenInputStream(AVIOContext *byteContext, LPCOLESTR pszFileName = NULL); STDMETHODIMP SeekByte(int64_t pos, int flags); |