[Pictures] Move metadata extraction to metadata folder

xbmc · Jun 22, 2024 · 430afbf · 430afbf
1 parent 0c1d7e8
commit 430afbf
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 7 deletions.
diff --git a/cmake/treedata/common/subdirs.txt b/cmake/treedata/common/subdirs.txt
@@ -21,6 +21,7 @@ xbmc/imagefiles imagefiles
 xbmc/messaging messaging
 xbmc/messaging/helpers messagingHelpers
 xbmc/pictures pictures
+xbmc/pictures/metadata pictures_metadata
 xbmc/platform platform
 xbmc/playlists playlists
 xbmc/powermanagement powermanagement

diff --git a/xbmc/pictures/CMakeLists.txt b/xbmc/pictures/CMakeLists.txt
@@ -2,7 +2,6 @@ set(SOURCES GUIDialogPictureInfo.cpp
  GUIViewStatePictures.cpp
  GUIWindowPictures.cpp
  GUIWindowSlideShow.cpp
- ImageMetadataParser.cpp
  Picture.cpp
  PictureFolderImageFileLoader.cpp
  PictureInfoLoader.cpp
@@ -13,14 +12,10 @@ set(SOURCES GUIDialogPictureInfo.cpp
  SlideShowPicture.cpp)
 
 set(HEADERS interfaces/ISlideShowDelegate.h
- Exif.h
  GUIDialogPictureInfo.h
  GUIViewStatePictures.h
  GUIWindowPictures.h
  GUIWindowSlideShow.h
- ImageMetadata.h
- ImageMetadataParser.h
- Iptc.h
  Picture.h
  PictureFolderImageFileLoader.h
  PictureInfoLoader.h

diff --git a/xbmc/pictures/PictureInfoTag.cpp b/xbmc/pictures/PictureInfoTag.cpp
@@ -8,12 +8,12 @@
 
 #include "PictureInfoTag.h"
 
-#include "ImageMetadataParser.h"
 #include "ServiceBroker.h"
 #include "addons/ExtsMimeSupportList.h"
 #include "addons/ImageDecoder.h"
 #include "addons/addoninfo/AddonType.h"
 #include "guilib/guiinfo/GUIInfoLabels.h"
+#include "pictures/metadata/ImageMetadataParser.h"
 #include "utils/Archive.h"
 #include "utils/CharsetConverter.h"
 #include "utils/StringUtils.h"

diff --git a/xbmc/pictures/PictureInfoTag.h b/xbmc/pictures/PictureInfoTag.h
@@ -8,8 +8,8 @@
 
 #pragma once
 
-#include "ImageMetadata.h"
 #include "XBDateTime.h"
+#include "pictures/metadata/ImageMetadata.h"
 #include "utils/IArchivable.h"
 #include "utils/ISerializable.h"
 #include "utils/ISortable.h"

diff --git a/xbmc/pictures/metadata/CMakeLists.txt b/xbmc/pictures/metadata/CMakeLists.txt
@@ -0,0 +1,8 @@
+set(SOURCES ImageMetadataParser.cpp)
+
+set(HEADERS Exif.h
+ ImageMetadata.h
+ ImageMetadataParser.h
+ Iptc.h)
+
+core_add_library(pictures_metadata)
diff --git a/xbmc/pictures/Exif.h → xbmc/pictures/metadata/Exif.h b/xbmc/pictures/Exif.h → xbmc/pictures/metadata/Exif.h
diff --git a/xbmc/pictures/ImageMetadata.h → xbmc/pictures/metadata/ImageMetadata.h b/xbmc/pictures/ImageMetadata.h → xbmc/pictures/metadata/ImageMetadata.h
diff --git a/xbmc/pictures/ImageMetadataParser.cpp → ...pictures/metadata/ImageMetadataParser.cpp b/xbmc/pictures/ImageMetadataParser.cpp → ...pictures/metadata/ImageMetadataParser.cpp
diff --git a/xbmc/pictures/ImageMetadataParser.h → xbmc/pictures/metadata/ImageMetadataParser.h b/xbmc/pictures/ImageMetadataParser.h → xbmc/pictures/metadata/ImageMetadataParser.h
diff --git a/xbmc/pictures/Iptc.h → xbmc/pictures/metadata/Iptc.h b/xbmc/pictures/Iptc.h → xbmc/pictures/metadata/Iptc.h