diff options
| author | Memphiz <memphis@machzwo.de> | 2011-11-14 18:40:30 +0100 |
|---|---|---|
| committer | Memphiz <memphis@machzwo.de> | 2011-11-14 18:42:02 +0100 |
| commit | e6f9da4f155696c4f5d235e120695f99145a7998 (patch) | |
| tree | d704276049d093f1a29ebc528c2ac23f8bb5f4e5 | |
| parent | ac22b7fd85088f2bf386c5445d3521022af9e72e (diff) | |
[cleanup] - remove check for ARMEL_ define. Its not defined on ios - so we consider this code arm proof ...
| -rw-r--r-- | xbmc/music/tags/MusicInfoTagLoaderMP3.cpp | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/xbmc/music/tags/MusicInfoTagLoaderMP3.cpp b/xbmc/music/tags/MusicInfoTagLoaderMP3.cpp index dc1e618047..5cb6b240ae 100644 --- a/xbmc/music/tags/MusicInfoTagLoaderMP3.cpp +++ b/xbmc/music/tags/MusicInfoTagLoaderMP3.cpp @@ -87,7 +87,6 @@ bool CMusicInfoTagLoaderMP3::Load(const CStdString& strFileName, CMusicInfoTag& m_replayGainInfo=id3tag.GetReplayGain(); } -#ifndef ARMEL_ // TODO this will probably be OK next time we sync to trunk // Check for an APEv2 tag CAPEv2Tag apeTag; if (PrioritiseAPETags() && apeTag.ReadTag(strFileName.c_str())) @@ -136,7 +135,7 @@ bool CMusicInfoTagLoaderMP3::Load(const CStdString& strFileName, CMusicInfoTag& if (apeTag.GetRating() > '0') tag.SetRating(apeTag.GetRating()); } -#endif + tag.SetDuration(ReadDuration(strFileName)); return tag.Loaded(); @@ -152,7 +151,6 @@ bool CMusicInfoTagLoaderMP3::Load(const CStdString& strFileName, CMusicInfoTag& bool CMusicInfoTagLoaderMP3::ReadSeekAndReplayGainInfo(const CStdString &strFileName) { -#ifndef ARMEL_ // TODO this will probably be OK next time we sync to trunk // First check for an APEv2 tag CAPEv2Tag apeTag; if (apeTag.ReadTag(strFileName.c_str())) @@ -160,7 +158,7 @@ bool CMusicInfoTagLoaderMP3::ReadSeekAndReplayGainInfo(const CStdString &strFile if (apeTag.GetReplayGain().iHasGainInfo) m_replayGainInfo = apeTag.GetReplayGain(); } -#endif + if (!m_replayGainInfo.iHasGainInfo) { // Nothing found query id3 tag CID3Tag id3tag; |