Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with
or
.
Download ZIP
Browse files

[embedded art] pass EmbeddedArt into IMusicInfoTagLoader::Load

  • Loading branch information...
commit 268a0ab8b9b29963bfbd7f075e1093e2e6677638 1 parent d21a298
Jonathan Marshall authored
Showing with 51 additions and 45 deletions.
  1. +2 −1  xbmc/music/tags/ImusicInfoTagLoader.h
  2. +1 −1  xbmc/music/tags/MusicInfoTagLoaderASAP.cpp
  3. +1 −1  xbmc/music/tags/MusicInfoTagLoaderASAP.h
  4. +1 −1  xbmc/music/tags/MusicInfoTagLoaderApe.cpp
  5. +1 −1  xbmc/music/tags/MusicInfoTagLoaderApe.h
  6. +1 −1  xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
  7. +1 −1  xbmc/music/tags/MusicInfoTagLoaderCDDA.h
  8. +1 −1  xbmc/music/tags/MusicInfoTagLoaderDatabase.cpp
  9. +1 −1  xbmc/music/tags/MusicInfoTagLoaderDatabase.h
  10. +2 −1  xbmc/music/tags/MusicInfoTagLoaderFlac.cpp
  11. +1 −1  xbmc/music/tags/MusicInfoTagLoaderFlac.h
  12. +2 −1  xbmc/music/tags/MusicInfoTagLoaderMP3.cpp
  13. +1 −1  xbmc/music/tags/MusicInfoTagLoaderMP3.h
  14. +6 −6 xbmc/music/tags/MusicInfoTagLoaderMP4.cpp
  15. +3 −3 xbmc/music/tags/MusicInfoTagLoaderMP4.h
  16. +1 −1  xbmc/music/tags/MusicInfoTagLoaderMidi.cpp
  17. +1 −1  xbmc/music/tags/MusicInfoTagLoaderMidi.h
  18. +1 −1  xbmc/music/tags/MusicInfoTagLoaderMod.cpp
  19. +1 −1  xbmc/music/tags/MusicInfoTagLoaderMod.h
  20. +1 −1  xbmc/music/tags/MusicInfoTagLoaderNSF.cpp
  21. +1 −1  xbmc/music/tags/MusicInfoTagLoaderNSF.h
  22. +2 −1  xbmc/music/tags/MusicInfoTagLoaderOgg.cpp
  23. +1 −1  xbmc/music/tags/MusicInfoTagLoaderOgg.h
  24. +1 −1  xbmc/music/tags/MusicInfoTagLoaderSPC.cpp
  25. +1 −1  xbmc/music/tags/MusicInfoTagLoaderSPC.h
  26. +1 −1  xbmc/music/tags/MusicInfoTagLoaderShn.cpp
  27. +1 −1  xbmc/music/tags/MusicInfoTagLoaderShn.h
  28. +4 −4 xbmc/music/tags/MusicInfoTagLoaderWMA.cpp
  29. +2 −2 xbmc/music/tags/MusicInfoTagLoaderWMA.h
  30. +1 −1  xbmc/music/tags/MusicInfoTagLoaderWav.cpp
  31. +1 −1  xbmc/music/tags/MusicInfoTagLoaderWav.h
  32. +1 −1  xbmc/music/tags/MusicInfoTagLoaderYM.cpp
  33. +1 −1  xbmc/music/tags/MusicInfoTagLoaderYM.h
  34. +3 −1 xbmc/music/tags/Tag.h
