{
delete m_pDll;
m_pDll = NULL;
- new CAddonStatusHandler(ID(), STATUS_UNKNOWN, "Can't load Dll", false);
+ new CAddonStatusHandler(ID(), ADDON_STATUS_UNKNOWN, "Can't load Dll", false);
return false;
}
m_pStruct = (TheStruct*)malloc(sizeof(TheStruct));
try
{
ADDON_STATUS status = m_pDll->Create(NULL, m_pInfo);
- if (status == STATUS_OK)
+ if (status == ADDON_STATUS_OK)
m_initialized = true;
- else if ((status == STATUS_NEED_SETTINGS) || (status == STATUS_NEED_SAVEDSETTINGS))
+ else if ((status == ADDON_STATUS_NEED_SETTINGS) || (status == ADDON_STATUS_NEED_SAVEDSETTINGS))
{
- m_needsavedsettings = (status == STATUS_NEED_SAVEDSETTINGS);
- if (TransferSettings() == STATUS_OK)
+ m_needsavedsettings = (status == ADDON_STATUS_NEED_SAVEDSETTINGS);
+ if (TransferSettings() == ADDON_STATUS_OK)
m_initialized = true;
else
new CAddonStatusHandler(ID(), status, "", false);
{
HandleException(e, "m_pDll->GetStatus()");
}
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
}
template<class TheDll, typename TheStruct, typename TheProps>
if (!LoadDll())
return false;
- StructSetting** sSet;
+ ADDON_StructSetting** sSet;
std::vector<DllSetting> vSet;
unsigned entries = 0;
try
ADDON_STATUS CAddonDll<TheDll, TheStruct, TheProps>::TransferSettings()
{
bool restart = false;
- ADDON_STATUS reportStatus = STATUS_OK;
+ ADDON_STATUS reportStatus = ADDON_STATUS_OK;
CLog::Log(LOGDEBUG, "Calling TransferSettings for: %s", Name().c_str());
const TiXmlElement *setting = category->FirstChildElement("setting");
while (setting)
{
- ADDON_STATUS status = STATUS_OK;
+ ADDON_STATUS status = ADDON_STATUS_OK;
const char *id = setting->Attribute("id");
const char *type = setting->Attribute("type");
CLog::Log(LOGERROR, "Unknown setting type '%s' for %s", type, Name().c_str());
}
- if (status == STATUS_NEED_RESTART)
+ if (status == ADDON_STATUS_NEED_RESTART)
restart = true;
- else if (status != STATUS_OK)
+ else if (status != ADDON_STATUS_OK)
reportStatus = status;
}
setting = setting->NextSiblingElement("setting");
category = category->NextSiblingElement("category");
}
- if (restart || reportStatus != STATUS_OK)
+ if (restart || reportStatus != ADDON_STATUS_OK)
{
- new CAddonStatusHandler(ID(), restart ? STATUS_NEED_RESTART : reportStatus, "", true);
+ new CAddonStatusHandler(ID(), restart ? ADDON_STATUS_NEED_RESTART : reportStatus, "", true);
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
template<class TheDll, typename TheStruct, typename TheProps>
heading.Format("%s: %s", TranslateType(m_addon->Type(), true).c_str(), m_addon->Name().c_str());
/* AddOn lost connection to his backend (for ones that use Network) */
- if (m_status == STATUS_LOST_CONNECTION)
+ if (m_status == ADDON_STATUS_LOST_CONNECTION)
{
CGUIDialogYesNo* pDialog = (CGUIDialogYesNo*)g_windowManager.GetWindow(WINDOW_DIALOG_YES_NO);
if (!pDialog) return;
CAddonMgr::Get().GetCallbackForType(m_addon->Type())->RequestRestart(m_addon, false);
}
/* Request to restart the AddOn and data structures need updated */
- else if (m_status == STATUS_NEED_RESTART)
+ else if (m_status == ADDON_STATUS_NEED_RESTART)
{
CGUIDialogOK* pDialog = (CGUIDialogOK*)g_windowManager.GetWindow(WINDOW_DIALOG_OK);
if (!pDialog) return;
CAddonMgr::Get().GetCallbackForType(m_addon->Type())->RequestRestart(m_addon, true);
}
/* Some required settings are missing/invalid */
- else if ((m_status == STATUS_NEED_SETTINGS) || (m_status == STATUS_NEED_SAVEDSETTINGS))
+ else if ((m_status == ADDON_STATUS_NEED_SETTINGS) || (m_status == ADDON_STATUS_NEED_SAVEDSETTINGS))
{
CGUIDialogYesNo* pDialogYesNo = (CGUIDialogYesNo*)g_windowManager.GetWindow(WINDOW_DIALOG_YES_NO);
if (!pDialogYesNo) return;
}
}
/* A unknown event has occurred */
- else if (m_status == STATUS_UNKNOWN)
+ else if (m_status == ADDON_STATUS_UNKNOWN)
{
//CAddonMgr::Get().DisableAddon(m_addon->ID());
CGUIDialogOK* pDialog = (CGUIDialogOK*)g_windowManager.GetWindow(WINDOW_DIALOG_OK);
virtual void Destroy() =0;
virtual ADDON_STATUS GetStatus() =0;
virtual bool HasSettings() =0;
- virtual unsigned int GetSettings(StructSetting*** sSet)=0;
+ virtual unsigned int GetSettings(ADDON_StructSetting*** sSet)=0;
virtual void FreeSettings()=0;
virtual ADDON_STATUS SetSetting(const char *settingName, const void *settingValue) =0;
};
DEFINE_METHOD0(void, Destroy)
DEFINE_METHOD0(ADDON_STATUS, GetStatus)
DEFINE_METHOD0(bool, HasSettings)
- DEFINE_METHOD1(unsigned int, GetSettings, (StructSetting ***p1))
+ DEFINE_METHOD1(unsigned int, GetSettings, (ADDON_StructSetting ***p1))
DEFINE_METHOD0(void, FreeSettings)
DEFINE_METHOD2(ADDON_STATUS, SetSetting, (const char *p1, const void *p2))
DEFINE_METHOD1(void, GetAddon, (TheStruct* p1))
BEGIN_METHOD_RESOLVE()
RESOLVE_METHOD_RENAME(get_addon,GetAddon)
- RESOLVE_METHOD(Create)
- RESOLVE_METHOD(Stop)
- RESOLVE_METHOD(Destroy)
- RESOLVE_METHOD(GetStatus)
- RESOLVE_METHOD(HasSettings)
- RESOLVE_METHOD(SetSetting)
- RESOLVE_METHOD(GetSettings)
- RESOLVE_METHOD(FreeSettings)
+ RESOLVE_METHOD_RENAME(ADDON_Create, Create)
+ RESOLVE_METHOD_RENAME(ADDON_Stop, Stop)
+ RESOLVE_METHOD_RENAME(ADDON_Destroy, Destroy)
+ RESOLVE_METHOD_RENAME(ADDON_GetStatus, GetStatus)
+ RESOLVE_METHOD_RENAME(ADDON_HasSettings, HasSettings)
+ RESOLVE_METHOD_RENAME(ADDON_SetSetting, SetSetting)
+ RESOLVE_METHOD_RENAME(ADDON_GetSettings, GetSettings)
+ RESOLVE_METHOD_RENAME(ADDON_FreeSettings, FreeSettings)
END_METHOD_RESOLVE()
};
{
public:
- static unsigned int VecToStruct(std::vector<DllSetting> &vecSet, StructSetting*** sSet)
+ static unsigned int VecToStruct(std::vector<DllSetting> &vecSet, ADDON_StructSetting*** sSet)
{
*sSet = NULL;
if(vecSet.size() == 0)
unsigned int uiElements=0;
- *sSet = (StructSetting**)malloc(vecSet.size()*sizeof(StructSetting*));
+ *sSet = (ADDON_StructSetting**)malloc(vecSet.size()*sizeof(ADDON_StructSetting*));
for(unsigned int i=0;i<vecSet.size();i++)
{
(*sSet)[i] = NULL;
- (*sSet)[i] = (StructSetting*)malloc(sizeof(StructSetting));
+ (*sSet)[i] = (ADDON_StructSetting*)malloc(sizeof(ADDON_StructSetting));
(*sSet)[i]->id = NULL;
(*sSet)[i]->label = NULL;
uiElements++;
return uiElements;
}
- static void StructToVec(unsigned int iElements, StructSetting*** sSet, std::vector<DllSetting> *vecSet)
+ static void StructToVec(unsigned int iElements,
ADDON_StructSetting*** sSet, std::vector<DllSetting> *vecSet)
{
if(iElements == 0)
return;
}
}
- static void FreeStruct(unsigned int iElements, StructSetting*** sSet)
+ static void FreeStruct(unsigned int iElements, ADDON_StructSetting*** sSet)
{
if(iElements == 0)
return;
extern "C" {
#endif
- ADDON_STATUS __declspec(dllexport) Create(void *callbacks, void* props);
- void __declspec(dllexport) Stop();
- void __declspec(dllexport) Destroy();
- ADDON_STATUS __declspec(dllexport) GetStatus();
- bool __declspec(dllexport) HasSettings();
- unsigned int __declspec(dllexport) GetSettings(StructSetting ***sSet);
- ADDON_STATUS __declspec(dllexport) SetSetting(const char *settingName, const void *settingValue);
- void __declspec(dllexport) FreeSettings();
+ ADDON_STATUS __declspec(dllexport) ADDON_Create(void *callbacks, void* props);
+ void __declspec(dllexport) ADDON_Stop();
+ void __declspec(dllexport) ADDON_Destroy();
+ ADDON_STATUS __declspec(dllexport) ADDON_GetStatus();
+ bool __declspec(dllexport) ADDON_HasSettings();
+ unsigned int __declspec(dllexport) ADDON_GetSettings(ADDON_StructSetting ***sSet);
+ ADDON_STATUS __declspec(dllexport) ADDON_SetSetting(const char *settingName, const void *settingValue);
+ void __declspec(dllexport) ADDON_FreeSettings();
#ifdef __cplusplus
};
enum ADDON_STATUS
{
- STATUS_OK,
- STATUS_LOST_CONNECTION,
- STATUS_NEED_RESTART,
- STATUS_NEED_SETTINGS,
- STATUS_UNKNOWN,
- STATUS_NEED_SAVEDSETTINGS
+ ADDON_STATUS_OK,
+ ADDON_STATUS_LOST_CONNECTION,
+ ADDON_STATUS_NEED_RESTART,
+ ADDON_STATUS_NEED_SETTINGS,
+ ADDON_STATUS_UNKNOWN,
+ ADDON_STATUS_NEED_SAVEDSETTINGS
};
typedef struct
int current;
char** entry;
unsigned int entry_elements;
-} StructSetting;
+} ADDON_StructSetting;
#ifdef __cplusplus
};
extern "C" {
-ADDON_STATUS Create(void* hdl, void* props)
+ADDON_STATUS ADDON_Create(void* hdl, void* props)
{
if (!props)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
SCR_PROPS* scrprops = (SCR_PROPS*)props;
Common::height = scrprops->height;
Common::aspectRatio = float(Common::width) / float(Common::height);
Common::init(0, NULL);
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
void Start()
Hack::tick();
}
-void Stop()
+void ADDON_Stop()
{
Hack::stop();
}
-void Destroy()
+void ADDON_Destroy()
{
}
-ADDON_STATUS GetStatus()
+ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
-bool HasSettings()
+bool ADDON_HasSettings()
{
return false;
}
-unsigned int GetSettings(StructSetting ***sSet)
+unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet)
{
return 0;
}
-ADDON_STATUS SetSetting(const char *settingName, const void *settingValue)
+ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
-void FreeSettings()
+void ADDON_FreeSettings()
{
}
extern "C" {
-ADDON_STATUS Create(void* hdl, void* props)
+ADDON_STATUS ADDON_Create(void* hdl, void* props)
{
if (!props)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
SCR_PROPS* scrprops = (SCR_PROPS*)props;
Common::height = scrprops->height;
Common::aspectRatio = float(Common::width) / float(Common::height);
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
void Start()
Hack::tick();
}
-void Stop()
+void ADDON_Stop()
{
Hack::stop();
}
-void Destroy()
+void ADDON_Destroy()
{
}
-ADDON_STATUS GetStatus()
+ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
-bool HasSettings()
+bool ADDON_HasSettings()
{
return false;
}
-unsigned int GetSettings(StructSetting ***sSet)
+unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet)
{
return 0;
}
-ADDON_STATUS SetSetting(const char *settingName, const void *settingValue)
+ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
-void FreeSettings()
+void ADDON_FreeSettings()
{
}
extern "C" {
-ADDON_STATUS Create(void* hdl, void* props)
+ADDON_STATUS ADDON_Create(void* hdl, void* props)
{
if (!props)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
SCR_PROPS* scrprops = (SCR_PROPS*)props;
Common::aspectRatio = float(Common::width) / float(Common::height);
Common::resources = new ResourceManager;
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
void Start()
Hack::tick();
}
-void Stop()
+void ADDON_Stop()
{
Hack::stop();
}
-void Destroy()
+void ADDON_Destroy()
{
delete Common::resources;
}
-ADDON_STATUS GetStatus()
+ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
-bool HasSettings()
+bool ADDON_HasSettings()
{
return false;
}
-unsigned int GetSettings(StructSetting ***sSet)
+unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet)
{
return 0;
}
-ADDON_STATUS SetSetting(const char *settingName, const void *settingValue)
+ADDON_STATUS ADDON_SetSetting(const char *settingName, const void *settingValue)
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
-void FreeSettings()
+void ADDON_FreeSettings()
{
}
// Called on load. Addon should fully initalize or return error status
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-ADDON_STATUS Create(void* hdl, void* visProps)
+ADDON_STATUS ADDON_Create(void* hdl, void* visProps)
{
if (!visProps)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
VIS_PROPS* props = (VIS_PROPS*) visProps;
g_device = (LPDIRECT3DDEVICE9) props->device;
- return STATUS_NEED_SETTINGS;
+ return ADDON_STATUS_NEED_SETTINGS;
}
//-- Render -------------------------------------------------------------------
// This dll must stop all runtime activities
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Stop()
+extern "C" void ADDON_Stop()
{
}
// Do everything before unload of this add-on
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Destroy()
+extern "C" void ADDON_Destroy()
{
}
// Returns true if this add-on use settings
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" bool HasSettings()
+extern "C" bool ADDON_HasSettings()
{
return true;
}
// Returns the current Status of this visualisation
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS GetStatus()
+extern "C" ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- GetSettings --------------------------------------------------------------
// Return the settings for XBMC to display
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" unsigned int GetSettings(StructSetting ***sSet)
+extern "C" unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet)
{
return 0;
}
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void FreeSettings()
+extern "C" void ADDON_FreeSettings()
{
}
// Set a specific Setting value (called from XBMC)
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS SetSetting(const char *strSetting, const void* value)
+extern "C" ADDON_STATUS ADDON_SetSetting(const char *strSetting, const void* value)
{
if (!strSetting || !value)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
if (strcmp(strSetting, "bar_height")==0)
{
scale = 0.33f / log(256.0f);
break;
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
else if (strcmp(strSetting, "speed")==0)
hSpeed = 0.20f;
break;
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
else if (strcmp(strSetting, "mode")==0)
g_mode = D3DFILL_POINT;
break;
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
}
//-- Create -------------------------------------------------------------------
// Called once when the visualisation is created by XBMC. Do any setup here.
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS Create(void* hdl, void* props)
+extern "C" ADDON_STATUS ADDON_Create(void* hdl, void* props)
{
if (!props)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
VIS_PROPS* visprops = (VIS_PROPS*)props;
g_goom = goom_init(g_tex_width, g_tex_height);
if (!g_goom)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
g_goom_buffer = (unsigned char*)malloc(g_tex_width * g_tex_height * 4);
goom_set_screenbuffer( g_goom, g_goom_buffer );
g_window_xpos = visprops->x;
g_window_ypos = visprops->y;
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- Destroy -------------------------------------------------------------------
// Do everything before unload of this add-on
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Destroy()
+extern "C" void ADDON_Destroy()
{
if ( g_goom )
{
//-- Stop ---------------------------------------------------------------------
// Called when the visualisation is closed by XBMC
//-----------------------------------------------------------------------------
-extern "C" void Stop()
+extern "C" void ADDON_Stop()
{
if (g_texid)
{
// Returns true if this add-on use settings
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" bool HasSettings()
+extern "C" bool ADDON_HasSettings()
{
return false;
}
// Returns the current Status of this visualisation
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS GetStatus()
+extern "C" ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- GetSettings --------------------------------------------------------------
// Return the settings for XBMC to display
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" unsigned int GetSettings(StructSetting ***sSet)
+extern "C" unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet)
{
return 0;
}
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void FreeSettings()
+extern "C" void ADDON_FreeSettings()
{
}
// Set a specific Setting value (called from XBMC)
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS SetSetting(const char *strSetting, const void* value)
+extern "C" ADDON_STATUS ADDON_SetSetting(const char *strSetting, const void* value)
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
}
}
-extern "C" ADDON_STATUS Create(void* hdl, void* props)
+extern "C" ADDON_STATUS ADDON_Create(void* hdl, void* props)
{
if (!props)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
VIS_PROPS* visprops = (VIS_PROPS*)props;
_mkdir(visprops->profile);
Preinit();
g_plugin->PluginInitialize((LPDIRECT3DDEVICE9)visprops->device, visprops->x, visprops->y, visprops->width, visprops->height, visprops->pixelRatio);
- return STATUS_NEED_SAVEDSETTINGS; // We need some settings to be saved later before we quit this plugin
+ return ADDON_STATUS_NEED_SAVEDSETTINGS; // We need some settings to be saved later before we quit this plugin
}
extern "C" void Start(int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName)
{}
-extern "C" void Stop()
+extern "C" void ADDON_Stop()
{
if(g_plugin)
{
// Do everything before unload of this add-on
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Destroy()
+extern "C" void ADDON_Destroy()
{
- Stop();
+ ADDON_Stop();
}
//-- HasSettings --------------------------------------------------------------
// Returns true if this add-on use settings
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" bool HasSettings()
+extern "C" bool ADDON_HasSettings()
{
return true;
}
// Returns the current Status of this visualisation
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS GetStatus()
+extern "C" ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- GetSettings --------------------------------------------------------------
// Return the settings for XBMC to display
//-----------------------------------------------------------------------------
-extern "C" unsigned int GetSettings(StructSetting ***sSet)
+extern "C" unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet)
{
return 0;
}
// Free the settings struct passed from XBMC
//-----------------------------------------------------------------------------
-extern "C" void FreeSettings()
+extern "C" void ADDON_FreeSettings()
{
}
//-- UpdateSetting ------------------------------------------------------------
// Handle setting change request from XBMC
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS SetSetting(const char* id, const void* value)
+extern "C" ADDON_STATUS ADDON_SetSetting(const char* id, const void* value)
{
if (!id || !value)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
if (strcmp(id, "###GetSavedSettings") == 0) // We have some settings to be saved in the settings.xml file
{
{
strcpy((char*)id, "###End");
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
// It is now time to set the settings got from xmbc
if (strcmp(id, "Use Preset") == 0)
if (g_UserPackFolder) SetPresetDir ((char*)value);
}
else
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- GetSubModules ------------------------------------------------------------
//-- Create -------------------------------------------------------------------
// Called on load. Addon should fully initalize or return error status
//-----------------------------------------------------------------------------
-ADDON_STATUS Create(void* hdl, void* props)
+ADDON_STATUS ADDON_Create(void* hdl, void* props)
{
if (!props)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
- return STATUS_NEED_SETTINGS;
+ return ADDON_STATUS_NEED_SETTINGS;
}
//-- Render -------------------------------------------------------------------
// This dll must cease all runtime activities
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Stop()
+extern "C" void ADDON_Stop()
{
}
// Do everything before unload of this add-on
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Destroy()
+extern "C" void ADDON_Destroy()
{
}
// Returns true if this add-on use settings
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" bool HasSettings()
+extern "C" bool ADDON_HasSettings()
{
return true;
}
// Returns the current Status of this visualisation
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS GetStatus()
+extern "C" ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- GetSettings --------------------------------------------------------------
// Return the settings for XBMC to display
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" unsigned int GetSettings(StructSetting ***sSet)
+extern "C" unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet)
{
return 0;
}
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void FreeSettings()
+extern "C" void ADDON_FreeSettings()
{
}
// Set a specific Setting value (called from XBMC)
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS SetSetting(const char *strSetting, const void* value)
+extern "C" ADDON_STATUS ADDON_SetSetting(const char *strSetting, const void* value)
{
if (!strSetting || !value)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
if (strcmp(strSetting, "mode")==0)
{
g_mode = GL_FILL;
break;
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
else if (strcmp(strSetting, "bar_height")==0)
{
scale = 1.f / log(256.f);
break;
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
else if (strcmp(strSetting, "speed")==0)
{
hSpeed = 0.05f;
break;
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
}
// settings vector
StructSetting** g_structSettings;
-extern "C" ADDON_STATUS Create(void* hdl, void* props)
+extern "C" ADDON_STATUS ADDON_Create(void* hdl, void* props)
{
if (!props)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
VIS_PROPS* visprops = (VIS_PROPS*)props;
g_Vortex = new Vortex;
g_Vortex->Init( ( LPDIRECT3DDEVICE9 )visprops->device, visprops->x, visprops->y, visprops->width, visprops->height, visprops->pixelRatio );
- return STATUS_NEED_SETTINGS;
+ return ADDON_STATUS_NEED_SETTINGS;
}
extern "C" void Start( int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName )
g_Vortex->Start( iChannels, iSamplesPerSec, iBitsPerSample, szSongName );
}
-extern "C" void Stop()
+extern "C" void ADDON_Stop()
{
if ( g_Vortex )
{
// Do everything before unload of this add-on
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Destroy()
+extern "C" void ADDON_Destroy()
{
Stop();
}
// Returns true if this add-on use settings
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" bool HasSettings()
+extern "C" bool ADDON_HasSettings()
{
return true;
}
// Returns the current Status of this visualisation
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS GetStatus()
+extern "C" ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
-extern "C" unsigned int GetSettings(StructSetting*** sSet)
+extern "C" unsigned int ADDON_GetSettings(ADDON_StructSetting*** sSet)
{
return 0;
}
-extern "C" void FreeSettings()
+extern "C" void ADDON_FreeSettings()
{
}
-extern "C" ADDON_STATUS SetSetting(const char* id, const void* value)
+extern "C" ADDON_STATUS ADDON_SetSetting(const char* id, const void* value)
{
if ( !id || !value || g_Vortex == NULL )
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
UserSettings& userSettings = g_Vortex->GetUserSettings();
userSettings.ShowAudioAnalysis = *(bool*)value == 1;
}
else
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- GetSubModules ------------------------------------------------------------
//-- Create -------------------------------------------------------------------
// Called on load. Addon should fully initalize or return error status
//-----------------------------------------------------------------------------
-ADDON_STATUS Create(void* hdl, void* props)
+ADDON_STATUS ADDON_Create(void* hdl, void* props)
{
if (!props)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
VIS_PROPS* visProps = (VIS_PROPS*)props;
g_viewport.MinZ = 0;
g_viewport.MaxZ = 1;
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- Start --------------------------------------------------------------------
// This dll must stop all runtime activities
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Stop()
+extern "C" void ADDON_Stop()
{
}
// Do everything before unload of this add-on
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Destroy()
+extern "C" void ADDON_Destroy()
{
}
// Returns true if this add-on use settings
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" bool HasSettings()
+extern "C" bool ADDON_HasSettings()
{
return false;
}
// Returns the current Status of this visualisation
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS GetStatus()
+extern "C" ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- GetSettings --------------------------------------------------------------
// Return the settings for XBMC to display
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" unsigned int GetSettings(StructSetting ***sSet)
+extern "C" unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet)
{
return 0;
}
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void FreeSettings()
+extern "C" void ADDON_FreeSettings()
{
}
// Set a specific Setting value (called from XBMC)
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS SetSetting(const char *strSetting, const void* value)
+extern "C" ADDON_STATUS ADDON_SetSetting(const char *strSetting, const void* value)
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- Create -------------------------------------------------------------------
// Called once when the visualisation is created by XBMC. Do any setup here.
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS Create(void* hdl, void* props)
+extern "C" ADDON_STATUS ADDON_Create(void* hdl, void* props)
{
if (!props)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
VIS_PROPS* visprops = (VIS_PROPS*)props;
g_configPM.windowLeft = visprops->x;
g_configPM.windowBottom = visprops->y;
- return STATUS_NEED_SAVEDSETTINGS;
+ return ADDON_STATUS_NEED_SAVEDSETTINGS;
}
//-- Start --------------------------------------------------------------------
// Do everything before unload of this add-on
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Stop()
+extern "C" void ADDON_Stop()
{
if (globalPM)
{
// Do everything before unload of this add-on
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Destroy()
+extern "C" void ADDON_Destroy()
{
}
// Returns true if this add-on use settings
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" bool HasSettings()
+extern "C" bool ADDON_HasSettings()
{
return true;
}
// Returns the current Status of this visualisation
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS GetStatus()
+extern "C" ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- GetSettings --------------------------------------------------------------
// Return the settings for XBMC to display
//-----------------------------------------------------------------------------
-extern "C" unsigned int GetSettings(StructSetting ***sSet)
+extern "C" unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet)
{
return 0;
}
// Free the settings struct passed from XBMC
//-----------------------------------------------------------------------------
-extern "C" void FreeSettings()
+extern "C" void ADDON_FreeSettings()
{
}
//-- UpdateSetting ------------------------------------------------------------
// Handle setting change request from XBMC
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS SetSetting(const char* id, const void* value)
+extern "C" ADDON_STATUS ADDON_SetSetting(const char* id, const void* value)
{
if (!id || !value)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
if (strcmp(id, "###GetSavedSettings") == 0) // We have some settings to be saved in the settings.xml file
{
{
strcpy((char*)id, "###End");
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
// It is now time to set the settings got from xmbc
if (strcmp(id, "quality")==0)
{
g_configPM.beatSensitivity = *(int*)value * 2;
if (!InitProjectM()) //The last setting value is already set so we (re)initalize
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- GetSubModules ------------------------------------------------------------
//-- Create -------------------------------------------------------------------
// Called on load. Addon should fully initalize or return error status
//-----------------------------------------------------------------------------
-ADDON_STATUS Create(void* hdl, void* visProps)
+ADDON_STATUS ADDON_Create(void* hdl, void* visProps)
{
if (!visProps)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
VIS_PROPS* props = (VIS_PROPS*) visProps;
if (!props->submodule)
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
g_vis_name = props->name;
g_sub_module = props->submodule;
g_tex_buffer = (GLbyte*)malloc( g_tex_buffer_size );
if ( !g_tex_buffer )
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
if ( g_plugin )
{
if ( g_plugin == NULL )
{
printf( "Error loading %s\n", g_vis_name.c_str() );
- return STATUS_UNKNOWN;
+ return ADDON_STATUS_UNKNOWN;
}
/* initialize and start the plugin */
ivis_start( g_plugin );
}
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- Start --------------------------------------------------------------------
//-- Stop ---------------------------------------------------------------------
// Called when the visualisation is closed by XBMC
//-----------------------------------------------------------------------------
-extern "C" void Stop()
+extern "C" void ADDON_Stop()
{
if ( g_tex_id )
{
// Do everything before unload of this add-on
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void Destroy()
+extern "C" void ADDON_Destroy()
{
}
// Returns true if this add-on use settings
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" bool HasSettings()
+extern "C" bool ADDON_HasSettings()
{
return false;
}
// Returns the current Status of this visualisation
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS GetStatus()
+extern "C" ADDON_STATUS ADDON_GetStatus()
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
//-- GetSettings --------------------------------------------------------------
// Return the settings for XBMC to display
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" unsigned int GetSettings(StructSetting ***sSet)
+extern "C" unsigned int ADDON_GetSettings(ADDON_StructSetting ***sSet)
{
return 0;
}
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" void FreeSettings()
+extern "C" void ADDON_FreeSettings()
{
}
// Set a specific Setting value (called from XBMC)
// !!! Add-on master function !!!
//-----------------------------------------------------------------------------
-extern "C" ADDON_STATUS SetSetting(const char *strSetting, const void* value)
+extern "C" ADDON_STATUS ADDON_SetSetting(const char *strSetting, const void* value)
{
- return STATUS_OK;
+ return ADDON_STATUS_OK;
}
projects / vuplus_xbmc / commitdiff