Permalink
Browse files

Merge pull request #9332 from AlwinEsch/cleanup-lib-rework

[addon] Cleanup lib rework
  • Loading branch information...
2 parents 3a8a2e5 + 19c4107 commit 3bb38bf16320070dd8b98c631010408b3e2cd6a0 @AlwinEsch AlwinEsch committed Mar 12, 2016
Showing with 63 additions and 68 deletions.
  1. +1 −1 xbmc/addons/binary/interfaces/AddonInterfaces.cpp
  2. +1 −1 xbmc/addons/binary/interfaces/AddonInterfaces.h
  3. +1 −1 xbmc/addons/binary/interfaces/CMakeLists.txt
  4. +1 −1 xbmc/addons/binary/interfaces/IAddonInterface.h
  5. +3 −3 xbmc/addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.cpp
  6. +3 −3 xbmc/addons/binary/interfaces/api1/Addon/AddonCallbacksAddon.h
  7. +3 −3 xbmc/addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.cpp
  8. +3 −3 xbmc/addons/binary/interfaces/api1/AudioDSP/AddonCallbacksAudioDSP.h
  9. +3 −3 xbmc/addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.cpp
  10. +3 −3 xbmc/addons/binary/interfaces/api1/AudioEngine/AddonCallbacksAudioEngine.h
  11. +3 −3 xbmc/addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.cpp
  12. +3 −3 xbmc/addons/binary/interfaces/api1/Codec/AddonCallbacksCodec.h
  13. +3 −4 xbmc/addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.cpp
  14. +4 −4 xbmc/addons/binary/interfaces/api1/GUI/AddonCallbacksGUI.h
  15. +3 −3 xbmc/addons/binary/interfaces/api1/GUI/AddonGUIRenderingControl.cpp
  16. +3 −3 xbmc/addons/binary/interfaces/api1/GUI/AddonGUIRenderingControl.h
  17. +3 −3 xbmc/addons/binary/interfaces/api1/GUI/AddonGUIWindow.cpp
  18. +5 −5 xbmc/addons/binary/interfaces/api1/GUI/AddonGUIWindow.h
  19. +3 −5 xbmc/addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.cpp
  20. +3 −5 xbmc/addons/binary/interfaces/api1/InputStream/AddonCallbacksInputStream.h
  21. +1 −1 xbmc/addons/binary/interfaces/api1/InputStream/CMakeLists.txt
  22. +3 −3 xbmc/addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.cpp
  23. +4 −4 xbmc/addons/binary/interfaces/api1/PVR/AddonCallbacksPVR.h
