diff --git a/xbmc/addons/interface/api/addon-instance/audiodecoder.cpp b/xbmc/addons/interface/api/addon-instance/audiodecoder.cpp index 443607ea17b59..b43167018e91f 100644 --- a/xbmc/addons/interface/api/addon-instance/audiodecoder.cpp +++ b/xbmc/addons/interface/api/addon-instance/audiodecoder.cpp @@ -65,7 +65,7 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::HandleMessage(int funcGroup, KODI_ADDON_AUDIODECODER_HDL CHdl_kodi_addoninstance_audiodecoder_h:: kodi_addon_audiodecoder_create_v1(KODI_OWN_HDL kodi_hdl) { - // Original API call: typedef KODI_ADDON_AUDIODECODER_HDL(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_CREATE_V1)(KODI_OWN_HDL kodi_hdl); + // Original API call: typedef KODI_ADDON_AUDIODECODER_HDL(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_CREATE_V1)( KODI_OWN_HDL kodi_hdl); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_create_v1; /* Autogenerated */ // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_create_v1; /* Autogenerated */ @@ -90,7 +90,7 @@ KODI_ADDON_AUDIODECODER_HDL CHdl_kodi_addoninstance_audiodecoder_h:: void CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_destroy_v1( KODI_ADDON_AUDIODECODER_HDL hdl) { - // Original API call: typedef void(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_DESTROY_V1)(KODI_ADDON_AUDIODECODER_HDL hdl); + // Original API call: typedef void(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_DESTROY_V1)( KODI_ADDON_AUDIODECODER_HDL hdl); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_destroy_v1; /* Autogenerated */ // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_destroy_v1; /* Autogenerated */ @@ -108,6 +108,33 @@ void CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_destroy_v1( m_ifcToAddon->kodi_addon_audiodecoder_destroy_v1(m_ifcToAddon->thisClassHdl, hdl); } +bool CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_can_operate_file_v1( + const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file) +{ + // Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_CAN_OPERATE_FILE_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file); + // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_can_operate_file_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_can_operate_file_v1; /* Autogenerated */ + +#ifndef KODI_INHIBIT_SHARED + if (!m_interface.m_directDll) + { + msgpack::sbuffer in; + msgpack::sbuffer out; + msgpack::pack(in, + msgChild__IN_kodi_addon_audiodecoder_can_operate_file_v1(PtrValue(hdl), file)); + if (!m_process->SendMessage(funcGroup_addoninstance_audiodecoder_h, + funcChild_kodi_addon_audiodecoder_can_operate_file_v1, in, out)) + return false; + msgpack::unpacked ident = msgpack::unpack(out.data(), out.size()); + msgChild_OUT_kodi_addon_audiodecoder_can_operate_file_v1 t = ident.get().as(); + return std::get<0>(t); + } +#endif /* !KODI_INHIBIT_SHARED */ + + return m_ifcToAddon->kodi_addon_audiodecoder_can_operate_file_v1(m_ifcToAddon->thisClassHdl, hdl, + file); +} + bool CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_init_v1( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, @@ -120,7 +147,7 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_init_v1( enum AudioEngineDataFormat* format, enum AudioEngineChannel info[AUDIOENGINE_CH_MAX]) { - // Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_INIT_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, unsigned int filecache, int* channels, int* samplerate, int* bitspersample, int64_t* totaltime, int* bitrate, enum AudioEngineDataFormat* format, enum AudioEngineChannel info[AUDIOENGINE_CH_MAX]); + // Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_INIT_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, unsigned int filecache, int* channels, int* samplerate, int* bitspersample, int64_t* totaltime, int* bitrate, enum AudioEngineDataFormat* format, enum AudioEngineChannel info[AUDIOENGINE_CH_MAX]); // Tuple in: typedef std::tuple> msgChild__IN_kodi_addon_audiodecoder_init_v1; /* Autogenerated */ // Tuple out: typedef std::tuple> msgChild_OUT_kodi_addon_audiodecoder_init_v1; /* Autogenerated */ @@ -158,7 +185,7 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_init_v1( int CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_read_pcm_v1( const KODI_ADDON_AUDIODECODER_HDL hdl, uint8_t* buffer, size_t size, size_t* actualsize) { - // Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_PCM_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, uint8_t* buffer, size_t size, size_t* actualsize); + // Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_PCM_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, uint8_t* buffer, size_t size, size_t* actualsize); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_read_pcm_v1; /* Autogenerated */ // Tuple out: typedef std::tuple, size_t> msgChild_OUT_kodi_addon_audiodecoder_read_pcm_v1; /* Autogenerated */ @@ -187,7 +214,7 @@ int CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_read_pcm_v1( int64_t CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_seek_v1( const KODI_ADDON_AUDIODECODER_HDL hdl, int64_t time) { - // Original API call: typedef int64_t(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_SEEK_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, int64_t time); + // Original API call: typedef int64_t(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_SEEK_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, int64_t time); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_seek_v1; /* Autogenerated */ // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_seek_v1; /* Autogenerated */ @@ -210,11 +237,13 @@ int64_t CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_seek_v1( } bool CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_read_tag_v1( - const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, struct AUDIODECODER_INFO_TAG* tag) + const KODI_ADDON_AUDIODECODER_HDL hdl, + const char* file, + struct KODI_ADDON_AUDIODECODER_INFO_TAG* tag) { - // Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_TAG_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, struct AUDIODECODER_INFO_TAG* tag); + // Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_TAG_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, struct KODI_ADDON_AUDIODECODER_INFO_TAG* tag); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_read_tag_v1; /* Autogenerated */ - // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_read_tag_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_read_tag_v1; /* Autogenerated */ #ifndef KODI_INHIBIT_SHARED if (!m_interface.m_directDll) @@ -239,7 +268,7 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_read_tag_v1 int CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_track_count_v1( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file) { - // Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_TRACK_COUNT_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file); + // Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_TRACK_COUNT_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_track_count_v1; /* Autogenerated */ // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_track_count_v1; /* Autogenerated */ diff --git a/xbmc/addons/interface/api/addon-instance/audiodecoder.h b/xbmc/addons/interface/api/addon-instance/audiodecoder.h index fa303e8f0b83f..b8a7572106fc4 100644 --- a/xbmc/addons/interface/api/addon-instance/audiodecoder.h +++ b/xbmc/addons/interface/api/addon-instance/audiodecoder.h @@ -57,6 +57,9 @@ class CHdl_kodi_addoninstance_audiodecoder_h : public IMsgHdl void kodi_addon_audiodecoder_destroy_v1(KODI_ADDON_AUDIODECODER_HDL hdl); // Added with API 1 + bool kodi_addon_audiodecoder_can_operate_file_v1(const KODI_ADDON_AUDIODECODER_HDL hdl, + const char* file); // Added with API 1 + bool kodi_addon_audiodecoder_init_v1( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, @@ -77,9 +80,10 @@ class CHdl_kodi_addoninstance_audiodecoder_h : public IMsgHdl int64_t kodi_addon_audiodecoder_seek_v1(const KODI_ADDON_AUDIODECODER_HDL hdl, int64_t time); // Added with API 1 - bool kodi_addon_audiodecoder_read_tag_v1(const KODI_ADDON_AUDIODECODER_HDL hdl, - const char* file, - struct AUDIODECODER_INFO_TAG* tag); // Added with API 1 + bool kodi_addon_audiodecoder_read_tag_v1( + const KODI_ADDON_AUDIODECODER_HDL hdl, + const char* file, + struct KODI_ADDON_AUDIODECODER_INFO_TAG* tag); // Added with API 1 int kodi_addon_audiodecoder_track_count_v1(const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file); // Added with API 1 diff --git a/xbmc/addons/interface/api/addon-instance/pvr.cpp b/xbmc/addons/interface/api/addon-instance/pvr.cpp index a630b7c0a65e9..7dd85baf189f7 100644 --- a/xbmc/addons/interface/api/addon-instance/pvr.cpp +++ b/xbmc/addons/interface/api/addon-instance/pvr.cpp @@ -45,6 +45,7 @@ void CHdl_kodi_addoninstance_pvr_h::InitDirect(directFuncToKodi_addoninstance_pv ifcToKodi->kodi_addon_pvr_connection_state_change_v1 = kodi_addon_pvr_connection_state_change_v1; ifcToKodi->kodi_addon_pvr_epg_event_state_change_v1 = kodi_addon_pvr_epg_event_state_change_v1; ifcToKodi->kodi_addon_pvr_transfer_channel_entry_v1 = kodi_addon_pvr_transfer_channel_entry_v1; + ifcToKodi->kodi_addon_pvr_transfer_provider_entry_v1 = kodi_addon_pvr_transfer_provider_entry_v1; ifcToKodi->kodi_addon_pvr_transfer_channel_group_v1 = kodi_addon_pvr_transfer_channel_group_v1; ifcToKodi->kodi_addon_pvr_transfer_channel_group_member_v1 = kodi_addon_pvr_transfer_channel_group_member_v1; @@ -53,6 +54,8 @@ void CHdl_kodi_addoninstance_pvr_h::InitDirect(directFuncToKodi_addoninstance_pv kodi_addon_pvr_transfer_recording_entry_v1; ifcToKodi->kodi_addon_pvr_transfer_timer_entry_v1 = kodi_addon_pvr_transfer_timer_entry_v1; ifcToKodi->kodi_addon_pvr_trigger_channel_update_v1 = kodi_addon_pvr_trigger_channel_update_v1; + ifcToKodi->kodi_addon_pvr_trigger_providers_update_v1 = + kodi_addon_pvr_trigger_providers_update_v1; ifcToKodi->kodi_addon_pvr_trigger_channel_groups_update_v1 = kodi_addon_pvr_trigger_channel_groups_update_v1; ifcToKodi->kodi_addon_pvr_trigger_epg_update_v1 = kodi_addon_pvr_trigger_epg_update_v1; @@ -159,6 +162,20 @@ bool CHdl_kodi_addoninstance_pvr_h::HandleMessage(int funcGroup, kodi_addon_pvr_transfer_channel_entry_v1(this, hdl, handle, &chan); return true; } + case funcParent_kodi_addon_pvr_transfer_provider_entry_v1: + { + // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_transfer_provider_entry( KODI_OWN_HDL hdl, const KODI_ADDON_PVR_TRANSFER_HDL handle, const struct PVR_PROVIDER* chanProvider) __INTRODUCED_IN_KODI(1); + // Tuple in: typedef std::tuple msgParent__IN_kodi_addon_pvr_transfer_provider_entry_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgParent_OUT_kodi_addon_pvr_transfer_provider_entry_v1; /* Autogenerated */ + msgParent__IN_kodi_addon_pvr_transfer_provider_entry_v1 t = in.get().as(); + PVR_PROVIDER chanProvider; + KODI_OWN_HDL hdl = reinterpret_cast(std::get<0>(t)); + const KODI_ADDON_PVR_TRANSFER_HDL handle = + reinterpret_cast(std::get<1>(t)); + std::get<2>(t).SetCStructure(&chanProvider); + kodi_addon_pvr_transfer_provider_entry_v1(this, hdl, handle, &chanProvider); + return true; + } case funcParent_kodi_addon_pvr_transfer_channel_group_v1: { // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_transfer_channel_group( KODI_OWN_HDL hdl, const KODI_ADDON_PVR_TRANSFER_HDL handle, const struct PVR_CHANNEL_GROUP* group) __INTRODUCED_IN_KODI(1); @@ -239,6 +256,16 @@ bool CHdl_kodi_addoninstance_pvr_h::HandleMessage(int funcGroup, kodi_addon_pvr_trigger_channel_update_v1(this, hdl); return true; } + case funcParent_kodi_addon_pvr_trigger_providers_update_v1: + { + // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_trigger_providers_update(KODI_OWN_HDL hdl) __INTRODUCED_IN_KODI(1); + // Tuple in: typedef std::tuple msgParent__IN_kodi_addon_pvr_trigger_providers_update_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgParent_OUT_kodi_addon_pvr_trigger_providers_update_v1; /* Autogenerated */ + msgParent__IN_kodi_addon_pvr_trigger_providers_update_v1 t = in.get().as(); + KODI_OWN_HDL hdl = reinterpret_cast(std::get<0>(t)); + kodi_addon_pvr_trigger_providers_update_v1(this, hdl); + return true; + } case funcParent_kodi_addon_pvr_trigger_channel_groups_update_v1: { // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_trigger_channel_groups_update(KODI_OWN_HDL hdl) __INTRODUCED_IN_KODI(1); @@ -624,6 +651,59 @@ enum PVR_ERROR CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_get_descramble_info channel_uid, descramble_info); } +enum PVR_ERROR CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_get_providers_amount_v1( + KODI_ADDON_PVR_HDL hdl, int* amount) +{ + // Original API call: typedef enum PVR_ERROR(ATTR_APIENTRYP PFN_KODI_ADDON_PVR_GET_PROVIDERS_AMOUNT_V1)( KODI_ADDON_PVR_HDL hdl, int* amount); + // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_pvr_get_providers_amount_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_pvr_get_providers_amount_v1; /* Autogenerated */ + +#ifndef KODI_INHIBIT_SHARED + if (!m_interface.m_directDll) + { + msgpack::sbuffer in; + msgpack::sbuffer out; + msgpack::pack(in, msgChild__IN_kodi_addon_pvr_get_providers_amount_v1(PtrValue(hdl), *amount)); + if (!m_process->SendMessage(funcGroup_addoninstance_pvr_h, + funcChild_kodi_addon_pvr_get_providers_amount_v1, in, out)) + return PVR_ERROR_NO_ERROR; + msgpack::unpacked ident = msgpack::unpack(out.data(), out.size()); + msgChild_OUT_kodi_addon_pvr_get_providers_amount_v1 t = ident.get().as(); + *amount = std::get<1>(t); + return std::get<0>(t); + } +#endif /* !KODI_INHIBIT_SHARED */ + + return m_ifcToAddon->kodi_addon_pvr_get_providers_amount_v1(m_ifcToAddon->thisClassHdl, hdl, + amount); +} + +enum PVR_ERROR CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_get_providers_v1( + KODI_ADDON_PVR_HDL hdl, KODI_ADDON_PVR_TRANSFER_HDL handle) +{ + // Original API call: typedef enum PVR_ERROR(ATTR_APIENTRYP PFN_KODI_ADDON_PVR_GET_PROVIDERS_V1)( KODI_ADDON_PVR_HDL hdl, KODI_ADDON_PVR_TRANSFER_HDL handle); + // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_pvr_get_providers_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_pvr_get_providers_v1; /* Autogenerated */ + +#ifndef KODI_INHIBIT_SHARED + if (!m_interface.m_directDll) + { + msgpack::sbuffer in; + msgpack::sbuffer out; + msgpack::pack(in, + msgChild__IN_kodi_addon_pvr_get_providers_v1(PtrValue(hdl), PtrValue(handle))); + if (!m_process->SendMessage(funcGroup_addoninstance_pvr_h, + funcChild_kodi_addon_pvr_get_providers_v1, in, out)) + return PVR_ERROR_NO_ERROR; + msgpack::unpacked ident = msgpack::unpack(out.data(), out.size()); + msgChild_OUT_kodi_addon_pvr_get_providers_v1 t = ident.get().as(); + return std::get<0>(t); + } +#endif /* !KODI_INHIBIT_SHARED */ + + return m_ifcToAddon->kodi_addon_pvr_get_providers_v1(m_ifcToAddon->thisClassHdl, hdl, handle); +} + enum PVR_ERROR CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_get_channel_groups_amount_v1( KODI_ADDON_PVR_HDL hdl, int* amount) { @@ -1918,6 +1998,24 @@ void CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_transfer_channel_entry_v1( /*---AUTO_GEN_PARSE---*/ } +void CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_transfer_provider_entry_v1( + void* thisClassHdl, + KODI_OWN_HDL hdl, + const KODI_ADDON_PVR_TRANSFER_HDL handle, + const struct PVR_PROVIDER* chanProvider) +{ + auto thisClass = reinterpret_cast(thisClassHdl); + if (thisClass == nullptr) + return; + + /*---AUTO_GEN_PARSE---*/ + // AUTOGENERATED - Used by class "PVR::CPVRClient" with "void cb_transfer_provider_entry(void* kodiInstance,const ADDON_HANDLE handle,const PVR_PROVIDER* entry)" on "pvr/addons/PVRClient.h". + + PVR::CPVRClient* cb = static_cast(hdl); + cb->cb_transfer_provider_entry(handle, chanProvider); + /*---AUTO_GEN_PARSE---*/ +} + void CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_transfer_channel_group_v1( void* thisClassHdl, KODI_OWN_HDL hdl, @@ -2023,6 +2121,21 @@ void CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_trigger_channel_update_v1(voi /*---AUTO_GEN_PARSE---*/ } +void CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_trigger_providers_update_v1(void* thisClassHdl, + KODI_OWN_HDL hdl) +{ + auto thisClass = reinterpret_cast(thisClassHdl); + if (thisClass == nullptr) + return; + + /*---AUTO_GEN_PARSE---*/ + // Code below must be set manually by hand to make work to Kodi + +#warning Function "CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_trigger_providers_update" must be set by hand. Alternatively add /*---AUTO_GEN_PARSE---*/ on back of target function in header to find on scan. + + /*---AUTO_GEN_PARSE---*/ +} + void CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_trigger_channel_groups_update_v1( void* thisClassHdl, KODI_OWN_HDL hdl) { diff --git a/xbmc/addons/interface/api/addon-instance/pvr.h b/xbmc/addons/interface/api/addon-instance/pvr.h index 7be4869b77053..95d43f88b8516 100644 --- a/xbmc/addons/interface/api/addon-instance/pvr.h +++ b/xbmc/addons/interface/api/addon-instance/pvr.h @@ -101,6 +101,12 @@ class CHdl_kodi_addoninstance_pvr_h : public IMsgHdl int channel_uid, struct PVR_DESCRAMBLE_INFO* descramble_info); // Added with API 1 + enum PVR_ERROR kodi_addon_pvr_get_providers_amount_v1(KODI_ADDON_PVR_HDL hdl, + int* amount); // Added with API 1 + + enum PVR_ERROR kodi_addon_pvr_get_providers_v1( + KODI_ADDON_PVR_HDL hdl, KODI_ADDON_PVR_TRANSFER_HDL handle); // Added with API 1 + enum PVR_ERROR kodi_addon_pvr_get_channel_groups_amount_v1(KODI_ADDON_PVR_HDL hdl, int* amount); // Added with API 1 @@ -302,6 +308,12 @@ class CHdl_kodi_addoninstance_pvr_h : public IMsgHdl const KODI_ADDON_PVR_TRANSFER_HDL handle, const struct PVR_CHANNEL* chan); // Added with API 1 + static void kodi_addon_pvr_transfer_provider_entry_v1( + void* thisClassHdl, + KODI_OWN_HDL hdl, + const KODI_ADDON_PVR_TRANSFER_HDL handle, + const struct PVR_PROVIDER* chanProvider); // Added with API 1 + static void kodi_addon_pvr_transfer_channel_group_v1( void* thisClassHdl, KODI_OWN_HDL hdl, @@ -335,6 +347,9 @@ class CHdl_kodi_addoninstance_pvr_h : public IMsgHdl static void kodi_addon_pvr_trigger_channel_update_v1(void* thisClassHdl, KODI_OWN_HDL hdl); // Added with API 1 + static void kodi_addon_pvr_trigger_providers_update_v1(void* thisClassHdl, + KODI_OWN_HDL hdl); // Added with API 1 + static void kodi_addon_pvr_trigger_channel_groups_update_v1(void* thisClassHdl, KODI_OWN_HDL hdl); // Added with API 1 diff --git a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/dl/kodi_api_1.h b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/dl/kodi_api_1.h index b78269b89d864..7265e1f7492ee 100644 --- a/xbmc/addons/kodi-dev-kit/include/kodi/c-api/dl/kodi_api_1.h +++ b/xbmc/addons/kodi-dev-kit/include/kodi/c-api/dl/kodi_api_1.h @@ -8,7 +8,7 @@ /* File autogenerated, see xbmc/addons/kodi-dev-kit/tools/code-generator/code_generator.py */ -/* API_HASH */ +/* API_HASH */ #ifndef C_API_DL_API_1_H #define C_API_DL_API_1_H @@ -76,6 +76,7 @@ extern "C" struct PVR_MENUHOOK; struct EPG_TAG; struct PVR_CHANNEL; + struct PVR_PROVIDER; struct PVR_CHANNEL_GROUP; struct PVR_CHANNEL_GROUP_MEMBER; struct PVR_RECORDING; @@ -305,8 +306,10 @@ extern "C" typedef struct DEMUX_PACKET*( ATTR_DL_APIENTRYP PFN_KODI_ADDON_INPUTSTREAM_ALLOCATE_DEMUX_PACKET_V1)(KODI_OWN_HDL, int); typedef struct DEMUX_PACKET*( - ATTR_DL_APIENTRYP PFN_KODI_ADDON_INPUTSTREAM_ALLOCATE_ENCRYPTED_DEMUX_PACKET_V1)( - KODI_OWN_HDL, unsigned int, unsigned int); + ATTR_DL_APIENTRYP + PFN_KODI_ADDON_INPUTSTREAM_ALLOCATE_ENCRYPTED_DEMUX_PACKET_V1)(KODI_OWN_HDL, + unsigned int, + unsigned int); typedef void(ATTR_DL_APIENTRYP PFN_KODI_ADDON_INPUTSTREAM_FREE_DEMUX_PACKET_V1)( KODI_OWN_HDL, struct DEMUX_PACKET*); @@ -341,6 +344,8 @@ extern "C" KODI_OWN_HDL, const KODI_ADDON_PVR_TRANSFER_HDL, const struct PVR_CHANNEL_GROUP*); typedef void(ATTR_DL_APIENTRYP PFN_KODI_ADDON_PVR_TRANSFER_EPG_ENTRY_V1)( KODI_OWN_HDL, const KODI_ADDON_PVR_TRANSFER_HDL, const struct EPG_TAG*); + typedef void(ATTR_DL_APIENTRYP PFN_KODI_ADDON_PVR_TRANSFER_PROVIDER_ENTRY_V1)( + KODI_OWN_HDL, const KODI_ADDON_PVR_TRANSFER_HDL, const struct PVR_PROVIDER*); typedef void(ATTR_DL_APIENTRYP PFN_KODI_ADDON_PVR_TRANSFER_RECORDING_ENTRY_V1)( KODI_OWN_HDL, const KODI_ADDON_PVR_TRANSFER_HDL, const struct PVR_RECORDING*); typedef void(ATTR_DL_APIENTRYP PFN_KODI_ADDON_PVR_TRANSFER_TIMER_ENTRY_V1)( @@ -349,6 +354,7 @@ extern "C" typedef void(ATTR_DL_APIENTRYP PFN_KODI_ADDON_PVR_TRIGGER_CHANNEL_UPDATE_V1)(KODI_OWN_HDL); typedef void(ATTR_DL_APIENTRYP PFN_KODI_ADDON_PVR_TRIGGER_EPG_UPDATE_V1)(KODI_OWN_HDL, unsigned int); + typedef void(ATTR_DL_APIENTRYP PFN_KODI_ADDON_PVR_TRIGGER_PROVIDERS_UPDATE_V1)(KODI_OWN_HDL); typedef void(ATTR_DL_APIENTRYP PFN_KODI_ADDON_PVR_TRIGGER_RECORDING_UPDATE_V1)(KODI_OWN_HDL); typedef void(ATTR_DL_APIENTRYP PFN_KODI_ADDON_PVR_TRIGGER_TIMER_UPDATE_V1)(KODI_OWN_HDL); @@ -505,10 +511,10 @@ extern "C" const char*); // gui/controls/button.h - typedef char*(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_BUTTON_GET_LABEL2_V1)( - KODI_GUI_CONTROL_HANDLE); - typedef char*(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_BUTTON_GET_LABEL_V1)( - KODI_GUI_CONTROL_HANDLE); + typedef char*( + ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_BUTTON_GET_LABEL2_V1)(KODI_GUI_CONTROL_HANDLE); + typedef char*( + ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_BUTTON_GET_LABEL_V1)(KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_BUTTON_SET_ENABLED_V1)( KODI_GUI_CONTROL_HANDLE, bool); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_BUTTON_SET_LABEL2_V1)( @@ -537,8 +543,8 @@ extern "C" bool); // gui/controls/fade_label.h - typedef char*(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_FADE_LABEL_GET_LABEL_V1)( - KODI_GUI_CONTROL_HANDLE); + typedef char*( + ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_FADE_LABEL_GET_LABEL_V1)(KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_FADE_LABEL_ADD_LABEL_V1)( KODI_GUI_CONTROL_HANDLE, const char*); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_FADE_LABEL_RESET_V1)( @@ -557,8 +563,8 @@ extern "C" KODI_GUI_CONTROL_HANDLE, bool); // gui/controls/label.h - typedef char*(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_LABEL_GET_LABEL_V1)( - KODI_GUI_CONTROL_HANDLE); + typedef char*( + ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_LABEL_GET_LABEL_V1)(KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_LABEL_SET_LABEL_V1)(KODI_GUI_CONTROL_HANDLE, const char*); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_LABEL_SET_VISIBLE_V1)( @@ -575,8 +581,8 @@ extern "C" // gui/controls/radio_button.h typedef bool(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_RADIO_BUTTON_IS_SELECTED_V1)( KODI_GUI_CONTROL_HANDLE); - typedef char*(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_RADIO_BUTTON_GET_LABEL_V1)( - KODI_GUI_CONTROL_HANDLE); + typedef char*( + ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_RADIO_BUTTON_GET_LABEL_V1)(KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_RADIO_BUTTON_SET_ENABLED_V1)( KODI_GUI_CONTROL_HANDLE, bool); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_RADIO_BUTTON_SET_LABEL_V1)( @@ -621,8 +627,8 @@ extern "C" KODI_GUI_CONTROL_HANDLE, bool); // gui/controls/slider.h - typedef char*(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_SLIDER_GET_DESCRIPTION_V1)( - KODI_GUI_CONTROL_HANDLE); + typedef char*( + ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_SLIDER_GET_DESCRIPTION_V1)(KODI_GUI_CONTROL_HANDLE); typedef float(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_SLIDER_GET_FLOAT_VALUE_V1)( KODI_GUI_CONTROL_HANDLE); typedef float(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_SLIDER_GET_PERCENTAGE_V1)( @@ -650,8 +656,8 @@ extern "C" KODI_GUI_CONTROL_HANDLE, bool); // gui/controls/spin.h - typedef char*(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_SPIN_GET_STRING_VALUE_V1)( - KODI_GUI_CONTROL_HANDLE); + typedef char*( + ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_SPIN_GET_STRING_VALUE_V1)(KODI_GUI_CONTROL_HANDLE); typedef float(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_SPIN_GET_FLOAT_VALUE_V1)( KODI_GUI_CONTROL_HANDLE); typedef int(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_SPIN_GET_INT_VALUE_V1)( @@ -683,8 +689,8 @@ extern "C" bool); // gui/controls/text_box.h - typedef char*(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_TEXT_BOX_GET_TEXT_V1)( - KODI_GUI_CONTROL_HANDLE); + typedef char*( + ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_TEXT_BOX_GET_TEXT_V1)(KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_TEXT_BOX_RESET_V1)(KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_CONTROLS_TEXT_BOX_SCROLL_V1)(KODI_GUI_CONTROL_HANDLE, unsigned int); @@ -705,10 +711,10 @@ extern "C" const char*); typedef bool(ATTR_DL_APIENTRYP PFN_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_IS_FINISHED_V1)( KODI_GUI_HANDLE); - typedef char*(ATTR_DL_APIENTRYP PFN_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_GET_TEXT_V1)( - KODI_GUI_HANDLE); - typedef char*(ATTR_DL_APIENTRYP PFN_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_GET_TITLE_V1)( - KODI_GUI_HANDLE); + typedef char*( + ATTR_DL_APIENTRYP PFN_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_GET_TEXT_V1)(KODI_GUI_HANDLE); + typedef char*( + ATTR_DL_APIENTRYP PFN_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_GET_TITLE_V1)(KODI_GUI_HANDLE); typedef float(ATTR_DL_APIENTRYP PFN_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_GET_PERCENTAGE_V1)( KODI_GUI_HANDLE); typedef void(ATTR_DL_APIENTRYP PFN_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_DELETE_DIALOG_V1)( @@ -1021,12 +1027,14 @@ extern "C" kodi_addon_pvr_transfer_channel_group_member; PFN_KODI_ADDON_PVR_TRANSFER_CHANNEL_GROUP_V1 kodi_addon_pvr_transfer_channel_group; PFN_KODI_ADDON_PVR_TRANSFER_EPG_ENTRY_V1 kodi_addon_pvr_transfer_epg_entry; + PFN_KODI_ADDON_PVR_TRANSFER_PROVIDER_ENTRY_V1 kodi_addon_pvr_transfer_provider_entry; PFN_KODI_ADDON_PVR_TRANSFER_RECORDING_ENTRY_V1 kodi_addon_pvr_transfer_recording_entry; PFN_KODI_ADDON_PVR_TRANSFER_TIMER_ENTRY_V1 kodi_addon_pvr_transfer_timer_entry; PFN_KODI_ADDON_PVR_TRIGGER_CHANNEL_GROUPS_UPDATE_V1 kodi_addon_pvr_trigger_channel_groups_update; PFN_KODI_ADDON_PVR_TRIGGER_CHANNEL_UPDATE_V1 kodi_addon_pvr_trigger_channel_update; PFN_KODI_ADDON_PVR_TRIGGER_EPG_UPDATE_V1 kodi_addon_pvr_trigger_epg_update; + PFN_KODI_ADDON_PVR_TRIGGER_PROVIDERS_UPDATE_V1 kodi_addon_pvr_trigger_providers_update; PFN_KODI_ADDON_PVR_TRIGGER_RECORDING_UPDATE_V1 kodi_addon_pvr_trigger_recording_update; PFN_KODI_ADDON_PVR_TRIGGER_TIMER_UPDATE_V1 kodi_addon_pvr_trigger_timer_update; diff --git a/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/audiodecoder.cpp b/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/audiodecoder.cpp index 213125e3426fd..9f4fcdf5dd6d0 100644 --- a/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/audiodecoder.cpp +++ b/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/audiodecoder.cpp @@ -38,6 +38,8 @@ void CHdl_kodi_addoninstance_audiodecoder_h::InitDirect( ifcToAddon->thisClassHdl = this; ifcToAddon->kodi_addon_audiodecoder_create_v1 = kodi_addon_audiodecoder_create_v1; ifcToAddon->kodi_addon_audiodecoder_destroy_v1 = kodi_addon_audiodecoder_destroy_v1; + ifcToAddon->kodi_addon_audiodecoder_can_operate_file_v1 = + kodi_addon_audiodecoder_can_operate_file_v1; ifcToAddon->kodi_addon_audiodecoder_init_v1 = kodi_addon_audiodecoder_init_v1; ifcToAddon->kodi_addon_audiodecoder_read_pcm_v1 = kodi_addon_audiodecoder_read_pcm_v1; ifcToAddon->kodi_addon_audiodecoder_seek_v1 = kodi_addon_audiodecoder_seek_v1; @@ -58,7 +60,7 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::HandleMessage(int funcGroup, { case funcChild_kodi_addon_audiodecoder_create_v1: { - // Original API call: typedef KODI_ADDON_AUDIODECODER_HDL(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_CREATE_V1)(KODI_OWN_HDL kodi_hdl); + // Original API call: typedef KODI_ADDON_AUDIODECODER_HDL(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_CREATE_V1)( KODI_OWN_HDL kodi_hdl); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_create_v1; /* Autogenerated */ // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_create_v1; /* Autogenerated */ @@ -72,7 +74,7 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::HandleMessage(int funcGroup, } case funcChild_kodi_addon_audiodecoder_destroy_v1: { - // Original API call: typedef void(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_DESTROY_V1)(KODI_ADDON_AUDIODECODER_HDL hdl); + // Original API call: typedef void(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_DESTROY_V1)( KODI_ADDON_AUDIODECODER_HDL hdl); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_destroy_v1; /* Autogenerated */ // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_destroy_v1; /* Autogenerated */ @@ -82,9 +84,24 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::HandleMessage(int funcGroup, return true; } + case funcChild_kodi_addon_audiodecoder_can_operate_file_v1: + { + // Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_CAN_OPERATE_FILE_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file); + // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_can_operate_file_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_can_operate_file_v1; /* Autogenerated */ + + msgChild__IN_kodi_addon_audiodecoder_can_operate_file_v1 t = in.get().as(); + KODI_ADDON_HDL auto_gen_hdl = reinterpret_cast(std::get<0>(t)); + const std::string& file = std::get<1>(t); + bool auto_gen_ret = + kodi_addon_audiodecoder_can_operate_file_v1(this, auto_gen_hdl, file.c_str()); + + msgpack::pack(out, msgChild_OUT_kodi_addon_audiodecoder_can_operate_file_v1(auto_gen_ret)); + return true; + } case funcChild_kodi_addon_audiodecoder_init_v1: { - // Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_INIT_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, unsigned int filecache, int* channels, int* samplerate, int* bitspersample, int64_t* totaltime, int* bitrate, enum AudioEngineDataFormat* format, enum AudioEngineChannel info[AUDIOENGINE_CH_MAX]); + // Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_INIT_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, unsigned int filecache, int* channels, int* samplerate, int* bitspersample, int64_t* totaltime, int* bitrate, enum AudioEngineDataFormat* format, enum AudioEngineChannel info[AUDIOENGINE_CH_MAX]); // Tuple in: typedef std::tuple> msgChild__IN_kodi_addon_audiodecoder_init_v1; /* Autogenerated */ // Tuple out: typedef std::tuple> msgChild_OUT_kodi_addon_audiodecoder_init_v1; /* Autogenerated */ @@ -110,7 +127,7 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::HandleMessage(int funcGroup, } case funcChild_kodi_addon_audiodecoder_read_pcm_v1: { - // Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_PCM_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, uint8_t* buffer, size_t size, size_t* actualsize); + // Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_PCM_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, uint8_t* buffer, size_t size, size_t* actualsize); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_read_pcm_v1; /* Autogenerated */ // Tuple out: typedef std::tuple, size_t> msgChild_OUT_kodi_addon_audiodecoder_read_pcm_v1; /* Autogenerated */ @@ -128,7 +145,7 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::HandleMessage(int funcGroup, } case funcChild_kodi_addon_audiodecoder_seek_v1: { - // Original API call: typedef int64_t(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_SEEK_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, int64_t time); + // Original API call: typedef int64_t(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_SEEK_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, int64_t time); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_seek_v1; /* Autogenerated */ // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_seek_v1; /* Autogenerated */ @@ -142,24 +159,24 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::HandleMessage(int funcGroup, } case funcChild_kodi_addon_audiodecoder_read_tag_v1: { - // Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_TAG_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, struct AUDIODECODER_INFO_TAG* tag); + // Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_TAG_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, struct KODI_ADDON_AUDIODECODER_INFO_TAG* tag); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_read_tag_v1; /* Autogenerated */ - // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_read_tag_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_read_tag_v1; /* Autogenerated */ msgChild__IN_kodi_addon_audiodecoder_read_tag_v1 t = in.get().as(); KODI_ADDON_HDL auto_gen_hdl = reinterpret_cast(std::get<0>(t)); const std::string& file = std::get<1>(t); - struct AUDIODECODER_INFO_TAG tag; + struct KODI_ADDON_AUDIODECODER_INFO_TAG tag; bool auto_gen_ret = kodi_addon_audiodecoder_read_tag_v1(this, auto_gen_hdl, file.c_str(), &tag); msgpack::pack(out, msgChild_OUT_kodi_addon_audiodecoder_read_tag_v1(auto_gen_ret, &tag)); - IFC_AUDIODECODER_INFO_TAG::CleanCStructure(&tag); + IFC_KODI_ADDON_AUDIODECODER_INFO_TAG::CleanCStructure(&tag); return true; } case funcChild_kodi_addon_audiodecoder_track_count_v1: { - // Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_TRACK_COUNT_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file); + // Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_TRACK_COUNT_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file); // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_track_count_v1; /* Autogenerated */ // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_track_count_v1; /* Autogenerated */ @@ -213,6 +230,23 @@ void CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_destroy_v1( } } +bool CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_can_operate_file_v1( + void* thisClassHdl, const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file) // Added with API 1 +{ + auto thisClass = reinterpret_cast(thisClassHdl); + if (thisClass == nullptr) + return false; + + UnionAddonFunctions* union_data = reinterpret_cast(hdl); + bool auto_gen_ret = false; + if (union_data->types.kodi_addon_audiodecoder.v1.can_operate_file) + { + auto_gen_ret = + union_data->types.kodi_addon_audiodecoder.v1.can_operate_file(union_data->hdl, file); + } + return auto_gen_ret; +} + bool CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_init_v1( void* thisClassHdl, const KODI_ADDON_AUDIODECODER_HDL hdl, @@ -282,7 +316,7 @@ bool CHdl_kodi_addoninstance_audiodecoder_h::kodi_addon_audiodecoder_read_tag_v1 void* thisClassHdl, const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, - struct AUDIODECODER_INFO_TAG* tag) // Added with API 1 + struct KODI_ADDON_AUDIODECODER_INFO_TAG* tag) // Added with API 1 { auto thisClass = reinterpret_cast(thisClassHdl); if (thisClass == nullptr) diff --git a/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/audiodecoder.h b/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/audiodecoder.h index d28ecb6995d73..61b33310879d7 100644 --- a/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/audiodecoder.h +++ b/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/audiodecoder.h @@ -62,6 +62,10 @@ class ATTR_DLL_LOCAL CHdl_kodi_addoninstance_audiodecoder_h : public IMsgHdl static void kodi_addon_audiodecoder_destroy_v1( void* thisClassHdl, KODI_ADDON_AUDIODECODER_HDL hdl); // Added with API 1 + static bool kodi_addon_audiodecoder_can_operate_file_v1(void* thisClassHdl, + const KODI_ADDON_AUDIODECODER_HDL hdl, + const char* file); // Added with API 1 + static bool kodi_addon_audiodecoder_init_v1( void* thisClassHdl, const KODI_ADDON_AUDIODECODER_HDL hdl, @@ -89,7 +93,7 @@ class ATTR_DLL_LOCAL CHdl_kodi_addoninstance_audiodecoder_h : public IMsgHdl void* thisClassHdl, const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, - struct AUDIODECODER_INFO_TAG* tag); // Added with API 1 + struct KODI_ADDON_AUDIODECODER_INFO_TAG* tag); // Added with API 1 static int kodi_addon_audiodecoder_track_count_v1(void* thisClassHdl, const KODI_ADDON_AUDIODECODER_HDL hdl, diff --git a/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/pvr.cpp b/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/pvr.cpp index 941ee39d27974..68abe2bdce1ed 100644 --- a/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/pvr.cpp +++ b/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/pvr.cpp @@ -48,6 +48,8 @@ void CHdl_kodi_addoninstance_pvr_h::InitDirect(directFuncToAddon_addoninstance_p kodi_addon_pvr_get_channel_stream_properties_v1; ifcToAddon->kodi_addon_pvr_get_signal_status_v1 = kodi_addon_pvr_get_signal_status_v1; ifcToAddon->kodi_addon_pvr_get_descramble_info_v1 = kodi_addon_pvr_get_descramble_info_v1; + ifcToAddon->kodi_addon_pvr_get_providers_amount_v1 = kodi_addon_pvr_get_providers_amount_v1; + ifcToAddon->kodi_addon_pvr_get_providers_v1 = kodi_addon_pvr_get_providers_v1; ifcToAddon->kodi_addon_pvr_get_channel_groups_amount_v1 = kodi_addon_pvr_get_channel_groups_amount_v1; ifcToAddon->kodi_addon_pvr_get_channel_groups_v1 = kodi_addon_pvr_get_channel_groups_v1; @@ -317,6 +319,36 @@ bool CHdl_kodi_addoninstance_pvr_h::HandleMessage(int funcGroup, out, msgChild_OUT_kodi_addon_pvr_get_descramble_info_v1(auto_gen_ret, &descramble_info)); return true; } + case funcChild_kodi_addon_pvr_get_providers_amount_v1: + { + // Original API call: typedef enum PVR_ERROR(ATTR_APIENTRYP PFN_KODI_ADDON_PVR_GET_PROVIDERS_AMOUNT_V1)( KODI_ADDON_PVR_HDL hdl, int* amount); + // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_pvr_get_providers_amount_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_pvr_get_providers_amount_v1; /* Autogenerated */ + + msgChild__IN_kodi_addon_pvr_get_providers_amount_v1 t = in.get().as(); + KODI_ADDON_HDL auto_gen_hdl = reinterpret_cast(std::get<0>(t)); + int amount = std::get<1>(t); + enum PVR_ERROR auto_gen_ret = + kodi_addon_pvr_get_providers_amount_v1(this, auto_gen_hdl, &amount); + + msgpack::pack(out, msgChild_OUT_kodi_addon_pvr_get_providers_amount_v1(auto_gen_ret, amount)); + return true; + } + case funcChild_kodi_addon_pvr_get_providers_v1: + { + // Original API call: typedef enum PVR_ERROR(ATTR_APIENTRYP PFN_KODI_ADDON_PVR_GET_PROVIDERS_V1)( KODI_ADDON_PVR_HDL hdl, KODI_ADDON_PVR_TRANSFER_HDL handle); + // Tuple in: typedef std::tuple msgChild__IN_kodi_addon_pvr_get_providers_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgChild_OUT_kodi_addon_pvr_get_providers_v1; /* Autogenerated */ + + msgChild__IN_kodi_addon_pvr_get_providers_v1 t = in.get().as(); + KODI_ADDON_HDL auto_gen_hdl = reinterpret_cast(std::get<0>(t)); + KODI_ADDON_PVR_TRANSFER_HDL handle = + reinterpret_cast(std::get<1>(t)); + enum PVR_ERROR auto_gen_ret = kodi_addon_pvr_get_providers_v1(this, auto_gen_hdl, handle); + + msgpack::pack(out, msgChild_OUT_kodi_addon_pvr_get_providers_v1(auto_gen_ret)); + return true; + } case funcChild_kodi_addon_pvr_get_channel_groups_amount_v1: { // Original API call: typedef enum PVR_ERROR(ATTR_APIENTRYP PFN_KODI_ADDON_PVR_GET_CHANNEL_GROUPS_AMOUNT_V1)( KODI_ADDON_PVR_HDL hdl, int* amount); @@ -1267,6 +1299,41 @@ enum PVR_ERROR CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_get_descramble_info return auto_gen_ret; } +enum PVR_ERROR CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_get_providers_amount_v1( + void* thisClassHdl, KODI_ADDON_PVR_HDL hdl, int* amount) // Added with API 1 +{ + auto thisClass = reinterpret_cast(thisClassHdl); + if (thisClass == nullptr) + return PVR_ERROR_NO_ERROR; + + UnionAddonFunctions* union_data = reinterpret_cast(hdl); + enum PVR_ERROR auto_gen_ret = PVR_ERROR_NO_ERROR; + if (union_data->types.kodi_addon_pvr.v1.get_providers_amount) + { + auto_gen_ret = + union_data->types.kodi_addon_pvr.v1.get_providers_amount(union_data->hdl, amount); + } + return auto_gen_ret; +} + +enum PVR_ERROR CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_get_providers_v1( + void* thisClassHdl, + KODI_ADDON_PVR_HDL hdl, + KODI_ADDON_PVR_TRANSFER_HDL handle) // Added with API 1 +{ + auto thisClass = reinterpret_cast(thisClassHdl); + if (thisClass == nullptr) + return PVR_ERROR_NO_ERROR; + + UnionAddonFunctions* union_data = reinterpret_cast(hdl); + enum PVR_ERROR auto_gen_ret = PVR_ERROR_NO_ERROR; + if (union_data->types.kodi_addon_pvr.v1.get_providers) + { + auto_gen_ret = union_data->types.kodi_addon_pvr.v1.get_providers(union_data->hdl, handle); + } + return auto_gen_ret; +} + enum PVR_ERROR CHdl_kodi_addoninstance_pvr_h::kodi_addon_pvr_get_channel_groups_amount_v1( void* thisClassHdl, KODI_ADDON_PVR_HDL hdl, int* amount) // Added with API 1 { @@ -2260,6 +2327,35 @@ ATTR_DLL_EXPORT void kodi_addon_pvr_transfer_channel_entry(KODI_OWN_HDL hdl, chan); } +ATTR_DLL_EXPORT void kodi_addon_pvr_transfer_provider_entry( + KODI_OWN_HDL hdl, + const KODI_ADDON_PVR_TRANSFER_HDL handle, + const struct PVR_PROVIDER* chanProvider) +{ + // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_transfer_provider_entry( KODI_OWN_HDL hdl, const KODI_ADDON_PVR_TRANSFER_HDL handle, const struct PVR_PROVIDER* chanProvider) __INTRODUCED_IN_KODI(1); + // Tuple in: typedef std::tuple msgParent__IN_kodi_addon_pvr_transfer_provider_entry_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgParent_OUT_kodi_addon_pvr_transfer_provider_entry_v1; /* Autogenerated */ + + if (hdl == nullptr || handle == nullptr || chanProvider == nullptr) + return; + +#ifndef KODI_INHIBIT_SHARED + if (!AddonIfc::g_ifc->direct_used) + { + msgpack::sbuffer in; + msgpack::pack(in, msgParent__IN_kodi_addon_pvr_transfer_provider_entry_v1( + PtrValue(hdl), PtrValue(handle), chanProvider)); + AddonIfc::g_ifc->control->GetThreadIfc()->SendMessage( + funcGroup_addoninstance_pvr_h, funcParent_kodi_addon_pvr_transfer_provider_entry_v1, in); + return; + } +#endif /* !KODI_INHIBIT_SHARED */ + + const auto& auto_gen_group = AddonIfc::g_ifc->direct->to_kodi.addoninstance_pvr_h; + auto_gen_group.kodi_addon_pvr_transfer_provider_entry_v1(auto_gen_group.thisClassHdl, hdl, handle, + chanProvider); +} + ATTR_DLL_EXPORT void kodi_addon_pvr_transfer_channel_group(KODI_OWN_HDL hdl, const KODI_ADDON_PVR_TRANSFER_HDL handle, const struct PVR_CHANNEL_GROUP* group) @@ -2427,6 +2523,30 @@ ATTR_DLL_EXPORT void kodi_addon_pvr_trigger_channel_update(KODI_OWN_HDL hdl) auto_gen_group.kodi_addon_pvr_trigger_channel_update_v1(auto_gen_group.thisClassHdl, hdl); } +ATTR_DLL_EXPORT void kodi_addon_pvr_trigger_providers_update(KODI_OWN_HDL hdl) +{ + // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_trigger_providers_update(KODI_OWN_HDL hdl) __INTRODUCED_IN_KODI(1); + // Tuple in: typedef std::tuple msgParent__IN_kodi_addon_pvr_trigger_providers_update_v1; /* Autogenerated */ + // Tuple out: typedef std::tuple msgParent_OUT_kodi_addon_pvr_trigger_providers_update_v1; /* Autogenerated */ + + if (hdl == nullptr) + return; + +#ifndef KODI_INHIBIT_SHARED + if (!AddonIfc::g_ifc->direct_used) + { + msgpack::sbuffer in; + msgpack::pack(in, msgParent__IN_kodi_addon_pvr_trigger_providers_update_v1(PtrValue(hdl))); + AddonIfc::g_ifc->control->GetThreadIfc()->SendMessage( + funcGroup_addoninstance_pvr_h, funcParent_kodi_addon_pvr_trigger_providers_update_v1, in); + return; + } +#endif /* !KODI_INHIBIT_SHARED */ + + const auto& auto_gen_group = AddonIfc::g_ifc->direct->to_kodi.addoninstance_pvr_h; + auto_gen_group.kodi_addon_pvr_trigger_providers_update_v1(auto_gen_group.thisClassHdl, hdl); +} + ATTR_DLL_EXPORT void kodi_addon_pvr_trigger_channel_groups_update(KODI_OWN_HDL hdl) { // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_trigger_channel_groups_update(KODI_OWN_HDL hdl) __INTRODUCED_IN_KODI(1); diff --git a/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/pvr.h b/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/pvr.h index 3bd12d317e525..e209eeff5b525 100644 --- a/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/pvr.h +++ b/xbmc/addons/kodi-dev-kit/src/addon/api/addon-instance/pvr.h @@ -116,6 +116,15 @@ class ATTR_DLL_LOCAL CHdl_kodi_addoninstance_pvr_h : public IMsgHdl int channel_uid, struct PVR_DESCRAMBLE_INFO* descramble_info); // Added with API 1 + static enum PVR_ERROR kodi_addon_pvr_get_providers_amount_v1(void* thisClassHdl, + KODI_ADDON_PVR_HDL hdl, + int* amount); // Added with API 1 + + static enum PVR_ERROR kodi_addon_pvr_get_providers_v1( + void* thisClassHdl, + KODI_ADDON_PVR_HDL hdl, + KODI_ADDON_PVR_TRANSFER_HDL handle); // Added with API 1 + static enum PVR_ERROR kodi_addon_pvr_get_channel_groups_amount_v1( void* thisClassHdl, KODI_ADDON_PVR_HDL hdl, int* amount); // Added with API 1 diff --git a/xbmc/addons/kodi-dev-kit/src/addon/api/dl/kodi_api_1.c b/xbmc/addons/kodi-dev-kit/src/addon/api/dl/kodi_api_1.c index 14c8c0e9515e0..480b3fe748269 100644 --- a/xbmc/addons/kodi-dev-kit/src/addon/api/dl/kodi_api_1.c +++ b/xbmc/addons/kodi-dev-kit/src/addon/api/dl/kodi_api_1.c @@ -8,7 +8,7 @@ /* File autogenerated, see xbmc/addons/kodi-dev-kit/tools/code-generator/code_generator.py */ -/* API_HASH */ +/* API_HASH */ #include "../../../../include/kodi/c-api/dl/kodi_api_1.h" #include "include/kodi/c-api/addon_base.h" @@ -214,11 +214,13 @@ ATTR_DL_DLL_EXPORT bool load_kodi_api_1(struct kodi_api_1* api) api->kodi_addon_pvr_transfer_channel_group = &kodi_addon_pvr_transfer_channel_group; api->kodi_addon_pvr_transfer_channel_group_member = &kodi_addon_pvr_transfer_channel_group_member; api->kodi_addon_pvr_transfer_epg_entry = &kodi_addon_pvr_transfer_epg_entry; + api->kodi_addon_pvr_transfer_provider_entry = &kodi_addon_pvr_transfer_provider_entry; api->kodi_addon_pvr_transfer_recording_entry = &kodi_addon_pvr_transfer_recording_entry; api->kodi_addon_pvr_transfer_timer_entry = &kodi_addon_pvr_transfer_timer_entry; api->kodi_addon_pvr_trigger_channel_groups_update = &kodi_addon_pvr_trigger_channel_groups_update; api->kodi_addon_pvr_trigger_channel_update = &kodi_addon_pvr_trigger_channel_update; api->kodi_addon_pvr_trigger_epg_update = &kodi_addon_pvr_trigger_epg_update; + api->kodi_addon_pvr_trigger_providers_update = &kodi_addon_pvr_trigger_providers_update; api->kodi_addon_pvr_trigger_recording_update = &kodi_addon_pvr_trigger_recording_update; api->kodi_addon_pvr_trigger_timer_update = &kodi_addon_pvr_trigger_timer_update; diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/audiodecoder.h b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/audiodecoder.h index a7ad6cef669b7..f9d62fd4ebc96 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/audiodecoder.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/audiodecoder.h @@ -23,6 +23,8 @@ typedef struct KODI_ADDON_AUDIODECODER_FUNC_V1_TO_V1 { PFN_KODI_ADDON_AUDIODECODER_CREATE_V1 create; /*---AUTO---*/ PFN_KODI_ADDON_AUDIODECODER_DESTROY_V1 destroy; /*---AUTO---*/ + PFN_KODI_ADDON_AUDIODECODER_CAN_OPERATE_FILE_V1 + can_operate_file; /*---AUTO---*/ PFN_KODI_ADDON_AUDIODECODER_INIT_V1 init; /*---AUTO---*/ PFN_KODI_ADDON_AUDIODECODER_READ_PCM_V1 read_pcm; /*---AUTO---*/ PFN_KODI_ADDON_AUDIODECODER_SEEK_V1 seek; /*---AUTO---*/ @@ -75,6 +77,8 @@ struct directFuncToKodi_addoninstance_audiodecoder_h typedef KODI_ADDON_AUDIODECODER_HDL(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_AUDIODECODER_CREATE_V1)( void*, KODI_OWN_HDL); +typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_AUDIODECODER_CAN_OPERATE_FILE_V1)( + void*, const KODI_ADDON_AUDIODECODER_HDL, const char*); typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_AUDIODECODER_INIT_V1)( void*, const KODI_ADDON_AUDIODECODER_HDL, @@ -88,7 +92,10 @@ typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_AUDIODECODER_INIT_V1)( enum AudioEngineDataFormat*, enum AudioEngineChannel[AUDIOENGINE_CH_MAX]); typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_AUDIODECODER_READ_TAG_V1)( - void*, const KODI_ADDON_AUDIODECODER_HDL, const char*, struct AUDIODECODER_INFO_TAG*); + void*, + const KODI_ADDON_AUDIODECODER_HDL, + const char*, + struct KODI_ADDON_AUDIODECODER_INFO_TAG*); typedef int(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_AUDIODECODER_READ_PCM_V1)( void*, const KODI_ADDON_AUDIODECODER_HDL, uint8_t*, size_t, size_t*); typedef int(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_AUDIODECODER_TRACK_COUNT_V1)( @@ -101,6 +108,7 @@ typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_AUDIODECODER_DESTROY_V1)( struct directFuncToAddon_addoninstance_audiodecoder_h { void* thisClassHdl; + PFN_INT_KODI_ADDON_AUDIODECODER_CAN_OPERATE_FILE_V1 kodi_addon_audiodecoder_can_operate_file_v1; PFN_INT_KODI_ADDON_AUDIODECODER_CREATE_V1 kodi_addon_audiodecoder_create_v1; PFN_INT_KODI_ADDON_AUDIODECODER_DESTROY_V1 kodi_addon_audiodecoder_destroy_v1; PFN_INT_KODI_ADDON_AUDIODECODER_INIT_V1 kodi_addon_audiodecoder_init_v1; @@ -115,10 +123,10 @@ struct directFuncToAddon_addoninstance_audiodecoder_h /* Confirm after autogen the correctness here! */ /*---AUTO_GEN_PARSE---*/ -struct IFC_AUDIODECODER_INFO_TAG +struct IFC_KODI_ADDON_AUDIODECODER_INFO_TAG { - IFC_AUDIODECODER_INFO_TAG() = default; - IFC_AUDIODECODER_INFO_TAG(const AUDIODECODER_INFO_TAG* c_data) + IFC_KODI_ADDON_AUDIODECODER_INFO_TAG() = default; + IFC_KODI_ADDON_AUDIODECODER_INFO_TAG(const KODI_ADDON_AUDIODECODER_INFO_TAG* c_data) { if (c_data == nullptr) return; @@ -150,9 +158,15 @@ struct IFC_AUDIODECODER_INFO_TAG bitrate = c_data->bitrate; if (c_data->comment) comment = c_data->comment; + if (c_data->cover_art_path) + cover_art_path = c_data->cover_art_path; + if (c_data->cover_art_mem_mimetype) + cover_art_mem_mimetype = c_data->cover_art_mem_mimetype; + cover_art_mem = c_data->cover_art_mem; + cover_art_mem_size = c_data->cover_art_mem_size; } - static inline void CleanCStructure(AUDIODECODER_INFO_TAG* c_data) + static inline void CleanCStructure(KODI_ADDON_AUDIODECODER_INFO_TAG* c_data) { if (c_data == nullptr) return; @@ -207,9 +221,19 @@ struct IFC_AUDIODECODER_INFO_TAG free(c_data->comment); c_data->comment = nullptr; } + if (c_data->cover_art_path) + { + free(c_data->cover_art_path); + c_data->cover_art_path = nullptr; + } + if (c_data->cover_art_mem_mimetype) + { + free(c_data->cover_art_mem_mimetype); + c_data->cover_art_mem_mimetype = nullptr; + } } - void SetCStructure(AUDIODECODER_INFO_TAG* c_data) + void SetCStructure(KODI_ADDON_AUDIODECODER_INFO_TAG* c_data) { if (c_data == nullptr) return; @@ -241,6 +265,12 @@ struct IFC_AUDIODECODER_INFO_TAG c_data->bitrate = bitrate; if (!comment.empty()) c_data->comment = strdup(comment.c_str()); + if (!cover_art_path.empty()) + c_data->cover_art_path = strdup(cover_art_path.c_str()); + if (!cover_art_mem_mimetype.empty()) + c_data->cover_art_mem_mimetype = strdup(cover_art_mem_mimetype.c_str()); + c_data->cover_art_mem = cover_art_mem; + c_data->cover_art_mem_size = cover_art_mem_size; } std::string title; @@ -260,6 +290,10 @@ struct IFC_AUDIODECODER_INFO_TAG int channels; int bitrate; std::string comment; + std::string cover_art_path; + std::string cover_art_mem_mimetype; + uint8_t* cover_art_mem; + size_t cover_art_mem_size; MSGPACK_DEFINE(title, artist, @@ -277,7 +311,11 @@ struct IFC_AUDIODECODER_INFO_TAG samplerate, channels, bitrate, - comment); + comment, + cover_art_path, + cover_art_mem_mimetype, + cover_art_mem, + cover_art_mem_size); }; /*---AUTO_GEN_PARSE---*/ @@ -297,6 +335,7 @@ typedef enum funcChild_addoninstance_audiodecoder_h : int { funcChild_kodi_addon_audiodecoder_create_v1, funcChild_kodi_addon_audiodecoder_destroy_v1, + funcChild_kodi_addon_audiodecoder_can_operate_file_v1, funcChild_kodi_addon_audiodecoder_init_v1, funcChild_kodi_addon_audiodecoder_read_pcm_v1, funcChild_kodi_addon_audiodecoder_seek_v1, @@ -306,25 +345,28 @@ typedef enum funcChild_addoninstance_audiodecoder_h : int // clang-format off /*---AUTO_GEN_PARSE---*/ -// Original API call: typedef KODI_ADDON_AUDIODECODER_HDL(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_CREATE_V1)(KODI_OWN_HDL kodi_hdl); +// Original API call: typedef KODI_ADDON_AUDIODECODER_HDL(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_CREATE_V1)( KODI_OWN_HDL kodi_hdl); typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_create_v1; /* Autogenerated */ typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_create_v1; /* Autogenerated */ -// Original API call: typedef void(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_DESTROY_V1)(KODI_ADDON_AUDIODECODER_HDL hdl); +// Original API call: typedef void(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_DESTROY_V1)( KODI_ADDON_AUDIODECODER_HDL hdl); typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_destroy_v1; /* Autogenerated */ typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_destroy_v1; /* Autogenerated */ -// Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_INIT_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, unsigned int filecache, int* channels, int* samplerate, int* bitspersample, int64_t* totaltime, int* bitrate, enum AudioEngineDataFormat* format, enum AudioEngineChannel info[AUDIOENGINE_CH_MAX]); +// Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_CAN_OPERATE_FILE_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file); +typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_can_operate_file_v1; /* Autogenerated */ +typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_can_operate_file_v1; /* Autogenerated */ +// Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_INIT_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, unsigned int filecache, int* channels, int* samplerate, int* bitspersample, int64_t* totaltime, int* bitrate, enum AudioEngineDataFormat* format, enum AudioEngineChannel info[AUDIOENGINE_CH_MAX]); typedef std::tuple> msgChild__IN_kodi_addon_audiodecoder_init_v1; /* Autogenerated */ typedef std::tuple> msgChild_OUT_kodi_addon_audiodecoder_init_v1; /* Autogenerated */ -// Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_PCM_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, uint8_t* buffer, size_t size, size_t* actualsize); +// Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_PCM_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, uint8_t* buffer, size_t size, size_t* actualsize); typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_read_pcm_v1; /* Autogenerated */ typedef std::tuple, size_t> msgChild_OUT_kodi_addon_audiodecoder_read_pcm_v1; /* Autogenerated */ -// Original API call: typedef int64_t(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_SEEK_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, int64_t time); +// Original API call: typedef int64_t(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_SEEK_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, int64_t time); typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_seek_v1; /* Autogenerated */ typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_seek_v1; /* Autogenerated */ -// Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_TAG_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, struct AUDIODECODER_INFO_TAG* tag); +// Original API call: typedef bool(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_READ_TAG_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file, struct KODI_ADDON_AUDIODECODER_INFO_TAG* tag); typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_read_tag_v1; /* Autogenerated */ -typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_read_tag_v1; /* Autogenerated */ -// Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_TRACK_COUNT_V1)(const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file); +typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_read_tag_v1; /* Autogenerated */ +// Original API call: typedef int(ATTR_APIENTRYP PFN_KODI_ADDON_AUDIODECODER_TRACK_COUNT_V1)( const KODI_ADDON_AUDIODECODER_HDL hdl, const char* file); typedef std::tuple msgChild__IN_kodi_addon_audiodecoder_track_count_v1; /* Autogenerated */ typedef std::tuple msgChild_OUT_kodi_addon_audiodecoder_track_count_v1; /* Autogenerated */ /*---AUTO_GEN_PARSE---*/ diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/game.h b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/game.h index 4de09548cd7d5..ff165ec1b8c61 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/game.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/game.h @@ -164,8 +164,8 @@ typedef enum GAME_REGION(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_GAME_GET_REGION_V void*, const KODI_ADDON_GAME_HDL); typedef size_t(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_GAME_SERIALIZE_SIZE_V1)( void*, const KODI_ADDON_GAME_HDL); -typedef struct game_input_topology*(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_GAME_GET_TOPOLOGY_V1)( - void*, const KODI_ADDON_GAME_HDL); +typedef struct game_input_topology*( + ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_GAME_GET_TOPOLOGY_V1)(void*, const KODI_ADDON_GAME_HDL); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_GAME_DESTROY_V1)(void*, KODI_ADDON_GAME_HDL); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_GAME_FREE_TOPOLOGY_V1)( void*, const KODI_ADDON_GAME_HDL, struct game_input_topology*); diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/inputstream.h b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/inputstream.h index 8a1d59e77d10a..6a44bcad34aca 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/inputstream.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/inputstream.h @@ -87,8 +87,11 @@ typedef struct DEMUX_PACKET*( KODI_OWN_HDL, int); typedef struct DEMUX_PACKET*( - ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_ALLOCATE_ENCRYPTED_DEMUX_PACKET_V1)( - void*, KODI_OWN_HDL, unsigned int, unsigned int); + ATTR_INT_APIENTRYP + PFN_INT_KODI_ADDON_INPUTSTREAM_ALLOCATE_ENCRYPTED_DEMUX_PACKET_V1)(void*, + KODI_OWN_HDL, + unsigned int, + unsigned int); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_FREE_DEMUX_PACKET_V1)( void*, KODI_OWN_HDL, struct DEMUX_PACKET*); @@ -132,10 +135,14 @@ typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_POS_TIME_V1)( void*, const KODI_ADDON_INPUTSTREAM_HDL, int); typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_SEEK_CHAPTER_V1)( void*, const KODI_ADDON_INPUTSTREAM_HDL, int); -typedef const char*(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_GET_CHAPTER_NAME_V1)( - void*, const KODI_ADDON_INPUTSTREAM_HDL, int); -typedef const char*(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_GET_PATH_LIST_V1)( - void*, const KODI_ADDON_INPUTSTREAM_HDL); +typedef const char*( + ATTR_INT_APIENTRYP + PFN_INT_KODI_ADDON_INPUTSTREAM_GET_CHAPTER_NAME_V1)(void*, + const KODI_ADDON_INPUTSTREAM_HDL, + int); +typedef const char*( + ATTR_INT_APIENTRYP + PFN_INT_KODI_ADDON_INPUTSTREAM_GET_PATH_LIST_V1)(void*, const KODI_ADDON_INPUTSTREAM_HDL); typedef int(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_BLOCK_SIZE_STREAM_V1)( void*, const KODI_ADDON_INPUTSTREAM_HDL); typedef int(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_GET_CHAPTER_COUNT_V1)( @@ -156,8 +163,9 @@ typedef int64_t(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_POSITION_STREA void*, const KODI_ADDON_INPUTSTREAM_HDL); typedef int64_t(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_SEEK_STREAM_V1)( void*, const KODI_ADDON_INPUTSTREAM_HDL, int64_t, int); -typedef struct DEMUX_PACKET*(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_DEMUX_READ_V1)( - void*, const KODI_ADDON_INPUTSTREAM_HDL); +typedef struct DEMUX_PACKET*( + ATTR_INT_APIENTRYP + PFN_INT_KODI_ADDON_INPUTSTREAM_DEMUX_READ_V1)(void*, const KODI_ADDON_INPUTSTREAM_HDL); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_CLOSE_V1)( void*, const KODI_ADDON_INPUTSTREAM_HDL); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_INPUTSTREAM_DEMUX_ABORT_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr.h b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr.h index bb9e3e29aeaa7..ae19056dd7058 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr.h @@ -19,6 +19,7 @@ #include "src/shared/api/addon-instance/pvr/pvr_epg.h" #include "src/shared/api/addon-instance/pvr/pvr_general.h" #include "src/shared/api/addon-instance/pvr/pvr_menu_hook.h" +#include "src/shared/api/addon-instance/pvr/pvr_providers.h" #include "src/shared/api/addon-instance/pvr/pvr_recordings.h" #include "src/shared/api/addon-instance/pvr/pvr_timers.h" @@ -45,6 +46,8 @@ typedef struct KODI_ADDON_PVR_FUNC_V1_TO_V1 get_channel_stream_properties; /*---AUTO---*/ PFN_KODI_ADDON_PVR_GET_SIGNAL_STATUS_V1 get_signal_status; /*---AUTO---*/ PFN_KODI_ADDON_PVR_GET_DESCRAMBLE_INFO_V1 get_descramble_info; /*---AUTO---*/ + PFN_KODI_ADDON_PVR_GET_PROVIDERS_AMOUNT_V1 get_providers_amount; /*---AUTO---*/ + PFN_KODI_ADDON_PVR_GET_PROVIDERS_V1 get_providers; /*---AUTO---*/ PFN_KODI_ADDON_PVR_GET_CHANNEL_GROUPS_AMOUNT_V1 get_channel_groups_amount; /*---AUTO---*/ PFN_KODI_ADDON_PVR_GET_CHANNEL_GROUPS_V1 get_channel_groups; /*---AUTO---*/ @@ -165,6 +168,8 @@ typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_TRANSFER_CHANNEL_GROUP_V1 void*, KODI_OWN_HDL, const KODI_ADDON_PVR_TRANSFER_HDL, const struct PVR_CHANNEL_GROUP*); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_TRANSFER_EPG_ENTRY_V1)( void*, KODI_OWN_HDL, const KODI_ADDON_PVR_TRANSFER_HDL, const struct EPG_TAG*); +typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_TRANSFER_PROVIDER_ENTRY_V1)( + void*, KODI_OWN_HDL, const KODI_ADDON_PVR_TRANSFER_HDL, const struct PVR_PROVIDER*); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_TRANSFER_RECORDING_ENTRY_V1)( void*, KODI_OWN_HDL, const KODI_ADDON_PVR_TRANSFER_HDL, const struct PVR_RECORDING*); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_TRANSFER_TIMER_ENTRY_V1)( @@ -176,6 +181,8 @@ typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_TRIGGER_CHANNEL_UPDATE_V1 typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_TRIGGER_EPG_UPDATE_V1)(void*, KODI_OWN_HDL, unsigned int); +typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_TRIGGER_PROVIDERS_UPDATE_V1)(void*, + KODI_OWN_HDL); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_TRIGGER_RECORDING_UPDATE_V1)(void*, KODI_OWN_HDL); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_TRIGGER_TIMER_UPDATE_V1)(void*, @@ -195,12 +202,14 @@ struct directFuncToKodi_addoninstance_pvr_h kodi_addon_pvr_transfer_channel_group_member_v1; PFN_INT_KODI_ADDON_PVR_TRANSFER_CHANNEL_GROUP_V1 kodi_addon_pvr_transfer_channel_group_v1; PFN_INT_KODI_ADDON_PVR_TRANSFER_EPG_ENTRY_V1 kodi_addon_pvr_transfer_epg_entry_v1; + PFN_INT_KODI_ADDON_PVR_TRANSFER_PROVIDER_ENTRY_V1 kodi_addon_pvr_transfer_provider_entry_v1; PFN_INT_KODI_ADDON_PVR_TRANSFER_RECORDING_ENTRY_V1 kodi_addon_pvr_transfer_recording_entry_v1; PFN_INT_KODI_ADDON_PVR_TRANSFER_TIMER_ENTRY_V1 kodi_addon_pvr_transfer_timer_entry_v1; PFN_INT_KODI_ADDON_PVR_TRIGGER_CHANNEL_GROUPS_UPDATE_V1 kodi_addon_pvr_trigger_channel_groups_update_v1; PFN_INT_KODI_ADDON_PVR_TRIGGER_CHANNEL_UPDATE_V1 kodi_addon_pvr_trigger_channel_update_v1; PFN_INT_KODI_ADDON_PVR_TRIGGER_EPG_UPDATE_V1 kodi_addon_pvr_trigger_epg_update_v1; + PFN_INT_KODI_ADDON_PVR_TRIGGER_PROVIDERS_UPDATE_V1 kodi_addon_pvr_trigger_providers_update_v1; PFN_INT_KODI_ADDON_PVR_TRIGGER_RECORDING_UPDATE_V1 kodi_addon_pvr_trigger_recording_update_v1; PFN_INT_KODI_ADDON_PVR_TRIGGER_TIMER_UPDATE_V1 kodi_addon_pvr_trigger_timer_update_v1; }; @@ -263,6 +272,10 @@ typedef enum PVR_ERROR(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_GET_EPG_TAG_EDL void*, KODI_ADDON_PVR_HDL, const struct EPG_TAG*, struct PVR_EDL_ENTRY[], size_t*); typedef enum PVR_ERROR(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_GET_EPG_TAG_STREAM_PROPERTIES_V1)( void*, KODI_ADDON_PVR_HDL, const struct EPG_TAG*, struct PVR_NAMED_VALUE*, size_t*); +typedef enum PVR_ERROR(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_GET_PROVIDERS_AMOUNT_V1)( + void*, KODI_ADDON_PVR_HDL, int*); +typedef enum PVR_ERROR(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_GET_PROVIDERS_V1)( + void*, KODI_ADDON_PVR_HDL, KODI_ADDON_PVR_TRANSFER_HDL); typedef enum PVR_ERROR(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_GET_RECORDINGS_AMOUNT_V1)( void*, KODI_ADDON_PVR_HDL, bool, int*); typedef enum PVR_ERROR(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_PVR_GET_RECORDINGS_V1)( @@ -355,6 +368,8 @@ struct directFuncToAddon_addoninstance_pvr_h PFN_INT_KODI_ADDON_PVR_GET_EPG_TAG_EDL_V1 kodi_addon_pvr_get_epg_tag_edl_v1; PFN_INT_KODI_ADDON_PVR_GET_EPG_TAG_STREAM_PROPERTIES_V1 kodi_addon_pvr_get_epg_tag_stream_properties_v1; + PFN_INT_KODI_ADDON_PVR_GET_PROVIDERS_AMOUNT_V1 kodi_addon_pvr_get_providers_amount_v1; + PFN_INT_KODI_ADDON_PVR_GET_PROVIDERS_V1 kodi_addon_pvr_get_providers_v1; PFN_INT_KODI_ADDON_PVR_GET_RECORDINGS_AMOUNT_V1 kodi_addon_pvr_get_recordings_amount_v1; PFN_INT_KODI_ADDON_PVR_GET_RECORDINGS_V1 kodi_addon_pvr_get_recordings_v1; PFN_INT_KODI_ADDON_PVR_GET_RECORDING_EDL_V1 kodi_addon_pvr_get_recording_edl_v1; @@ -401,12 +416,14 @@ typedef enum funcParent_addoninstance_pvr_h : int funcParent_kodi_addon_pvr_connection_state_change_v1, funcParent_kodi_addon_pvr_epg_event_state_change_v1, funcParent_kodi_addon_pvr_transfer_channel_entry_v1, + funcParent_kodi_addon_pvr_transfer_provider_entry_v1, funcParent_kodi_addon_pvr_transfer_channel_group_v1, funcParent_kodi_addon_pvr_transfer_channel_group_member_v1, funcParent_kodi_addon_pvr_transfer_epg_entry_v1, funcParent_kodi_addon_pvr_transfer_recording_entry_v1, funcParent_kodi_addon_pvr_transfer_timer_entry_v1, funcParent_kodi_addon_pvr_trigger_channel_update_v1, + funcParent_kodi_addon_pvr_trigger_providers_update_v1, funcParent_kodi_addon_pvr_trigger_channel_groups_update_v1, funcParent_kodi_addon_pvr_trigger_epg_update_v1, funcParent_kodi_addon_pvr_trigger_recording_update_v1, @@ -436,6 +453,9 @@ typedef std::tuple msgParent_OUT_kodi_addon_pvr_epg_event_state_cha // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_transfer_channel_entry( KODI_OWN_HDL hdl, const KODI_ADDON_PVR_TRANSFER_HDL handle, const struct PVR_CHANNEL* chan) __INTRODUCED_IN_KODI(1); typedef std::tuple msgParent__IN_kodi_addon_pvr_transfer_channel_entry_v1; /* Autogenerated */ typedef std::tuple msgParent_OUT_kodi_addon_pvr_transfer_channel_entry_v1; /* Autogenerated */ +// Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_transfer_provider_entry( KODI_OWN_HDL hdl, const KODI_ADDON_PVR_TRANSFER_HDL handle, const struct PVR_PROVIDER* chanProvider) __INTRODUCED_IN_KODI(1); +typedef std::tuple msgParent__IN_kodi_addon_pvr_transfer_provider_entry_v1; /* Autogenerated */ +typedef std::tuple msgParent_OUT_kodi_addon_pvr_transfer_provider_entry_v1; /* Autogenerated */ // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_transfer_channel_group( KODI_OWN_HDL hdl, const KODI_ADDON_PVR_TRANSFER_HDL handle, const struct PVR_CHANNEL_GROUP* group) __INTRODUCED_IN_KODI(1); typedef std::tuple msgParent__IN_kodi_addon_pvr_transfer_channel_group_v1; /* Autogenerated */ typedef std::tuple msgParent_OUT_kodi_addon_pvr_transfer_channel_group_v1; /* Autogenerated */ @@ -454,6 +474,9 @@ typedef std::tuple msgParent_OUT_kodi_addon_pvr_transfer_timer_entry // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_trigger_channel_update(KODI_OWN_HDL hdl) __INTRODUCED_IN_KODI(1); typedef std::tuple msgParent__IN_kodi_addon_pvr_trigger_channel_update_v1; /* Autogenerated */ typedef std::tuple msgParent_OUT_kodi_addon_pvr_trigger_channel_update_v1; /* Autogenerated */ +// Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_trigger_providers_update(KODI_OWN_HDL hdl) __INTRODUCED_IN_KODI(1); +typedef std::tuple msgParent__IN_kodi_addon_pvr_trigger_providers_update_v1; /* Autogenerated */ +typedef std::tuple msgParent_OUT_kodi_addon_pvr_trigger_providers_update_v1; /* Autogenerated */ // Original API call: ATTR_DLL_EXPORT void kodi_addon_pvr_trigger_channel_groups_update(KODI_OWN_HDL hdl) __INTRODUCED_IN_KODI(1); typedef std::tuple msgParent__IN_kodi_addon_pvr_trigger_channel_groups_update_v1; /* Autogenerated */ typedef std::tuple msgParent_OUT_kodi_addon_pvr_trigger_channel_groups_update_v1; /* Autogenerated */ @@ -485,6 +508,8 @@ typedef enum funcChild_addoninstance_pvr_h : int funcChild_kodi_addon_pvr_get_channel_stream_properties_v1, funcChild_kodi_addon_pvr_get_signal_status_v1, funcChild_kodi_addon_pvr_get_descramble_info_v1, + funcChild_kodi_addon_pvr_get_providers_amount_v1, + funcChild_kodi_addon_pvr_get_providers_v1, funcChild_kodi_addon_pvr_get_channel_groups_amount_v1, funcChild_kodi_addon_pvr_get_channel_groups_v1, funcChild_kodi_addon_pvr_get_channel_group_members_v1, @@ -567,6 +592,12 @@ typedef std::tuple msgChild_OUT_kodi_addon_pvr // Original API call: typedef enum PVR_ERROR(ATTR_APIENTRYP PFN_KODI_ADDON_PVR_GET_DESCRAMBLE_INFO_V1)( KODI_ADDON_PVR_HDL hdl, int channel_uid, struct PVR_DESCRAMBLE_INFO* descramble_info); typedef std::tuple msgChild__IN_kodi_addon_pvr_get_descramble_info_v1; /* Autogenerated */ typedef std::tuple msgChild_OUT_kodi_addon_pvr_get_descramble_info_v1; /* Autogenerated */ +// Original API call: typedef enum PVR_ERROR(ATTR_APIENTRYP PFN_KODI_ADDON_PVR_GET_PROVIDERS_AMOUNT_V1)( KODI_ADDON_PVR_HDL hdl, int* amount); +typedef std::tuple msgChild__IN_kodi_addon_pvr_get_providers_amount_v1; /* Autogenerated */ +typedef std::tuple msgChild_OUT_kodi_addon_pvr_get_providers_amount_v1; /* Autogenerated */ +// Original API call: typedef enum PVR_ERROR(ATTR_APIENTRYP PFN_KODI_ADDON_PVR_GET_PROVIDERS_V1)( KODI_ADDON_PVR_HDL hdl, KODI_ADDON_PVR_TRANSFER_HDL handle); +typedef std::tuple msgChild__IN_kodi_addon_pvr_get_providers_v1; /* Autogenerated */ +typedef std::tuple msgChild_OUT_kodi_addon_pvr_get_providers_v1; /* Autogenerated */ // Original API call: typedef enum PVR_ERROR(ATTR_APIENTRYP PFN_KODI_ADDON_PVR_GET_CHANNEL_GROUPS_AMOUNT_V1)( KODI_ADDON_PVR_HDL hdl, int* amount); typedef std::tuple msgChild__IN_kodi_addon_pvr_get_channel_groups_amount_v1; /* Autogenerated */ typedef std::tuple msgChild_OUT_kodi_addon_pvr_get_channel_groups_amount_v1; /* Autogenerated */ diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_channels.h b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_channels.h index cc37ee21a9c11..0b5d3ad146b7f 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_channels.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_channels.h @@ -49,6 +49,7 @@ struct IFC_PVR_CHANNEL bIsHidden = c_data->bIsHidden; bHasArchive = c_data->bHasArchive; iOrder = c_data->iOrder; + iClientProviderUid = c_data->iClientProviderUid; } void SetCStructure(PVR_CHANNEL* c_data) @@ -67,6 +68,7 @@ struct IFC_PVR_CHANNEL c_data->bIsHidden = bIsHidden; c_data->bHasArchive = bHasArchive; c_data->iOrder = iOrder; + c_data->iClientProviderUid = iClientProviderUid; } unsigned int iUniqueId; @@ -80,6 +82,7 @@ struct IFC_PVR_CHANNEL bool bIsHidden; bool bHasArchive; int iOrder; + int iClientProviderUid; MSGPACK_DEFINE(iUniqueId, bIsRadio, @@ -91,7 +94,8 @@ struct IFC_PVR_CHANNEL strIconPath, bIsHidden, bHasArchive, - iOrder); + iOrder, + iClientProviderUid); }; struct IFC_PVR_SIGNAL_STATUS diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_epg.h b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_epg.h index c636fd3c6d4a1..5490ba0b6e776 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_epg.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_epg.h @@ -68,6 +68,8 @@ struct IFC_EPG_TAG if (c_data->strFirstAired) strFirstAired = c_data->strFirstAired; iParentalRating = c_data->iParentalRating; + if (c_data->strParentalRatingCode) + strParentalRatingCode = c_data->strParentalRatingCode; iStarRating = c_data->iStarRating; iSeriesNumber = c_data->iSeriesNumber; iEpisodeNumber = c_data->iEpisodeNumber; @@ -103,6 +105,7 @@ struct IFC_EPG_TAG c_data->strGenreDescription = strGenreDescription.c_str(); c_data->strFirstAired = strFirstAired.c_str(); c_data->iParentalRating = iParentalRating; + c_data->strParentalRatingCode = strParentalRatingCode.c_str(); c_data->iStarRating = iStarRating; c_data->iSeriesNumber = iSeriesNumber; c_data->iEpisodeNumber = iEpisodeNumber; @@ -131,6 +134,7 @@ struct IFC_EPG_TAG std::string strGenreDescription; std::string strFirstAired; int iParentalRating; + std::string strParentalRatingCode; int iStarRating; int iSeriesNumber; int iEpisodeNumber; @@ -158,6 +162,7 @@ struct IFC_EPG_TAG strGenreDescription, strFirstAired, iParentalRating, + strParentalRatingCode, iStarRating, iSeriesNumber, iEpisodeNumber, diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_general.h b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_general.h index 56b078db45ad0..16f0973bac97c 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_general.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_general.h @@ -58,6 +58,8 @@ struct IFC_PVR_ADDON_CAPABILITIES bSupportsDescrambleInfo = c_data->bSupportsDescrambleInfo; bSupportsAsyncEPGTransfer = c_data->bSupportsAsyncEPGTransfer; bSupportsRecordingSize = c_data->bSupportsRecordingSize; + bSupportsProviders = c_data->bSupportsProviders; + bSupportsRecordingsDelete = c_data->bSupportsRecordingsDelete; iRecordingsLifetimesSize = c_data->iRecordingsLifetimesSize; memcpy(recordingsLifetimeValues.data(), c_data->recordingsLifetimeValues, PVR_ADDON_ATTRIBUTE_VALUES_ARRAY_SIZE); @@ -88,6 +90,8 @@ struct IFC_PVR_ADDON_CAPABILITIES c_data->bSupportsDescrambleInfo = bSupportsDescrambleInfo; c_data->bSupportsAsyncEPGTransfer = bSupportsAsyncEPGTransfer; c_data->bSupportsRecordingSize = bSupportsRecordingSize; + c_data->bSupportsProviders = bSupportsProviders; + c_data->bSupportsRecordingsDelete = bSupportsRecordingsDelete; c_data->iRecordingsLifetimesSize = iRecordingsLifetimesSize; memcpy(c_data->recordingsLifetimeValues, recordingsLifetimeValues.data(), PVR_ADDON_ATTRIBUTE_VALUES_ARRAY_SIZE); @@ -113,6 +117,8 @@ struct IFC_PVR_ADDON_CAPABILITIES bool bSupportsDescrambleInfo; bool bSupportsAsyncEPGTransfer; bool bSupportsRecordingSize; + bool bSupportsProviders; + bool bSupportsRecordingsDelete; unsigned int iRecordingsLifetimesSize; std::array recordingsLifetimeValues; @@ -137,6 +143,8 @@ struct IFC_PVR_ADDON_CAPABILITIES bSupportsDescrambleInfo, bSupportsAsyncEPGTransfer, bSupportsRecordingSize, + bSupportsProviders, + bSupportsRecordingsDelete, iRecordingsLifetimesSize, recordingsLifetimeValues); }; diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_providers.h b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_providers.h new file mode 100644 index 0000000000000..46f011cfff730 --- /dev/null +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_providers.h @@ -0,0 +1,83 @@ +/* + * Copyright (C) 2005-2021 Team Kodi + * This file is part of Kodi - https://kodi.tv + * + * SPDX-License-Identifier: GPL-2.0-or-later + * See LICENSES/README.md for more information. + */ + +/* File autogenerated, see xbmc/addons/kodi-dev-kit/tools/code-generator/code_generator.py */ + +#pragma once + +#include "../../../../../include/kodi/c-api/addon-instance/pvr/pvr_providers.h" +#include "../../../../../src/shared/api/addon-instance/pvr/pvr_defines.h" +#include "src/shared/SharedGroups.h" + +#include +#include +#include +#include + +/* Code below becomes on auto generation reused, hand edited parts should included here */ +/*---AUTO_GEN_PARSE---*/ +/*---AUTO_GEN_PARSE---*/ + +#ifndef MSGPACK_ADD_ENUM_PVR_PROVIDER_TYPE +#define MSGPACK_ADD_ENUM_PVR_PROVIDER_TYPE +MSGPACK_ADD_ENUM(PVR_PROVIDER_TYPE); +#endif + +namespace KODI +{ +namespace ADDONS +{ +namespace INTERFACE +{ + +struct IFC_PVR_PROVIDER +{ + IFC_PVR_PROVIDER() = default; + IFC_PVR_PROVIDER(const PVR_PROVIDER* c_data) + { + if (c_data == nullptr) + return; + + iUniqueId = c_data->iUniqueId; + memcpy(strName.data(), c_data->strName, PVR_ADDON_NAME_STRING_LENGTH); + type = c_data->type; + memcpy(strIconPath.data(), c_data->strIconPath, PVR_ADDON_URL_STRING_LENGTH); + memcpy(strCountries.data(), c_data->strCountries, PVR_ADDON_COUNTRIES_STRING_LENGTH); + memcpy(strLanguages.data(), c_data->strLanguages, PVR_ADDON_LANGUAGES_STRING_LENGTH); + } + + void SetCStructure(PVR_PROVIDER* c_data) + { + if (c_data == nullptr) + return; + + c_data->iUniqueId = iUniqueId; + memcpy(c_data->strName, strName.data(), PVR_ADDON_NAME_STRING_LENGTH); + c_data->type = type; + memcpy(c_data->strIconPath, strIconPath.data(), PVR_ADDON_URL_STRING_LENGTH); + memcpy(c_data->strCountries, strCountries.data(), PVR_ADDON_COUNTRIES_STRING_LENGTH); + memcpy(c_data->strLanguages, strLanguages.data(), PVR_ADDON_LANGUAGES_STRING_LENGTH); + } + + unsigned int iUniqueId; + std::array strName; + enum PVR_PROVIDER_TYPE type; + std::array strIconPath; + std::array strCountries; + std::array strLanguages; + + MSGPACK_DEFINE(iUniqueId, strName, type, strIconPath, strCountries, strLanguages); +}; + +/* Code below becomes on auto generation reused, hand edited parts should included here */ +/*---AUTO_GEN_PARSE---*/ +/*---AUTO_GEN_PARSE---*/ + +} /* namespace INTERFACE */ +} /* namespace ADDONS */ +} /* namespace KODI */ diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_recordings.h b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_recordings.h index bb17d40e636e6..7ab09d097f3a2 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_recordings.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/pvr/pvr_recordings.h @@ -72,6 +72,8 @@ struct IFC_PVR_RECORDING memcpy(strFirstAired.data(), c_data->strFirstAired, PVR_ADDON_DATE_STRING_LENGTH); iFlags = c_data->iFlags; sizeInBytes = c_data->sizeInBytes; + iClientProviderUid = c_data->iClientProviderUid; + memcpy(strProviderName.data(), c_data->strProviderName, PVR_ADDON_NAME_STRING_LENGTH); } void SetCStructure(PVR_RECORDING* c_data) @@ -108,6 +110,8 @@ struct IFC_PVR_RECORDING memcpy(c_data->strFirstAired, strFirstAired.data(), PVR_ADDON_DATE_STRING_LENGTH); c_data->iFlags = iFlags; c_data->sizeInBytes = sizeInBytes; + c_data->iClientProviderUid = iClientProviderUid; + memcpy(c_data->strProviderName, strProviderName.data(), PVR_ADDON_NAME_STRING_LENGTH); } std::array strRecordingId; @@ -139,6 +143,8 @@ struct IFC_PVR_RECORDING std::array strFirstAired; unsigned int iFlags; int64_t sizeInBytes; + int iClientProviderUid; + std::array strProviderName; MSGPACK_DEFINE(strRecordingId, strTitle, @@ -168,7 +174,9 @@ struct IFC_PVR_RECORDING channelType, strFirstAired, iFlags, - sizeInBytes); + sizeInBytes, + iClientProviderUid, + strProviderName); }; /* Code below becomes on auto generation reused, hand edited parts should included here */ diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/videocodec.h b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/videocodec.h index 93b26bb8b80d5..5042e217734f9 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/videocodec.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/addon-instance/videocodec.h @@ -81,8 +81,8 @@ typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_VIDEOCODEC_OPEN_V1)(void*, struct VIDEOCODEC_INITDATA*); typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_VIDEOCODEC_RECONFIGURE_V1)( void*, KODI_ADDON_VIDEOCODEC_HDL, struct VIDEOCODEC_INITDATA*); -typedef const char*(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_VIDEOCODEC_GET_NAME_V1)( - void*, KODI_ADDON_VIDEOCODEC_HDL); +typedef const char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_VIDEOCODEC_GET_NAME_V1)(void*, KODI_ADDON_VIDEOCODEC_HDL); typedef enum VIDEOCODEC_RETVAL(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_VIDEOCODEC_GET_PICTURE_V1)( void*, KODI_ADDON_VIDEOCODEC_HDL, struct VIDEOCODEC_PICTURE*); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_ADDON_VIDEOCODEC_DESTROY_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/filesystem.h b/xbmc/addons/kodi-dev-kit/src/shared/api/filesystem.h index 2b60551834f33..68a52a571f599 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/filesystem.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/filesystem.h @@ -104,18 +104,21 @@ typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_RENAME_FILE_V1)(void*, const ch typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_STAT_FILE_V1)(void*, const char*, struct VFS_STAT_STRUCTURE*); -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_FILE_GET_PROPERTY_VALUE_V1)( - void*, KODI_FILE_HDL, enum FilePropertyTypes, const char*); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_FILE_GET_PROPERTY_VALUE_V1)(void*, + KODI_FILE_HDL, + enum FilePropertyTypes, + const char*); typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_GET_CACHE_THUMB_NAME_V1)(void*, const char*); typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_GET_FILE_MD5_V1)(void*, const char*); typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_HTTP_HEADER_GET_CHARSET_V1)(void*, KODI_HTTP_HEADER_HDL); typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_HTTP_HEADER_GET_HEADER_V1)(void*, KODI_HTTP_HEADER_HDL); -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_HTTP_HEADER_GET_MIME_TYPE_V1)( - void*, KODI_HTTP_HEADER_HDL); -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_HTTP_HEADER_GET_PROTO_LINE_V1)( - void*, KODI_HTTP_HEADER_HDL); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_HTTP_HEADER_GET_MIME_TYPE_V1)(void*, KODI_HTTP_HEADER_HDL); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_HTTP_HEADER_GET_PROTO_LINE_V1)(void*, KODI_HTTP_HEADER_HDL); typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_HTTP_HEADER_GET_VALUE_V1)(void*, KODI_HTTP_HEADER_HDL, const char*); @@ -123,8 +126,12 @@ typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_MAKE_LEGAL_FILENAME_V1)(void*, typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_MAKE_LEGAL_PATH_V1)(void*, const char*); typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_TRANSLATE_SPECIAL_PROTOCOL_V1)(void*, const char*); -typedef char**(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_FILE_GET_PROPERTY_VALUES_V1)( - void*, KODI_FILE_HDL, enum FilePropertyTypes, const char*, size_t*); +typedef char**( + ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_FILE_GET_PROPERTY_VALUES_V1)(void*, + KODI_FILE_HDL, + enum FilePropertyTypes, + const char*, + size_t*); typedef char**(ATTR_INT_APIENTRYP PFN_INT_KODI_VFS_HTTP_HEADER_GET_VALUES_V1)(void*, KODI_HTTP_HEADER_HDL, const char*, diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/button.h b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/button.h index 839a3c25c628a..1b946a93d1e8d 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/button.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/button.h @@ -36,10 +36,12 @@ namespace INTERFACE // Code here relates to direct API calls without use of shared mem from addon to Kodi. //{{{ -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_BUTTON_GET_LABEL2_V1)( - void*, KODI_GUI_CONTROL_HANDLE); -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_BUTTON_GET_LABEL_V1)( - void*, KODI_GUI_CONTROL_HANDLE); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_BUTTON_GET_LABEL2_V1)(void*, + KODI_GUI_CONTROL_HANDLE); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_BUTTON_GET_LABEL_V1)(void*, + KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_BUTTON_SET_ENABLED_V1)( void*, KODI_GUI_CONTROL_HANDLE, bool); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_BUTTON_SET_LABEL2_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/edit.h b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/edit.h index 7a6bcf7998614..04da3f6cfab38 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/edit.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/edit.h @@ -36,10 +36,10 @@ namespace INTERFACE // Code here relates to direct API calls without use of shared mem from addon to Kodi. //{{{ -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_EDIT_GET_LABEL_V1)( - void*, KODI_GUI_CONTROL_HANDLE); -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_EDIT_GET_TEXT_V1)( - void*, KODI_GUI_CONTROL_HANDLE); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_EDIT_GET_LABEL_V1)(void*, KODI_GUI_CONTROL_HANDLE); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_EDIT_GET_TEXT_V1)(void*, KODI_GUI_CONTROL_HANDLE); typedef unsigned int(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_EDIT_GET_CURSOR_POSITION_V1)( void*, KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_EDIT_SET_CURSOR_POSITION_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/fade_label.h b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/fade_label.h index fa27d2a722152..8dd83afa4d629 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/fade_label.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/fade_label.h @@ -36,8 +36,9 @@ namespace INTERFACE // Code here relates to direct API calls without use of shared mem from addon to Kodi. //{{{ -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_FADE_LABEL_GET_LABEL_V1)( - void*, KODI_GUI_CONTROL_HANDLE); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_FADE_LABEL_GET_LABEL_V1)(void*, + KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_FADE_LABEL_ADD_LABEL_V1)( void*, KODI_GUI_CONTROL_HANDLE, const char*); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_FADE_LABEL_RESET_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/label.h b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/label.h index d6b48707ccff5..4176d76d85a37 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/label.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/label.h @@ -36,8 +36,9 @@ namespace INTERFACE // Code here relates to direct API calls without use of shared mem from addon to Kodi. //{{{ -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_LABEL_GET_LABEL_V1)( - void*, KODI_GUI_CONTROL_HANDLE); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_LABEL_GET_LABEL_V1)(void*, + KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_LABEL_SET_LABEL_V1)( void*, KODI_GUI_CONTROL_HANDLE, const char*); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_LABEL_SET_VISIBLE_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/radio_button.h b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/radio_button.h index 3f3e2a0dff791..0a4ce9bd19ae2 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/radio_button.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/radio_button.h @@ -38,8 +38,9 @@ namespace INTERFACE typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_RADIO_BUTTON_IS_SELECTED_V1)( void*, KODI_GUI_CONTROL_HANDLE); -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_RADIO_BUTTON_GET_LABEL_V1)( - void*, KODI_GUI_CONTROL_HANDLE); +typedef char*(ATTR_INT_APIENTRYP + PFN_INT_KODI_GUI_CONTROLS_RADIO_BUTTON_GET_LABEL_V1)(void*, + KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_RADIO_BUTTON_SET_ENABLED_V1)( void*, KODI_GUI_CONTROL_HANDLE, bool); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_RADIO_BUTTON_SET_LABEL_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/slider.h b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/slider.h index 057f1e097bef3..88e6f6be00bad 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/slider.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/slider.h @@ -36,8 +36,9 @@ namespace INTERFACE // Code here relates to direct API calls without use of shared mem from addon to Kodi. //{{{ -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_SLIDER_GET_DESCRIPTION_V1)( - void*, KODI_GUI_CONTROL_HANDLE); +typedef char*(ATTR_INT_APIENTRYP + PFN_INT_KODI_GUI_CONTROLS_SLIDER_GET_DESCRIPTION_V1)(void*, + KODI_GUI_CONTROL_HANDLE); typedef float(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_SLIDER_GET_FLOAT_VALUE_V1)( void*, KODI_GUI_CONTROL_HANDLE); typedef float(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_SLIDER_GET_PERCENTAGE_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/spin.h b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/spin.h index a9b07202f7cc2..56a2c3947cc38 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/spin.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/spin.h @@ -36,8 +36,9 @@ namespace INTERFACE // Code here relates to direct API calls without use of shared mem from addon to Kodi. //{{{ -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_SPIN_GET_STRING_VALUE_V1)( - void*, KODI_GUI_CONTROL_HANDLE); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_SPIN_GET_STRING_VALUE_V1)(void*, + KODI_GUI_CONTROL_HANDLE); typedef float(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_SPIN_GET_FLOAT_VALUE_V1)( void*, KODI_GUI_CONTROL_HANDLE); typedef int(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_SPIN_GET_INT_VALUE_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/text_box.h b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/text_box.h index befae85523114..318a528a14ae9 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/text_box.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/controls/text_box.h @@ -36,8 +36,9 @@ namespace INTERFACE // Code here relates to direct API calls without use of shared mem from addon to Kodi. //{{{ -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_TEXT_BOX_GET_TEXT_V1)( - void*, KODI_GUI_CONTROL_HANDLE); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_TEXT_BOX_GET_TEXT_V1)(void*, + KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_TEXT_BOX_RESET_V1)( void*, KODI_GUI_CONTROL_HANDLE); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_CONTROLS_TEXT_BOX_SCROLL_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/dialogs/extended_progress.h b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/dialogs/extended_progress.h index 642b7cf5727e2..9fd9c57724733 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/dialogs/extended_progress.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/dialogs/extended_progress.h @@ -41,10 +41,12 @@ typedef KODI_GUI_HANDLE( const char*); typedef bool(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_IS_FINISHED_V1)( void*, KODI_GUI_HANDLE); -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_GET_TEXT_V1)( - void*, KODI_GUI_HANDLE); -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_GET_TITLE_V1)( - void*, KODI_GUI_HANDLE); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_GET_TEXT_V1)(void*, + KODI_GUI_HANDLE); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_GET_TITLE_V1)(void*, + KODI_GUI_HANDLE); typedef float(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_GET_PERCENTAGE_V1)( void*, KODI_GUI_HANDLE); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_DIALOGS_EXTENDED_PROGRESS_DELETE_DIALOG_V1)( diff --git a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/list_item.h b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/list_item.h index bd7d51e556c5e..8bfd54af339f6 100644 --- a/xbmc/addons/kodi-dev-kit/src/shared/api/gui/list_item.h +++ b/xbmc/addons/kodi-dev-kit/src/shared/api/gui/list_item.h @@ -49,8 +49,10 @@ typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_LISTITEM_GET_LABEL_V1)(void*, KODI_GUI_LISTITEM_HANDLE); typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_LISTITEM_GET_PATH_V1)(void*, KODI_GUI_LISTITEM_HANDLE); -typedef char*(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_LISTITEM_GET_PROPERTY_V1)( - void*, KODI_GUI_LISTITEM_HANDLE, const char*); +typedef char*( + ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_LISTITEM_GET_PROPERTY_V1)(void*, + KODI_GUI_LISTITEM_HANDLE, + const char*); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_LISTITEM_DESTROY_V1)(void*, KODI_GUI_LISTITEM_HANDLE); typedef void(ATTR_INT_APIENTRYP PFN_INT_KODI_GUI_LISTITEM_SELECT_V1)(void*,