View
3  xbmc/music/tags/ImusicInfoTagLoader.h
@@ -24,6 +24,7 @@
namespace MUSIC_INFO
{
+ class EmbeddedArt;
class CMusicInfoTag;
class IMusicInfoTagLoader
{
@@ -31,6 +32,6 @@ namespace MUSIC_INFO
IMusicInfoTagLoader(void){};
virtual ~IMusicInfoTagLoader(){};
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag) = 0;
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL) = 0;
};
}
View
2  xbmc/music/tags/MusicInfoTagLoaderASAP.cpp
@@ -33,7 +33,7 @@ CMusicInfoTagLoaderASAP::~CMusicInfoTagLoaderASAP()
{
}
-bool CMusicInfoTagLoaderASAP::Load(const CStdString &strFile, CMusicInfoTag &tag)
+bool CMusicInfoTagLoaderASAP::Load(const CStdString &strFile, CMusicInfoTag &tag, EmbeddedArt *art)
{
tag.SetLoaded(false);
View
2  xbmc/music/tags/MusicInfoTagLoaderASAP.h
@@ -32,7 +32,7 @@ namespace MUSIC_INFO
CMusicInfoTagLoaderASAP(void);
virtual ~CMusicInfoTagLoaderASAP();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
private:
DllASAP m_dll;
};
View
2  xbmc/music/tags/MusicInfoTagLoaderApe.cpp
@@ -33,7 +33,7 @@ CMusicInfoTagLoaderApe::CMusicInfoTagLoaderApe(void)
CMusicInfoTagLoaderApe::~CMusicInfoTagLoaderApe()
{}
-bool CMusicInfoTagLoaderApe::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderApe::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
try
{
View
2  xbmc/music/tags/MusicInfoTagLoaderApe.h
@@ -33,7 +33,7 @@ class CMusicInfoTagLoaderApe: public IMusicInfoTagLoader
CMusicInfoTagLoaderApe(void);
virtual ~CMusicInfoTagLoaderApe();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
};
}
View
2  xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
@@ -42,7 +42,7 @@ CMusicInfoTagLoaderCDDA::~CMusicInfoTagLoaderCDDA()
{
}
-bool CMusicInfoTagLoaderCDDA::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderCDDA::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
#ifdef HAS_DVD_DRIVE
try
View
2  xbmc/music/tags/MusicInfoTagLoaderCDDA.h
@@ -30,6 +30,6 @@ namespace MUSIC_INFO
CMusicInfoTagLoaderCDDA(void);
virtual ~CMusicInfoTagLoaderCDDA();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
};
}
View
2  xbmc/music/tags/MusicInfoTagLoaderDatabase.cpp
@@ -35,7 +35,7 @@ CMusicInfoTagLoaderDatabase::~CMusicInfoTagLoaderDatabase()
{
}
-bool CMusicInfoTagLoaderDatabase::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderDatabase::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
tag.SetLoaded(false);
CMusicDatabase database;
View
2  xbmc/music/tags/MusicInfoTagLoaderDatabase.h
@@ -30,7 +30,7 @@ namespace MUSIC_INFO
CMusicInfoTagLoaderDatabase(void);
virtual ~CMusicInfoTagLoaderDatabase();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
};
}
View
3  xbmc/music/tags/MusicInfoTagLoaderFlac.cpp
@@ -32,13 +32,14 @@ CMusicInfoTagLoaderFlac::CMusicInfoTagLoaderFlac(void)
CMusicInfoTagLoaderFlac::~CMusicInfoTagLoaderFlac()
{}
-bool CMusicInfoTagLoaderFlac::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderFlac::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
try
{
// retrieve the Flac Tag info from strFileName
// and put it in tag
CFlacTag myTag;
+ myTag.SetArt(art);
if (myTag.Read(strFileName))
{
myTag.GetMusicInfoTag(tag);
View
2  xbmc/music/tags/MusicInfoTagLoaderFlac.h
@@ -30,7 +30,7 @@ namespace MUSIC_INFO
CMusicInfoTagLoaderFlac(void);
virtual ~CMusicInfoTagLoaderFlac();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
};
}
View
3  xbmc/music/tags/MusicInfoTagLoaderMP3.cpp
@@ -74,13 +74,14 @@ CMusicInfoTagLoaderMP3::~CMusicInfoTagLoaderMP3()
{
}
-bool CMusicInfoTagLoaderMP3::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderMP3::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
try
{
// retrieve the ID3 Tag info from strFileName
// and put it in tag
CID3Tag id3tag;
+ id3tag.SetArt(art);
if (id3tag.Read(strFileName))
{
id3tag.GetMusicInfoTag(tag);
View
2  xbmc/music/tags/MusicInfoTagLoaderMP3.h
@@ -113,7 +113,7 @@ class CMusicInfoTagLoaderMP3: public IMusicInfoTagLoader
public:
CMusicInfoTagLoaderMP3(void);
virtual ~CMusicInfoTagLoaderMP3();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
void GetSeekInfo(CVBRMP3SeekHelper &info) const;
bool GetReplayGain(CReplayGain &info) const;
bool ReadSeekAndReplayGainInfo(const CStdString &strFileName);
View
12 xbmc/music/tags/MusicInfoTagLoaderMP4.cpp
@@ -93,7 +93,7 @@ unsigned int CMusicInfoTagLoaderMP4::ReadUnsignedInt( const char* pData )
// Given a metadata type, and a pointer to the data (and the size), this function attempts to populate
// XBMC's CMusicInfoTag object. Tags that we don't support are simply ignored..
-void CMusicInfoTagLoaderMP4::ParseTag( unsigned int metaKey, const char* pMetaData, int metaSize, CMusicInfoTag& tag)
+void CMusicInfoTagLoaderMP4::ParseTag( unsigned int metaKey, const char* pMetaData, int metaSize, CMusicInfoTag& tag, EmbeddedArt *art)
{
switch ( metaKey )
{
@@ -265,7 +265,7 @@ int CMusicInfoTagLoaderMP4::GetILSTOffset( const char* pBuffer, int bufferSize )
//
// I hope to make this particular function more readable/structured when time permits.
-int CMusicInfoTagLoaderMP4::ParseAtom( int64_t startOffset, int64_t stopOffset, CMusicInfoTag& tag )
+int CMusicInfoTagLoaderMP4::ParseAtom( int64_t startOffset, int64_t stopOffset, CMusicInfoTag& tag, EmbeddedArt *art )
{
int64_t currentOffset;
int atomSize;
@@ -301,7 +301,7 @@ int CMusicInfoTagLoaderMP4::ParseAtom( int64_t startOffset, int64_t stopOffset,
{
if ( atomName == g_ContainerAtoms[ containerAtom ] )
{
- ParseAtom( m_file.GetPosition(), currentOffset + atomSize, tag );
+ ParseAtom( m_file.GetPosition(), currentOffset + atomSize, tag, art );
break;
}
}
@@ -333,7 +333,7 @@ int CMusicInfoTagLoaderMP4::ParseAtom( int64_t startOffset, int64_t stopOffset,
// Ok.. we've got some metadata to process. Go to it.
- ParseTag( metaKey, metaData, metaSize - 20, tag );
+ ParseTag( metaKey, metaData, metaSize - 20, tag, art );
}
}
else
@@ -368,7 +368,7 @@ CMusicInfoTagLoaderMP4::~CMusicInfoTagLoaderMP4()
{
}
-bool CMusicInfoTagLoaderMP4::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderMP4::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
try
{
@@ -389,7 +389,7 @@ bool CMusicInfoTagLoaderMP4::Load(const CStdString& strFileName, CMusicInfoTag&
m_thumbSize = false;
m_thumbData = NULL;
m_isCompilation = false;
- ParseAtom( 0, m_file.GetLength(), tag );
+ ParseAtom( 0, m_file.GetLength(), tag, art );
if (m_thumbData)
{ // cache the thumb
View
6 xbmc/music/tags/MusicInfoTagLoaderMP4.h
@@ -32,13 +32,13 @@ class CMusicInfoTagLoaderMP4: public IMusicInfoTagLoader
CMusicInfoTagLoaderMP4(void);
virtual ~CMusicInfoTagLoaderMP4();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
private:
unsigned int ReadUnsignedInt( const char* pData );
- void ParseTag( unsigned int metaKey, const char* pMetaData, int metaSize, CMusicInfoTag& tag);
+ void ParseTag( unsigned int metaKey, const char* pMetaData, int metaSize, CMusicInfoTag& tag, EmbeddedArt *art);
int GetILSTOffset( const char* pBuffer, int bufferSize );
- int ParseAtom( int64_t startOffset, int64_t stopOffset, CMusicInfoTag& tag );
+ int ParseAtom( int64_t startOffset, int64_t stopOffset, CMusicInfoTag& tag, EmbeddedArt *art );
unsigned int m_thumbSize;
BYTE *m_thumbData;
View
2  xbmc/music/tags/MusicInfoTagLoaderMidi.cpp
@@ -44,7 +44,7 @@ CMusicInfoTagLoaderMidi::~CMusicInfoTagLoaderMidi()
// A good intention of creating a pattern-based artist/song recognition engine failed greatly. Simple formats
// like %A-%T fail greatly with artists like A-HA and songs like "Ob-la-Di ob-la-Da.mid". So if anyone has
// a good idea which would include cases from above, I'd be happy to hear about it.
-bool CMusicInfoTagLoaderMidi::Load(const CStdString & strFileName, CMusicInfoTag & tag)
+bool CMusicInfoTagLoaderMidi::Load(const CStdString & strFileName, CMusicInfoTag & tag, EmbeddedArt *art)
{
tag.SetURL(strFileName);
View
2  xbmc/music/tags/MusicInfoTagLoaderMidi.h
@@ -30,7 +30,7 @@ namespace MUSIC_INFO
public:
CMusicInfoTagLoaderMidi();
virtual ~CMusicInfoTagLoaderMidi();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
};
}
View
2  xbmc/music/tags/MusicInfoTagLoaderMod.cpp
@@ -40,7 +40,7 @@ CMusicInfoTagLoaderMod::~CMusicInfoTagLoaderMod()
{
}
-bool CMusicInfoTagLoaderMod::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderMod::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
tag.SetURL(strFileName);
// first, does the module have a .mdz?
View
2  xbmc/music/tags/MusicInfoTagLoaderMod.h
@@ -30,7 +30,7 @@ namespace MUSIC_INFO
CMusicInfoTagLoaderMod(void);
virtual ~CMusicInfoTagLoaderMod();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
private:
bool getFile(CStdString& strFile, const CStdString& strSource);
};
View
2  xbmc/music/tags/MusicInfoTagLoaderNSF.cpp
@@ -53,7 +53,7 @@ int CMusicInfoTagLoaderNSF::GetStreamCount(const CStdString& strFileName)
return result;
}
-bool CMusicInfoTagLoaderNSF::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderNSF::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
tag.SetLoaded(false);
View
2  xbmc/music/tags/MusicInfoTagLoaderNSF.h
@@ -31,7 +31,7 @@ namespace MUSIC_INFO
CMusicInfoTagLoaderNSF(void);
virtual ~CMusicInfoTagLoaderNSF();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
virtual int GetStreamCount(const CStdString& strFileName);
private:
void* m_nsf;
View
3  xbmc/music/tags/MusicInfoTagLoaderOgg.cpp
@@ -31,13 +31,14 @@ CMusicInfoTagLoaderOgg::CMusicInfoTagLoaderOgg(void)
CMusicInfoTagLoaderOgg::~CMusicInfoTagLoaderOgg()
{}
-bool CMusicInfoTagLoaderOgg::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderOgg::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
try
{
// retrieve the OGG Tag info from strFileName
// and put it in tag
COggTag myTag;
+ myTag.SetArt(art);
if (myTag.Read(strFileName))
{
myTag.GetMusicInfoTag(tag);
View
2  xbmc/music/tags/MusicInfoTagLoaderOgg.h
@@ -31,6 +31,6 @@ class CMusicInfoTagLoaderOgg: public IMusicInfoTagLoader
CMusicInfoTagLoaderOgg(void);
virtual ~CMusicInfoTagLoaderOgg();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
};
}
View
2  xbmc/music/tags/MusicInfoTagLoaderSPC.cpp
@@ -95,7 +95,7 @@ CMusicInfoTagLoaderSPC::~CMusicInfoTagLoaderSPC()
{
}
-bool CMusicInfoTagLoaderSPC::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderSPC::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
tag.SetLoaded(false);
View
2  xbmc/music/tags/MusicInfoTagLoaderSPC.h
@@ -30,7 +30,7 @@ namespace MUSIC_INFO
CMusicInfoTagLoaderSPC(void);
virtual ~CMusicInfoTagLoaderSPC();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
};
}
View
2  xbmc/music/tags/MusicInfoTagLoaderShn.cpp
@@ -31,7 +31,7 @@ CMusicInfoTagLoaderSHN::CMusicInfoTagLoaderSHN(void)
CMusicInfoTagLoaderSHN::~CMusicInfoTagLoaderSHN()
{}
-bool CMusicInfoTagLoaderSHN::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderSHN::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
try
{
View
2  xbmc/music/tags/MusicInfoTagLoaderShn.h
@@ -31,6 +31,6 @@ class CMusicInfoTagLoaderSHN: public IMusicInfoTagLoader
CMusicInfoTagLoaderSHN(void);
virtual ~CMusicInfoTagLoaderSHN();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
};
}
View
8 xbmc/music/tags/MusicInfoTagLoaderWMA.cpp
@@ -87,7 +87,7 @@ CMusicInfoTagLoaderWMA::~CMusicInfoTagLoaderWMA()
// Based on MediaInfo
// by J�r�me Martinez, Zen@MediaArea.net
// http://sourceforge.net/projects/mediainfo/
-bool CMusicInfoTagLoaderWMA::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderWMA::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
try
{
@@ -280,7 +280,7 @@ bool CMusicInfoTagLoaderWMA::Load(const CStdString& strFileName, CMusicInfoTag&
else if (iFrameType == WMT_TYPE_BINARY && iValueSize > 0)
{
unsigned char* pValue = (unsigned char*)(pData.get() + iOffset); // Raw data
- SetTagValueBinary(strFrameName, pValue, tag);
+ SetTagValueBinary(strFrameName, pValue, tag, art);
}
else if (iFrameType == WMT_TYPE_BOOL && iValueSize > 0)
{
@@ -361,7 +361,7 @@ bool CMusicInfoTagLoaderWMA::Load(const CStdString& strFileName, CMusicInfoTag&
else if (iFrameType == WMT_TYPE_BINARY && iValueSize > 0)
{
unsigned char* pValue = (unsigned char*)(pData.get() + iOffset); // Raw data
- SetTagValueBinary(strFrameName, pValue, tag);
+ SetTagValueBinary(strFrameName, pValue, tag, art);
}
else if (iFrameType == WMT_TYPE_BOOL && iValueSize > 0)
{
@@ -482,7 +482,7 @@ void CMusicInfoTagLoaderWMA::SetTagValueUnsigned(const CStdString& strFrameName,
}
}
-void CMusicInfoTagLoaderWMA::SetTagValueBinary(const CStdString& strFrameName, const unsigned char* pValue, CMusicInfoTag& tag)
+void CMusicInfoTagLoaderWMA::SetTagValueBinary(const CStdString& strFrameName, const unsigned char* pValue, CMusicInfoTag& tag, EmbeddedArt *art)
{
if (strFrameName == "WM/Picture")
{
View
4 xbmc/music/tags/MusicInfoTagLoaderWMA.h
@@ -31,12 +31,12 @@ class CMusicInfoTagLoaderWMA: public IMusicInfoTagLoader
CMusicInfoTagLoaderWMA(void);
virtual ~CMusicInfoTagLoaderWMA();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
protected:
void SetTagValueString(const CStdString& strFrameName, const CStdString& strValue, CMusicInfoTag& tag);
void SetTagValueUnsigned(const CStdString& strFrameName, uint32_t value, CMusicInfoTag& tag);
- void SetTagValueBinary(const CStdString& strFrameName, const unsigned char *pValue, CMusicInfoTag& tag);
+ void SetTagValueBinary(const CStdString& strFrameName, const unsigned char *pValue, CMusicInfoTag& tag, EmbeddedArt *art);
void SetTagValueBool(const CStdString& strFrameName, bool bValue, CMusicInfoTag& tag);
};
}
View
2  xbmc/music/tags/MusicInfoTagLoaderWav.cpp
@@ -32,7 +32,7 @@ CMusicInfoTagLoaderWAV::CMusicInfoTagLoaderWAV(void)
CMusicInfoTagLoaderWAV::~CMusicInfoTagLoaderWAV()
{}
-bool CMusicInfoTagLoaderWAV::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderWAV::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
try
{
View
2  xbmc/music/tags/MusicInfoTagLoaderWav.h
@@ -31,6 +31,6 @@ class CMusicInfoTagLoaderWAV: public IMusicInfoTagLoader
CMusicInfoTagLoaderWAV(void);
virtual ~CMusicInfoTagLoaderWAV();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
};
}
View
2  xbmc/music/tags/MusicInfoTagLoaderYM.cpp
@@ -34,7 +34,7 @@ CMusicInfoTagLoaderYM::~CMusicInfoTagLoaderYM()
{
}
-bool CMusicInfoTagLoaderYM::Load(const CStdString& strFileName, CMusicInfoTag& tag)
+bool CMusicInfoTagLoaderYM::Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art)
{
tag.SetLoaded(false);
View
2  xbmc/music/tags/MusicInfoTagLoaderYM.h
@@ -31,7 +31,7 @@ namespace MUSIC_INFO
CMusicInfoTagLoaderYM(void);
virtual ~CMusicInfoTagLoaderYM();
- virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag);
+ virtual bool Load(const CStdString& strFileName, CMusicInfoTag& tag, EmbeddedArt *art = NULL);
private:
void* m_ym;
DllStSound m_dll;
View
4 xbmc/music/tags/Tag.h
@@ -28,7 +28,7 @@ namespace MUSIC_INFO
class CTag
{
public:
- CTag(void) {}
+ CTag(void) { m_art = NULL; }
virtual ~CTag(void) {}
virtual bool Read(const CStdString& strFile) { m_musicInfoTag.SetURL(strFile); return false; }
virtual bool Write(const CStdString& strFile) { return false; }
@@ -36,9 +36,11 @@ class CTag
const CReplayGain &GetReplayGain() const { return m_replayGain; }
void GetMusicInfoTag(CMusicInfoTag& tag) const { tag=m_musicInfoTag; }
void SetMusicInfoTag(CMusicInfoTag& tag) { m_musicInfoTag=tag; }
+ void SetArt(EmbeddedArt *art) { m_art = art; }
protected:
CMusicInfoTag m_musicInfoTag;
+ EmbeddedArt* m_art;
CReplayGain m_replayGain;
};
}
Please sign in to comment.
Something went wrong with that request. Please try again.