merged: addons-fw branch

git-svn-id: https://xbmc.svn.sourceforge.net/svnroot/xbmc/trunk@28277 568bbfeb-2a22-0410-94d2-cc84cf5bfa90

1 files changed, 0 insertions, 108 deletions

diff --git a/visualisations/xbmc_vis.h b/visualisations/xbmc_vis.h
deleted file mode 100644
index ecb19c38ca..0000000000
--- a/visualisations/xbmc_vis.h
+++ /dev/null
@@ -1,108 +0,0 @@
-#ifndef __XBMC_VIS_H__
-#define __XBMC_VIS_H__
-
-#include <vector>
-#include <ctype.h>
-#ifdef _LINUX
-#include "../xbmc/linux/PlatformInclude.h"
-#ifndef __APPLE__
-#include <sys/sysinfo.h>
-#endif
-#else
-#ifndef WIN32_LEAN_AND_MEAN
-#define WIN32_LEAN_AND_MEAN
-#endif
-#include <windows.h>
-#endif
-#include "../xbmc/utils/log.h"
-#include "../xbmc/visualizations/VisualisationTypes.h"
-#include <sys/stat.h>
-#include <errno.h>
-
-using namespace std;
-
-int htoi(const char *str) /* Convert hex string to integer */
-{
-  unsigned int digit, number = 0;
-  while (*str)
-  {
-    if (isdigit(*str))
-      digit = *str - '0';
-    else
-      digit = tolower(*str)-'a'+10;
-    number<<=4;
-    number+=digit;
-    str++;
-  }
-  return number;
-}
-
-// the settings vector
-vector<VisSetting> m_vecSettings;
-
-
-extern "C"
-{
-  // exports for d3d hacks
-#ifdef HAS_DX
-  void d3dSetTextureStageState( int x, DWORD dwY, DWORD dwZ);
-  void d3dSetRenderState(DWORD dwY, DWORD dwZ);
-#endif
-
-#ifdef HAS_GL
-#ifndef D3DCOLOR_RGBA
-#define D3DCOLOR_RGBA(r,g,b,a) (r|(g<<8)|(b<<16)|(a<<24))
-#endif
-#endif
-
-  // Settings struct
-  StructSetting** m_structSettings;
-  unsigned int m_uiVisElements;
-
-  // the action commands ( see Visualisation.h )
-  #define VIS_ACTION_NEXT_PRESET       1
-  #define VIS_ACTION_PREV_PRESET       2
-  #define VIS_ACTION_LOAD_PRESET       3
-  #define VIS_ACTION_RANDOM_PRESET     4
-  #define VIS_ACTION_LOCK_PRESET       5
-  #define VIS_ACTION_RATE_PRESET_PLUS  6
-  #define VIS_ACTION_RATE_PRESET_MINUS 7
-  #define VIS_ACTION_UPDATE_ALBUMART   8
-  #define VIS_ACTION_UPDATE_TRACK      9
-
-  #define VIS_ACTION_USER 100
-
-  // Functions that your visualisation must implement
-  void Create(void* unused, int iPosX, int iPosY, int iWidth, int iHeight, const char* szVisualisationName,
-              float fPixelRatio, const char *szSubModuleName);
-  void Start(int iChannels, int iSamplesPerSec, int iBitsPerSample, const char* szSongName);
-  void AudioData(short* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength);
-  void Render();
-  void Stop();
-  bool OnAction(long action, void *param);
-  void GetInfo(VIS_INFO* pInfo);
-  void FreeSettings();
-  unsigned int GetSettings(StructSetting*** sSet);
-  void UpdateSetting(int num, StructSetting*** sSet);
-  void GetPresets(char ***pPresets, int *currentPreset, int *numPresets, bool *locked);
-  int  GetSubModules(char ***names, char ***paths);
-
-  // function to export the above structure to XBMC
-  void __declspec(dllexport) get_module(struct Visualisation* pVisz)
-  {
-    pVisz->Create = Create;
-    pVisz->Start = Start;
-    pVisz->AudioData = AudioData;
-    pVisz->Render = Render;
-    pVisz->Stop = Stop;
-    pVisz->GetInfo = GetInfo;
-    pVisz->OnAction = OnAction;
-    pVisz->GetSettings = GetSettings;
-    pVisz->UpdateSetting = UpdateSetting;
-    pVisz->GetPresets = GetPresets;
-    pVisz->GetSubModules = GetSubModules;
-    pVisz->FreeSettings = FreeSettings;
-  };
-};
-
-#endif