aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Kodi.xcodeproj/project.pbxproj2
-rw-r--r--project/VS2010Express/XBMC.vcxproj3
-rw-r--r--project/VS2010Express/XBMC.vcxproj.filters8
-rw-r--r--xbmc/Application.cpp1
-rw-r--r--xbmc/music/Album.cpp1
-rw-r--r--xbmc/music/CueInfoLoader.cpp1
-rw-r--r--xbmc/music/EmbeddedArt.h60
-rw-r--r--xbmc/music/Song.h3
-rw-r--r--xbmc/music/tags/MusicInfoTag.h24
9 files changed, 76 insertions, 27 deletions
diff --git a/Kodi.xcodeproj/project.pbxproj b/Kodi.xcodeproj/project.pbxproj
index 8de4619527..13c4f68c8b 100644
--- a/Kodi.xcodeproj/project.pbxproj
+++ b/Kodi.xcodeproj/project.pbxproj
@@ -3554,6 +3554,7 @@
38F4E56E13CCCB3B00664821 /* ThreadLocal.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ThreadLocal.h; sourceTree = "<group>"; };
395897131AAD94F00033D27C /* KeyboardLayoutManager.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = KeyboardLayoutManager.cpp; sourceTree = "<group>"; };
395897141AAD94F00033D27C /* KeyboardLayoutManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = KeyboardLayoutManager.h; sourceTree = "<group>"; };
+ 395938731AC28F5A0053A590 /* EmbeddedArt.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = EmbeddedArt.h; sourceTree = "<group>"; };
395C29BA1A94733100EBC7AD /* Key.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Key.cpp; sourceTree = "<group>"; };
395C29BB1A94733100EBC7AD /* Key.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Key.h; sourceTree = "<group>"; };
395C29BF1A98A0A000EBC7AD /* Webinterface.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = Webinterface.cpp; sourceTree = "<group>"; };
@@ -6183,6 +6184,7 @@
880DBE4A0DC223FF00E26B71 /* Artist.h */,
5EB3113A1A978B9B00551907 /* CueInfoLoader.cpp */,
5EB3113B1A978B9B00551907 /* CueInfoLoader.h */,
+ 395938731AC28F5A0053A590 /* EmbeddedArt.h */,
E38E17FB0D25F9FA00618676 /* GUIViewStateMusic.cpp */,
E38E17FC0D25F9FA00618676 /* GUIViewStateMusic.h */,
E38E1D8F0D25F9FD00618676 /* MusicDatabase.cpp */,
diff --git a/project/VS2010Express/XBMC.vcxproj b/project/VS2010Express/XBMC.vcxproj
index abb13c5c32..2e039311a0 100644
--- a/project/VS2010Express/XBMC.vcxproj
+++ b/project/VS2010Express/XBMC.vcxproj
@@ -957,6 +957,7 @@
<ClInclude Include="..\..\xbmc\interfaces\python\pythreadstate.h" />
<ClInclude Include="..\..\xbmc\media\MediaType.h" />
<ClInclude Include="..\..\xbmc\music\CueInfoLoader.h" />
+ <ClInclude Include="..\..\xbmc\music\EmbeddedArt.h" />
<ClInclude Include="..\..\xbmc\music\karaoke\karaokevideobackground.h" />
<ClInclude Include="..\..\xbmc\music\tags\ReplayGain.h" />
<ClInclude Include="..\..\xbmc\network\httprequesthandler\HTTPFileHandler.h" />
@@ -2547,4 +2548,4 @@
</VisualStudio>
</ProjectExtensions>
<Import Project="$(SolutionDir)\$(ProjectFileName).targets.user" Condition="Exists('$(SolutionDir)\$(ProjectFileName).targets.user')" />
-</Project>
+</Project> \ No newline at end of file
diff --git a/project/VS2010Express/XBMC.vcxproj.filters b/project/VS2010Express/XBMC.vcxproj.filters
index e7d99df078..8b482e09ea 100644
--- a/project/VS2010Express/XBMC.vcxproj.filters
+++ b/project/VS2010Express/XBMC.vcxproj.filters
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
<Project ToolsVersion="4.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
<ItemGroup>
<Filter Include="win32">
@@ -3092,6 +3092,7 @@
<ClCompile Include="..\..\xbmc\music\CueInfoLoader.cpp">
<Filter>music</Filter>
</ClCompile>
+ <ClCompile Include="..\..\xbmc\filesystem\NFSDirectory.cpp" />
</ItemGroup>
<ItemGroup>
<ClInclude Include="..\..\xbmc\win32\pch.h">
@@ -5982,6 +5983,9 @@
<ClInclude Include="..\..\xbmc\input\KeyboardLayoutManager.h">
<Filter>input</Filter>
</ClInclude>
+ <ClInclude Include="..\..\xbmc\music\EmbeddedArt.h">
+ <Filter>music</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<ResourceCompile Include="..\..\xbmc\win32\XBMC_PC.rc">
@@ -6027,4 +6031,4 @@
<Filter>interfaces\swig</Filter>
</CustomBuild>
</ItemGroup>
-</Project>
+</Project> \ No newline at end of file
diff --git a/xbmc/Application.cpp b/xbmc/Application.cpp
index d88b9c5ca5..9170658a12 100644
--- a/xbmc/Application.cpp
+++ b/xbmc/Application.cpp
@@ -190,6 +190,7 @@
#include "utils/XMLUtils.h"
#include "addons/AddonInstaller.h"
#include "addons/AddonManager.h"
+#include "music/tags/MusicInfoTag.h"
#include "music/tags/MusicInfoTagLoaderFactory.h"
#include "CompileInfo.h"
diff --git a/xbmc/music/Album.cpp b/xbmc/music/Album.cpp
index b91363707a..1114175c2a 100644
--- a/xbmc/music/Album.cpp
+++ b/xbmc/music/Album.cpp
@@ -19,6 +19,7 @@
*/
#include "Album.h"
+#include "music/tags/MusicInfoTag.h"
#include "settings/AdvancedSettings.h"
#include "utils/StringUtils.h"
#include "utils/XMLUtils.h"
diff --git a/xbmc/music/CueInfoLoader.cpp b/xbmc/music/CueInfoLoader.cpp
index f81fee7575..9c2f16326c 100644
--- a/xbmc/music/CueInfoLoader.cpp
+++ b/xbmc/music/CueInfoLoader.cpp
@@ -18,6 +18,7 @@
*
*/
#include "CueInfoLoader.h"
+#include "music/tags/MusicInfoTag.h"
void CueInfoLoader::Load(const std::string& aStrCuesheet, CFileItemPtr aFileItem)
{
diff --git a/xbmc/music/EmbeddedArt.h b/xbmc/music/EmbeddedArt.h
new file mode 100644
index 0000000000..55bf2bb25a
--- /dev/null
+++ b/xbmc/music/EmbeddedArt.h
@@ -0,0 +1,60 @@
+#pragma once
+/*
+* Copyright (C) 2015 Team XBMC
+* http://xbmc.org
+*
+* This Program is free software; you can redistribute it and/or modify
+* it under the terms of the GNU General Public License as published by
+* the Free Software Foundation; either version 2, or (at your option)
+* any later version.
+*
+* This Program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with XBMC; see the file COPYING. If not, see
+* <http://www.gnu.org/licenses/>.
+*
+*/
+
+#include <stdint.h>
+#include <string>
+#include <vector>
+
+#include "utils/IArchivable.h"
+
+namespace MUSIC_INFO
+{
+ class EmbeddedArtInfo : public IArchivable
+ {
+ public:
+ EmbeddedArtInfo() { }
+ EmbeddedArtInfo(size_t size, const std::string &mime);
+ ~EmbeddedArtInfo() { }
+
+ // implementation of IArchivable
+ virtual void Archive(CArchive& ar);
+
+ void set(size_t size, const std::string &mime);
+ void clear();
+ bool empty() const;
+ bool matches(const EmbeddedArtInfo &right) const;
+
+ size_t size;
+ std::string mime;
+ };
+
+ class EmbeddedArt : public EmbeddedArtInfo
+ {
+ public:
+ EmbeddedArt() { }
+ EmbeddedArt(const uint8_t *data, size_t size, const std::string &mime);
+ ~EmbeddedArt() { }
+
+ void set(const uint8_t *data, size_t size, const std::string &mime);
+
+ std::vector<uint8_t> data;
+ };
+} \ No newline at end of file
diff --git a/xbmc/music/Song.h b/xbmc/music/Song.h
index c32be05e21..a58a693677 100644
--- a/xbmc/music/Song.h
+++ b/xbmc/music/Song.h
@@ -25,7 +25,8 @@
#include "utils/ISerializable.h"
#include "XBDateTime.h"
-#include "music/tags/MusicInfoTag.h" // for EmbeddedArt
+#include "music/EmbeddedArt.h"
+#include "music/tags/ReplayGain.h"
#include "Artist.h"
#include <map>
#include <string>
diff --git a/xbmc/music/tags/MusicInfoTag.h b/xbmc/music/tags/MusicInfoTag.h
index 7c861b4497..a2b63d8593 100644
--- a/xbmc/music/tags/MusicInfoTag.h
+++ b/xbmc/music/tags/MusicInfoTag.h
@@ -27,6 +27,7 @@ class CArtist;
#include <string>
#include <stdint.h>
+#include "music/EmbeddedArt.h"
#include "utils/IArchivable.h"
#include "utils/ISerializable.h"
#include "utils/ISortable.h"
@@ -36,29 +37,6 @@ class CArtist;
namespace MUSIC_INFO
{
- class EmbeddedArtInfo : public IArchivable
- {
- public:
- EmbeddedArtInfo() {};
- EmbeddedArtInfo(size_t size, const std::string &mime);
- void set(size_t size, const std::string &mime);
- void clear();
- bool empty() const;
- bool matches(const EmbeddedArtInfo &right) const;
- virtual void Archive(CArchive& ar);
- size_t size;
- std::string mime;
- };
-
- class EmbeddedArt : public EmbeddedArtInfo
- {
- public:
- EmbeddedArt() {};
- EmbeddedArt(const uint8_t *data, size_t size, const std::string &mime);
- void set(const uint8_t *data, size_t size, const std::string &mime);
- std::vector<uint8_t> data;
- };
-
class CMusicInfoTag : public IArchivable, public ISerializable, public ISortable
{
public:
generated by cgit v1.2.3 (git 2.26.2) at 2024-12-18 18:33:23 +0000