@@ -329,4 +329,4 @@ void CAddonInterfaces::OnApplicationMessage(ThreadMessage* pMsg)
}
}
-}; /* namespace ADDON */
+} /* namespace ADDON */
@@ -146,4 +146,4 @@ namespace ADDON
void* m_helperPeripheral;
};
-}; /* namespace ADDON */
+} /* namespace ADDON */
@@ -6,5 +6,5 @@ set(HEADERS AddonInterfaces.h
core_add_library(addonsBinaryInterfaces)
if(ENABLE_INTERNAL_FFMPEG)
- add_dependencies(addons ffmpeg)
+ add_dependencies(addonsBinaryInterfaces ffmpeg)
endif()
@@ -49,4 +49,4 @@ namespace ADDON
const std::string m_version;
};
-}; /* namespace ADDON */
+} /* namespace ADDON */
@@ -661,7 +661,7 @@ bool CAddonCallbacksAddon::CURLOpen(const void* addonData, void* file, unsigned
return cfile->CURLOpen(flags);
}
-}; /* namespace AddOn */
+} /* namespace AddOn */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -169,7 +169,7 @@ class CAddonCallbacksAddon : public ADDON::IAddonInterface
CB_AddOnLib *m_callbacks; /*!< callback addresses */
};
-}; /* namespace AddOn */
+} /* namespace AddOn */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -275,7 +275,7 @@ float CAddonCallbacksADSP::ADSPSoundPlay_GetVolume(void *addonData, ADSPHANDLE h
return ((IAESound*)handle)->GetVolume();
}
-}; /* namespace AudioDSP */
+} /* namespace AudioDSP */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -194,7 +194,7 @@ class CAddonCallbacksADSP : public ADDON::IAddonInterface
CB_ADSPLib *m_callbacks; /*!< callback addresses */
};
-}; /* namespace AudioDSP */
+} /* namespace AudioDSP */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -401,7 +401,7 @@ void CAddonCallbacksAudioEngine::AEStream_SetResampleRatio(void *AddonData, AESt
((IAEStream*)StreamHandle)->SetResampleRatio(Ratio);
}
-}; /* namespace AudioEngine */
+} /* namespace AudioEngine */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -270,7 +270,7 @@ class CAddonCallbacksAudioEngine : public ADDON::IAddonInterface
CB_AudioEngineLib *m_callbacks; /*!< callback addresses */
};
-}; /* namespace AudioEngine */
+} /* namespace AudioEngine */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -121,7 +121,7 @@ xbmc_codec_t CAddonCallbacksCodec::GetCodecByName(const void* addonData, const c
return CCodecIds::GetInstance().GetCodecByName(strCodecName);
}
-}; /* namespace Codec */
+} /* namespace Codec */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -55,7 +55,7 @@ class CAddonCallbacksCodec : public ADDON::IAddonInterface
CB_CodecLib* m_callbacks; /*!< callback addresses */
};
-}; /* namespace Codec */
+} /* namespace Codec */
-}; /* namespace KoidAPI */
-}; /* namespace V1 */
+} /* namespace KoidAPI */
+} /* namespace V1 */
@@ -19,7 +19,6 @@
*
*/
-//#include "system.h"
#include "AddonCallbacksGUI.h"
#include "AddonGUIRenderingControl.h"
#include "AddonGUIWindow.h"
@@ -1916,6 +1915,6 @@ int CAddonCallbacksGUI::Dialog_Select(const char *heading, const char *entries[]
}
//@}
-}; /* namespace GUI */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace GUI */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -26,7 +26,7 @@
namespace ADDON
{
class CAddon;
-};
+}
namespace V1
{
@@ -441,6 +441,6 @@ class CAddonCallbacksGUI : public ADDON::IAddonInterface
CB_GUILib *m_callbacks;
};
-}; /* namespace GUI */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace GUI */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -88,6 +88,6 @@ bool CGUIAddonRenderingControl::IsDirty()
return ret;
}
-}; /* namespace GUI */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace GUI */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -53,6 +53,6 @@ friend class CAddonCallbacksGUI;
int m_refCount;
};
-}; /* namespace GUI */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace GUI */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -353,6 +353,6 @@ void CGUIAddonWindowDialog::Show_Internal(bool show /* = true */)
}
}
-}; /* namespace GUI */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace GUI */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -27,7 +27,7 @@
namespace ADDON
{
class CAddon;
-};
+}
namespace V1
{
@@ -102,8 +102,8 @@ class CGUIAddonWindowDialog : public CGUIAddonWindow
private:
bool m_bRunning;
-};
+};
-}; /* namespace GUI */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace GUI */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -21,8 +21,6 @@
#include "addons/Addon.h"
#include "AddonCallbacksInputStream.h"
-using namespace ADDON;
-
namespace V1
{
namespace KodiAPI
@@ -55,7 +53,7 @@ DemuxPacket* CAddonCallbacksInputStream::InputStreamAllocateDemuxPacket(void *ad
return CDVDDemuxUtils::AllocateDemuxPacket(iDataSize);
}
-}; /* namespace InputStream */
+} /* namespace InputStream */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -40,8 +40,6 @@ typedef struct CB_INPUTSTREAMLib
InputStreamAllocateDemuxPacket AllocateDemuxPacket;
} CB_INPUTSTREAMLib;
-class CAddon;
-
class CAddonCallbacksInputStream : public ADDON::IAddonInterface
{
public:
@@ -72,7 +70,7 @@ class CAddonCallbacksInputStream : public ADDON::IAddonInterface
CB_INPUTSTREAMLib* m_callbacks; /*!< callback addresses */
};
-}; /* namespace InputStream */
+} /* namespace InputStream */
-}; /* namespace KoidAPI */
-}; /* namespace V1 */
+} /* namespace KoidAPI */
+} /* namespace V1 */
@@ -5,5 +5,5 @@ set(HEADERS AddonCallbacksInputStream.h)
core_add_library(api1AddonCallbacks_InputStream)
if(ENABLE_INTERNAL_FFMPEG)
- add_dependencies(addons ffmpeg)
+ add_dependencies(api1AddonCallbacks_InputStream ffmpeg)
endif()
@@ -471,7 +471,7 @@ void CAddonCallbacksPVR::PVREpgEventStateChange(void* addonData, EPG_TAG* tag, u
}
}
-}; /* namespace PVR */
+} /* namespace PVR */
-}; /* namespace KodiAPI */
-}; /* namespace V1 */
+} /* namespace KodiAPI */
+} /* namespace V1 */
@@ -32,7 +32,7 @@ namespace PVR
namespace ADDON
{
class CAddon;
-};
+}
namespace V1
{
@@ -239,6 +239,6 @@ class CAddonCallbacksPVR : public ADDON::IAddonInterface
CB_PVRLib *m_callbacks; /*!< callback addresses */
};
-}; /* namespace PVR */
-}; /* namespace V1 */
-}; /* namespace PVRLIB */
+} /* namespace PVR */
+} /* namespace V1 */
+} /* namespace PVRLIB */

0 comments on commit 3bb38bf

Please sign in to comment.