aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--xbmc/visualizations/XBMCProjectM/Main.cpp13
1 files changed, 9 insertions, 4 deletions
diff --git a/xbmc/visualizations/XBMCProjectM/Main.cpp b/xbmc/visualizations/XBMCProjectM/Main.cpp
index 22d669703c..e8d6c7a26b 100644
--- a/xbmc/visualizations/XBMCProjectM/Main.cpp
+++ b/xbmc/visualizations/XBMCProjectM/Main.cpp
@@ -197,7 +197,8 @@ extern "C" void Start(int iChannels, int iSamplesPerSec, int iBitsPerSample, con
//-----------------------------------------------------------------------------
extern "C" void AudioData(const short* pAudioData, int iAudioDataLength, float *pFreqData, int iFreqDataLength)
{
- globalPM->pcm()->addPCM16Data(pAudioData, iAudioDataLength);
+ if (globalPM)
+ globalPM->pcm()->addPCM16Data(pAudioData, iAudioDataLength);
}
//-- Render -------------------------------------------------------------------
@@ -205,7 +206,8 @@ extern "C" void AudioData(const short* pAudioData, int iAudioDataLength, float *
//-----------------------------------------------------------------------------
extern "C" void Render()
{
- globalPM->renderFrame();
+ if (globalPM)
+ globalPM->renderFrame();
}
//-- GetInfo ------------------------------------------------------------------
@@ -224,6 +226,9 @@ extern "C" bool OnAction(long flags, const void *param)
{
bool ret = false;
+ if (!globalPM)
+ return false;
+
if (flags == VIS_ACTION_LOAD_PRESET && param)
{
int pindex = *((int *)param);
@@ -267,7 +272,7 @@ extern "C" bool OnAction(long flags, const void *param)
//-----------------------------------------------------------------------------
extern "C" unsigned int GetPresets(char ***presets)
{
- g_numPresets = globalPM->getPlaylistSize();
+ g_numPresets = globalPM ? globalPM->getPlaylistSize() : 0;
if (g_numPresets > 0)
{
g_presets = (char**) malloc(sizeof(char*)*g_numPresets);
@@ -290,7 +295,7 @@ extern "C" unsigned GetPreset()
if (g_presets)
{
unsigned preset;
- if(globalPM->selectedPresetIndex(preset))
+ if(globalPM && globalPM->selectedPresetIndex(preset))
return preset;
}
return 0;