From 3cb8aa05f8cee9e860cf83531682ff0ed4af6a4f Mon Sep 17 00:00:00 2001 From: manuel Date: Thu, 4 Mar 2021 23:36:40 +0100 Subject: sync with upstream --- .../include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h | 2 -- .../include/kodi/c-api/addon-instance/pvr/pvr_channels.h | 2 -- .../include/kodi/c-api/addon-instance/pvr/pvr_defines.h | 2 -- .../kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h | 2 -- .../kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h | 2 -- .../include/kodi/c-api/addon-instance/pvr/pvr_general.h | 9 +-------- .../include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h | 2 -- .../include/kodi/c-api/addon-instance/pvr/pvr_recordings.h | 2 -- .../include/kodi/c-api/addon-instance/pvr/pvr_stream.h | 9 +-------- .../include/kodi/c-api/addon-instance/pvr/pvr_timers.h | 2 -- 10 files changed, 2 insertions(+), 32 deletions(-) (limited to 'xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr') diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h index a24d27f..f8213fb 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channel_groups.h @@ -6,8 +6,6 @@ * See LICENSES/README.md for more information. */ -#pragma once - #ifndef C_API_ADDONINSTANCE_PVR_CHANNEL_GROUPS_H #define C_API_ADDONINSTANCE_PVR_CHANNEL_GROUPS_H diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h index 00daffa..a19fba1 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_channels.h @@ -6,8 +6,6 @@ * See LICENSES/README.md for more information. */ -#pragma once - #ifndef C_API_ADDONINSTANCE_PVR_CHANNELS_H #define C_API_ADDONINSTANCE_PVR_CHANNELS_H diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h index 449000f..a765121 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_defines.h @@ -6,8 +6,6 @@ * See LICENSES/README.md for more information. */ -#pragma once - #ifndef C_API_ADDONINSTANCE_PVR_DEFINES_H #define C_API_ADDONINSTANCE_PVR_DEFINES_H diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h index e7cdf06..c74a113 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_edl.h @@ -6,8 +6,6 @@ * See LICENSES/README.md for more information. */ -#pragma once - #ifndef C_API_ADDONINSTANCE_PVR_EDL_H #define C_API_ADDONINSTANCE_PVR_EDL_H diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h index d7512dc..2ed23cd 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_epg.h @@ -6,8 +6,6 @@ * See LICENSES/README.md for more information. */ -#pragma once - #ifndef C_API_ADDONINSTANCE_PVR_EPG_H #define C_API_ADDONINSTANCE_PVR_EPG_H diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h index e2136f6..b4470bb 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_general.h @@ -6,19 +6,12 @@ * See LICENSES/README.md for more information. */ -#pragma once - #ifndef C_API_ADDONINSTANCE_PVR_GENERAL_H #define C_API_ADDONINSTANCE_PVR_GENERAL_H +#include "../inputstream/stream_constants.h" #include "pvr_defines.h" -#ifdef BUILD_KODI_ADDON -#include "../../../InputStreamConstants.h" -#else -#include "cores/VideoPlayer/Interface/Addon/InputStreamConstants.h" -#endif - #include //¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯¯ diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h index 2ead263..e204311 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_menu_hook.h @@ -6,8 +6,6 @@ * See LICENSES/README.md for more information. */ -#pragma once - #ifndef C_API_ADDONINSTANCE_PVR_MENUHOOK_H #define C_API_ADDONINSTANCE_PVR_MENUHOOK_H diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h index 2e2c081..0bbfe57 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_recordings.h @@ -6,8 +6,6 @@ * See LICENSES/README.md for more information. */ -#pragma once - #ifndef C_API_ADDONINSTANCE_PVR_RECORDINGS_H #define C_API_ADDONINSTANCE_PVR_RECORDINGS_H diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h index 1206c67..aaca30e 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_stream.h @@ -6,19 +6,12 @@ * See LICENSES/README.md for more information. */ -#pragma once - #ifndef C_API_ADDONINSTANCE_PVR_STREAM_H #define C_API_ADDONINSTANCE_PVR_STREAM_H +#include "../inputstream/demux_packet.h" #include "pvr_defines.h" -#ifdef BUILD_KODI_ADDON -#include "../../../DemuxPacket.h" -#else -#include "cores/VideoPlayer/Interface/Addon/DemuxPacket.h" -#endif - #include #include diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h index 209726d..a4b53d6 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/addon-instance/pvr/pvr_timers.h @@ -6,8 +6,6 @@ * See LICENSES/README.md for more information. */ -#pragma once - #ifndef C_API_ADDONINSTANCE_PVR_TIMERS_H #define C_API_ADDONINSTANCE_PVR_TIMERS_H -- cgit v1.2.3