From 96326cc3047236c63ccf5bc6865d24d24f095ad4 Mon Sep 17 00:00:00 2001 From: Michael Scire Date: Fri, 6 Mar 2020 05:21:48 -0800 Subject: [PATCH] ncm: employ kernel strats --- .../libstratosphere/include/stratosphere/lr.hpp | 1 + .../libstratosphere/include/stratosphere/ncm.hpp | 15 +++++++++------ .../include/stratosphere/ncm/ncm_auto_buffer.hpp | 1 - .../stratosphere/ncm}/ncm_content_id_utils.hpp | 3 +-- .../ncm}/ncm_content_manager_impl.hpp | 7 +++---- .../include/stratosphere/ncm/ncm_content_meta.hpp | 1 - .../ncm/ncm_content_meta_database.hpp | 1 - .../stratosphere/ncm/ncm_content_storage.hpp | 1 - .../stratosphere/ncm/ncm_i_content_manager.hpp | 1 - .../ncm/ncm_i_content_meta_database.hpp | 1 - .../stratosphere/ncm/ncm_i_content_storage.hpp | 1 - .../include/stratosphere/ncm}/ncm_make_path.hpp | 4 +--- .../include/stratosphere/ncm/ncm_path.hpp | 1 + .../stratosphere/ncm/ncm_rights_id_cache.hpp | 2 -- .../include/stratosphere/ncm/ncm_types.hpp | 1 - .../source/ncm}/ncm_content_id_utils.cpp | 2 +- .../source/ncm}/ncm_content_manager_impl.cpp | 9 ++++----- .../ncm}/ncm_content_meta_database_impl.cpp | 3 +-- .../ncm}/ncm_content_meta_database_impl.hpp | 2 -- .../ncm}/ncm_content_meta_database_impl_base.hpp | 1 - .../source/ncm}/ncm_content_storage_impl.cpp | 4 +--- .../source/ncm}/ncm_content_storage_impl.hpp | 6 +----- .../source/ncm}/ncm_content_storage_impl_base.hpp | 1 - .../libstratosphere/source/ncm}/ncm_fs_utils.cpp | 2 +- .../libstratosphere/source/ncm}/ncm_fs_utils.hpp | 2 -- .../libstratosphere/source/ncm}/ncm_make_path.cpp | 4 +--- .../ncm_on_memory_content_meta_database_impl.cpp | 2 +- .../ncm_on_memory_content_meta_database_impl.hpp | 2 -- .../source/ncm}/ncm_placeholder_accessor.cpp | 4 ++-- .../source/ncm}/ncm_placeholder_accessor.hpp | 5 ----- .../ncm}/ncm_read_only_content_storage_impl.cpp | 4 ++-- .../ncm}/ncm_read_only_content_storage_impl.hpp | 2 -- .../ncm/ncm_remote_content_manager_impl.hpp | 1 - .../ncm/ncm_remote_content_meta_database_impl.hpp | 1 - .../ncm/ncm_remote_content_storage_impl.hpp | 1 - stratosphere/ncm/source/ncm_main.cpp | 2 -- 36 files changed, 31 insertions(+), 70 deletions(-) rename {stratosphere/ncm/source => libraries/libstratosphere/include/stratosphere/ncm}/ncm_content_id_utils.hpp (96%) rename {stratosphere/ncm/source => libraries/libstratosphere/include/stratosphere/ncm}/ncm_content_manager_impl.hpp (97%) rename {stratosphere/ncm/source => libraries/libstratosphere/include/stratosphere/ncm}/ncm_make_path.hpp (97%) rename stratosphere/ncm/source/ncm_rights_cache.hpp => libraries/libstratosphere/include/stratosphere/ncm/ncm_rights_id_cache.hpp (99%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_content_id_utils.cpp (98%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_content_manager_impl.cpp (99%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_content_meta_database_impl.cpp (99%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_content_meta_database_impl.hpp (99%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_content_meta_database_impl_base.hpp (99%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_content_storage_impl.cpp (99%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_content_storage_impl.hpp (98%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_content_storage_impl_base.hpp (99%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_fs_utils.cpp (99%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_fs_utils.hpp (98%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_make_path.cpp (98%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_on_memory_content_meta_database_impl.cpp (98%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_on_memory_content_meta_database_impl.hpp (98%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_placeholder_accessor.cpp (99%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_placeholder_accessor.hpp (97%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_read_only_content_storage_impl.cpp (99%) rename {stratosphere/ncm/source => libraries/libstratosphere/source/ncm}/ncm_read_only_content_storage_impl.hpp (99%) diff --git a/libraries/libstratosphere/include/stratosphere/lr.hpp b/libraries/libstratosphere/include/stratosphere/lr.hpp index 06c365637..2c66e5dc4 100644 --- a/libraries/libstratosphere/include/stratosphere/lr.hpp +++ b/libraries/libstratosphere/include/stratosphere/lr.hpp @@ -18,3 +18,4 @@ #include #include #include +#include diff --git a/libraries/libstratosphere/include/stratosphere/ncm.hpp b/libraries/libstratosphere/include/stratosphere/ncm.hpp index 80ddb5ea3..9836497cc 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm.hpp @@ -16,9 +16,12 @@ #pragma once -#include "ncm/ncm_types.hpp" -#include "ncm/ncm_auto_buffer.hpp" -#include "ncm/ncm_content_meta.hpp" -#include "ncm/ncm_content_meta_database.hpp" -#include "ncm/ncm_content_storage.hpp" -#include "ncm/ncm_api.hpp" +#include +#include +#include +#include +#include +#include +#include +#include +#include diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_auto_buffer.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_auto_buffer.hpp index af2c2b54a..a01da6faa 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_auto_buffer.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_auto_buffer.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include diff --git a/stratosphere/ncm/source/ncm_content_id_utils.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_id_utils.hpp similarity index 96% rename from stratosphere/ncm/source/ncm_content_id_utils.hpp rename to libraries/libstratosphere/include/stratosphere/ncm/ncm_content_id_utils.hpp index aaa5608b2..91e4e6bb3 100644 --- a/stratosphere/ncm/source/ncm_content_id_utils.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_id_utils.hpp @@ -13,9 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include +#include namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_content_manager_impl.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_manager_impl.hpp similarity index 97% rename from stratosphere/ncm/source/ncm_content_manager_impl.hpp rename to libraries/libstratosphere/include/stratosphere/ncm/ncm_content_manager_impl.hpp index 27d1bd6c8..af88f6bbc 100644 --- a/stratosphere/ncm/source/ncm_content_manager_impl.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_manager_impl.hpp @@ -13,11 +13,10 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include "ncm_rights_cache.hpp" -#include "ncm_fs_utils.hpp" +#include +#include +#include namespace ams::ncm { diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta.hpp index e4184a80d..e8a3934a8 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta_database.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta_database.hpp index 1b28fce9a..3cb3d3879 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta_database.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_meta_database.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include #include diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_storage.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_storage.hpp index d9f3bc2ff..bd6e51f76 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_storage.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_content_storage.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include #include diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_manager.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_manager.hpp index 43071f864..87617cea1 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_manager.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_manager.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include #include diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_meta_database.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_meta_database.hpp index c19082c91..66c6064df 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_meta_database.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_meta_database.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include #include diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_storage.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_storage.hpp index d1321ca16..cd68010bf 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_storage.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_i_content_storage.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include #include diff --git a/stratosphere/ncm/source/ncm_make_path.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_make_path.hpp similarity index 97% rename from stratosphere/ncm/source/ncm_make_path.hpp rename to libraries/libstratosphere/include/stratosphere/ncm/ncm_make_path.hpp index b4419bfdc..eff6b36df 100644 --- a/stratosphere/ncm/source/ncm_make_path.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_make_path.hpp @@ -13,10 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include -#include +#include namespace ams::ncm { diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_path.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_path.hpp index 4c4d697a9..9179c474c 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_path.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_path.hpp @@ -18,6 +18,7 @@ #include #include #include +#include namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_rights_cache.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_rights_id_cache.hpp similarity index 99% rename from stratosphere/ncm/source/ncm_rights_cache.hpp rename to libraries/libstratosphere/include/stratosphere/ncm/ncm_rights_id_cache.hpp index 495e13c1e..70bc60d11 100644 --- a/stratosphere/ncm/source/ncm_rights_cache.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_rights_id_cache.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::ncm { diff --git a/libraries/libstratosphere/include/stratosphere/ncm/ncm_types.hpp b/libraries/libstratosphere/include/stratosphere/ncm/ncm_types.hpp index 912519b76..ec3c79320 100644 --- a/libraries/libstratosphere/include/stratosphere/ncm/ncm_types.hpp +++ b/libraries/libstratosphere/include/stratosphere/ncm/ncm_types.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include #include diff --git a/stratosphere/ncm/source/ncm_content_id_utils.cpp b/libraries/libstratosphere/source/ncm/ncm_content_id_utils.cpp similarity index 98% rename from stratosphere/ncm/source/ncm_content_id_utils.cpp rename to libraries/libstratosphere/source/ncm/ncm_content_id_utils.cpp index e91cca988..8de1ef24f 100644 --- a/stratosphere/ncm/source/ncm_content_id_utils.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_content_id_utils.cpp @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ -#include "ncm_content_id_utils.hpp" +#include namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_content_manager_impl.cpp b/libraries/libstratosphere/source/ncm/ncm_content_manager_impl.cpp similarity index 99% rename from stratosphere/ncm/source/ncm_content_manager_impl.cpp rename to libraries/libstratosphere/source/ncm/ncm_content_manager_impl.cpp index c65caaf7f..9162fa406 100644 --- a/stratosphere/ncm/source/ncm_content_manager_impl.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_content_manager_impl.cpp @@ -13,13 +13,12 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include "ncm_content_manager_impl.hpp" +#include +#include "ncm_content_storage_impl.hpp" +#include "ncm_read_only_content_storage_impl.hpp" #include "ncm_content_meta_database_impl.hpp" #include "ncm_on_memory_content_meta_database_impl.hpp" -#include "ncm_content_storage_impl.hpp" -#include "ncm_make_path.hpp" -#include "ncm_read_only_content_storage_impl.hpp" +#include "ncm_fs_utils.hpp" namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_content_meta_database_impl.cpp b/libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl.cpp similarity index 99% rename from stratosphere/ncm/source/ncm_content_meta_database_impl.cpp rename to libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl.cpp index 867c368f8..fed1745f5 100644 --- a/stratosphere/ncm/source/ncm_content_meta_database_impl.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl.cpp @@ -13,9 +13,8 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - +#include #include "ncm_content_meta_database_impl.hpp" -#include "ncm_content_id_utils.hpp" namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_content_meta_database_impl.hpp b/libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl.hpp similarity index 99% rename from stratosphere/ncm/source/ncm_content_meta_database_impl.hpp rename to libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl.hpp index ba86a2c33..deb267edd 100644 --- a/stratosphere/ncm/source/ncm_content_meta_database_impl.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include #include "ncm_content_meta_database_impl_base.hpp" diff --git a/stratosphere/ncm/source/ncm_content_meta_database_impl_base.hpp b/libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl_base.hpp similarity index 99% rename from stratosphere/ncm/source/ncm_content_meta_database_impl_base.hpp rename to libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl_base.hpp index 588f25c34..2d77b5947 100644 --- a/stratosphere/ncm/source/ncm_content_meta_database_impl_base.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_content_meta_database_impl_base.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include diff --git a/stratosphere/ncm/source/ncm_content_storage_impl.cpp b/libraries/libstratosphere/source/ncm/ncm_content_storage_impl.cpp similarity index 99% rename from stratosphere/ncm/source/ncm_content_storage_impl.cpp rename to libraries/libstratosphere/source/ncm/ncm_content_storage_impl.cpp index d2864f04c..466b9826a 100644 --- a/stratosphere/ncm/source/ncm_content_storage_impl.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_content_storage_impl.cpp @@ -13,11 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - +#include #include "ncm_content_storage_impl.hpp" #include "ncm_fs_utils.hpp" -#include "ncm_make_path.hpp" -#include "ncm_content_id_utils.hpp" namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_content_storage_impl.hpp b/libraries/libstratosphere/source/ncm/ncm_content_storage_impl.hpp similarity index 98% rename from stratosphere/ncm/source/ncm_content_storage_impl.hpp rename to libraries/libstratosphere/source/ncm/ncm_content_storage_impl.hpp index 3fbaccdc0..4d743c647 100644 --- a/stratosphere/ncm/source/ncm_content_storage_impl.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_content_storage_impl.hpp @@ -13,15 +13,11 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include "ncm_placeholder_accessor.hpp" -#include "ncm_rights_cache.hpp" #include "ncm_content_storage_impl_base.hpp" -#include "ncm_fs_utils.hpp" +#include "ncm_placeholder_accessor.hpp" namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_content_storage_impl_base.hpp b/libraries/libstratosphere/source/ncm/ncm_content_storage_impl_base.hpp similarity index 99% rename from stratosphere/ncm/source/ncm_content_storage_impl_base.hpp rename to libraries/libstratosphere/source/ncm/ncm_content_storage_impl_base.hpp index f28c6ec83..a8521edda 100644 --- a/stratosphere/ncm/source/ncm_content_storage_impl_base.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_content_storage_impl_base.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include diff --git a/stratosphere/ncm/source/ncm_fs_utils.cpp b/libraries/libstratosphere/source/ncm/ncm_fs_utils.cpp similarity index 99% rename from stratosphere/ncm/source/ncm_fs_utils.cpp rename to libraries/libstratosphere/source/ncm/ncm_fs_utils.cpp index c395893ce..86b8ba5bf 100644 --- a/stratosphere/ncm/source/ncm_fs_utils.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_fs_utils.cpp @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - +#include #include "ncm_fs_utils.hpp" namespace ams::ncm::impl { diff --git a/stratosphere/ncm/source/ncm_fs_utils.hpp b/libraries/libstratosphere/source/ncm/ncm_fs_utils.hpp similarity index 98% rename from stratosphere/ncm/source/ncm_fs_utils.hpp rename to libraries/libstratosphere/source/ncm/ncm_fs_utils.hpp index ea5e4d617..438b2bde2 100644 --- a/stratosphere/ncm/source/ncm_fs_utils.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_fs_utils.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include namespace ams::ncm::impl { diff --git a/stratosphere/ncm/source/ncm_make_path.cpp b/libraries/libstratosphere/source/ncm/ncm_make_path.cpp similarity index 98% rename from stratosphere/ncm/source/ncm_make_path.cpp rename to libraries/libstratosphere/source/ncm/ncm_make_path.cpp index d5d499f48..594f912e6 100644 --- a/stratosphere/ncm/source/ncm_make_path.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_make_path.cpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include "ncm_make_path.hpp" -#include "ncm_content_id_utils.hpp" +#include namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_on_memory_content_meta_database_impl.cpp b/libraries/libstratosphere/source/ncm/ncm_on_memory_content_meta_database_impl.cpp similarity index 98% rename from stratosphere/ncm/source/ncm_on_memory_content_meta_database_impl.cpp rename to libraries/libstratosphere/source/ncm/ncm_on_memory_content_meta_database_impl.cpp index 2c48a7641..33a5b3d8b 100644 --- a/stratosphere/ncm/source/ncm_on_memory_content_meta_database_impl.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_on_memory_content_meta_database_impl.cpp @@ -13,7 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - +#include #include "ncm_on_memory_content_meta_database_impl.hpp" namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_on_memory_content_meta_database_impl.hpp b/libraries/libstratosphere/source/ncm/ncm_on_memory_content_meta_database_impl.hpp similarity index 98% rename from stratosphere/ncm/source/ncm_on_memory_content_meta_database_impl.hpp rename to libraries/libstratosphere/source/ncm/ncm_on_memory_content_meta_database_impl.hpp index 2635da783..401ec8545 100644 --- a/stratosphere/ncm/source/ncm_on_memory_content_meta_database_impl.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_on_memory_content_meta_database_impl.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include #include "ncm_content_meta_database_impl.hpp" diff --git a/stratosphere/ncm/source/ncm_placeholder_accessor.cpp b/libraries/libstratosphere/source/ncm/ncm_placeholder_accessor.cpp similarity index 99% rename from stratosphere/ncm/source/ncm_placeholder_accessor.cpp rename to libraries/libstratosphere/source/ncm/ncm_placeholder_accessor.cpp index 2c7d42098..265fb2d6d 100644 --- a/stratosphere/ncm/source/ncm_placeholder_accessor.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_placeholder_accessor.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - +#include #include "ncm_placeholder_accessor.hpp" -#include "ncm_make_path.hpp" +#include "ncm_fs_utils.hpp" namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_placeholder_accessor.hpp b/libraries/libstratosphere/source/ncm/ncm_placeholder_accessor.hpp similarity index 97% rename from stratosphere/ncm/source/ncm_placeholder_accessor.hpp rename to libraries/libstratosphere/source/ncm/ncm_placeholder_accessor.hpp index be4a1d44f..487e81f44 100644 --- a/stratosphere/ncm/source/ncm_placeholder_accessor.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_placeholder_accessor.hpp @@ -13,14 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include -#include "ncm_fs_utils.hpp" -#include "ncm_make_path.hpp" - namespace ams::ncm { class PlaceHolderAccessor { diff --git a/stratosphere/ncm/source/ncm_read_only_content_storage_impl.cpp b/libraries/libstratosphere/source/ncm/ncm_read_only_content_storage_impl.cpp similarity index 99% rename from stratosphere/ncm/source/ncm_read_only_content_storage_impl.cpp rename to libraries/libstratosphere/source/ncm/ncm_read_only_content_storage_impl.cpp index 1e445fb66..c54505409 100644 --- a/stratosphere/ncm/source/ncm_read_only_content_storage_impl.cpp +++ b/libraries/libstratosphere/source/ncm/ncm_read_only_content_storage_impl.cpp @@ -13,9 +13,9 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - -#include "ncm_fs_utils.hpp" +#include #include "ncm_read_only_content_storage_impl.hpp" +#include "ncm_fs_utils.hpp" namespace ams::ncm { diff --git a/stratosphere/ncm/source/ncm_read_only_content_storage_impl.hpp b/libraries/libstratosphere/source/ncm/ncm_read_only_content_storage_impl.hpp similarity index 99% rename from stratosphere/ncm/source/ncm_read_only_content_storage_impl.hpp rename to libraries/libstratosphere/source/ncm/ncm_read_only_content_storage_impl.hpp index 357f2984e..74481bae8 100644 --- a/stratosphere/ncm/source/ncm_read_only_content_storage_impl.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_read_only_content_storage_impl.hpp @@ -13,9 +13,7 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once -#include #include #include "ncm_content_storage_impl_base.hpp" diff --git a/libraries/libstratosphere/source/ncm/ncm_remote_content_manager_impl.hpp b/libraries/libstratosphere/source/ncm/ncm_remote_content_manager_impl.hpp index 2baf990fd..ac96d40bd 100644 --- a/libraries/libstratosphere/source/ncm/ncm_remote_content_manager_impl.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_remote_content_manager_impl.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include #include "ncm_remote_content_storage_impl.hpp" diff --git a/libraries/libstratosphere/source/ncm/ncm_remote_content_meta_database_impl.hpp b/libraries/libstratosphere/source/ncm/ncm_remote_content_meta_database_impl.hpp index 83123a077..4317abffa 100644 --- a/libraries/libstratosphere/source/ncm/ncm_remote_content_meta_database_impl.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_remote_content_meta_database_impl.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include diff --git a/libraries/libstratosphere/source/ncm/ncm_remote_content_storage_impl.hpp b/libraries/libstratosphere/source/ncm/ncm_remote_content_storage_impl.hpp index 8e034ee5f..a7db1d4d9 100644 --- a/libraries/libstratosphere/source/ncm/ncm_remote_content_storage_impl.hpp +++ b/libraries/libstratosphere/source/ncm/ncm_remote_content_storage_impl.hpp @@ -13,7 +13,6 @@ * You should have received a copy of the GNU General Public License * along with this program. If not, see . */ - #pragma once #include diff --git a/stratosphere/ncm/source/ncm_main.cpp b/stratosphere/ncm/source/ncm_main.cpp index d3f67b13f..c94c51056 100644 --- a/stratosphere/ncm/source/ncm_main.cpp +++ b/stratosphere/ncm/source/ncm_main.cpp @@ -15,8 +15,6 @@ */ #include -#include -#include "ncm_content_manager_impl.hpp" extern "C" { extern u32 __start__;