diff --git a/src/projectM-engine/PCM.cpp b/src/projectM-engine/PCM.cpp index 3f3ba948e..c926c4210 100755 --- a/src/projectM-engine/PCM.cpp +++ b/src/projectM-engine/PCM.cpp @@ -143,7 +143,7 @@ void PCM::addPCMfloat(const float *PCMdata, int samples) const getPCM(vdataR,512,1,1,0,0); } -void PCM::addPCM16Data(const short* pcm_data, short samples) { +void PCM::addPCM16Data(const short* pcm_data, short samples) const { int i, j; for (i = 0; i < samples; ++i) { @@ -163,7 +163,7 @@ void PCM::addPCM16Data(const short* pcm_data, short samples) { } -void PCM::addPCM16(short PCMdata[2][512]) +void PCM::addPCM16(short PCMdata[2][512]) const { int i,j; int samples=512; @@ -195,7 +195,7 @@ void PCM::addPCM16(short PCMdata[2][512]) } -void PCM::addPCM8( unsigned char PCMdata[2][1024]) +void PCM::addPCM8( unsigned char PCMdata[2][1024]) const { int i,j; int samples=1024; @@ -227,7 +227,7 @@ void PCM::addPCM8( unsigned char PCMdata[2][1024]) getPCM(vdataR,512,1,1,0,0); } -void PCM::addPCM8_512( const unsigned char PCMdata[2][512]) +void PCM::addPCM8_512( const unsigned char PCMdata[2][512]) const { int i,j; int samples=512; diff --git a/src/projectM-engine/PCM.hpp b/src/projectM-engine/PCM.hpp index 957251078..7b6096766 100755 --- a/src/projectM-engine/PCM.hpp +++ b/src/projectM-engine/PCM.hpp @@ -54,10 +54,10 @@ public: ~PCM(); void initPCM(int maxsamples); void addPCMfloat(const float *PCMdata, int samples) const; - void addPCM16(short [2][512]); - void addPCM16Data(const short* pcm_data, short samples); - void addPCM8( unsigned char [2][1024]); - void addPCM8_512( const unsigned char [2][512]); + void addPCM16(short [2][512]) const; + void addPCM16Data(const short* pcm_data, short samples) const; + void addPCM8( unsigned char [2][1024]) const; + void addPCM8_512( const unsigned char [2][512]) const; void getPCM(float *data, int samples, int channel, int freq, float smoothing, int derive) const; void freePCM(); int getPCMnew(float *PCMdata, int channel, int freq, float smoothing, int derive,int reset) const; diff --git a/src/projectM-jack/projectM-jack.cpp b/src/projectM-jack/projectM-jack.cpp index b191720a2..5e0416cfd 100644 --- a/src/projectM-jack/projectM-jack.cpp +++ b/src/projectM-jack/projectM-jack.cpp @@ -46,7 +46,7 @@ jack_default_audio_sample_t out[1024*1000]; FILE *debugFile = NULL; #endif -volatile enum { +volatile enum client_state_t { Init, Run, Exit @@ -230,7 +230,7 @@ process (jack_nframes_t nframes, void *arg) //memcpy (out, in,sizeof (jack_default_audio_sample_t) * nframes); - globalPM->pcm->addPCMfloat(in,nframes); + globalPM->pcm()->addPCMfloat(in,nframes); //printf("%x %f\n",nframes,in[128]); diff --git a/src/projectM-libvisual/actor_projectM.cpp b/src/projectM-libvisual/actor_projectM.cpp index 133f3ecfa..6c712f3dd 100644 --- a/src/projectM-libvisual/actor_projectM.cpp +++ b/src/projectM-libvisual/actor_projectM.cpp @@ -61,14 +61,14 @@ extern "C" const VisPluginInfo *get_plugin_info (int *count) actor[0].vidoptions.depth = VISUAL_VIDEO_DEPTH_GL; /* We want GL clearly */ - info[0].type = VISUAL_PLUGIN_TYPE_ACTOR; + info[0].type = (char*)VISUAL_PLUGIN_TYPE_ACTOR; - info[0].plugname = "projectM"; - info[0].name = "libvisual projectM"; - info[0].author = "Peter Sperl"; - info[0].version = "1.00"; - info[0].about = "projectM"; - info[0].help = ""; + info[0].plugname = (char*)"projectM"; + info[0].name = (char*)"libvisual projectM"; + info[0].author = (char*)"Peter Sperl"; + info[0].version = (char*)"1.00"; + info[0].about = (char*)"projectM"; + info[0].help = (char*)""; info[0].init = lv_projectm_init; info[0].cleanup = lv_projectm_cleanup; @@ -219,10 +219,10 @@ extern "C" int lv_projectm_render (VisPluginData *plugin, VisVideo *video, VisAu int i; visual_buffer_set_data_pair (&pcmb, pcm[0], sizeof (pcm[0])); - visual_audio_get_sample (audio, &pcmb, VISUAL_AUDIO_CHANNEL_LEFT); + visual_audio_get_sample (audio, &pcmb, (char*)VISUAL_AUDIO_CHANNEL_LEFT); visual_buffer_set_data_pair (&pcmb, pcm[1], sizeof (pcm[1])); - visual_audio_get_sample (audio, &pcmb, VISUAL_AUDIO_CHANNEL_RIGHT); + visual_audio_get_sample (audio, &pcmb, (char*)VISUAL_AUDIO_CHANNEL_RIGHT); /* for (i = 0; i < 512; i++) { @@ -233,7 +233,7 @@ extern "C" int lv_projectm_render (VisPluginData *plugin, VisVideo *video, VisAu addPCM16Data(pcms,512); */ - priv->PM->pcm->addPCMfloat(*pcm,512); + priv->PM->pcm()->addPCMfloat(*pcm,512); priv->PM->renderFrame(); diff --git a/src/projectM-test/projectM-test-memleak.cpp b/src/projectM-test/projectM-test-memleak.cpp index 1efb5059a..8dfde66b6 100644 --- a/src/projectM-test/projectM-test-memleak.cpp +++ b/src/projectM-test/projectM-test-memleak.cpp @@ -42,7 +42,7 @@ std::string read_config(); FILE *debugFile = NULL; #endif -volatile enum { +volatile enum client_state_t { Init, Run, Exit @@ -178,12 +178,12 @@ void renderLoop() { } - if(key == SDLK_f) + if((SDLKey)key == SDLK_f) { resize_display(fvw, fvh, fullscreen); globalPM->projectM_resetGL( fvw, fvh ); } - else if(key == SDLK_q) { exit (1);} + else if((SDLKey)key == SDLK_q) { exit (1);} else {globalPM->key_handler(evt,key,mod);} } diff --git a/src/projectM-xmms/main.cpp b/src/projectM-xmms/main.cpp index f81ba6b18..eebba7982 100755 --- a/src/projectM-xmms/main.cpp +++ b/src/projectM-xmms/main.cpp @@ -71,7 +71,7 @@ VisPlugin projectM_vtable = { NULL, // Handle, filled in by xmms NULL, // Filename, filled in by xmms 0, // Session ID - "projectM v1.00", // description + (char*)"projectM v1.00", // description 2, // # of PCM channels for render_pcm() 0, // # of freq channels wanted for render_freq() projectM_xmms_init, // Called when plugin is enabled @@ -332,7 +332,7 @@ extern "C" void projectM_render_pcm(gint16 pcm_data[2][512]) { //SDL_mutexP(mutex); while ( SDL_SemValue(sem)==1 ) if ( SDL_SemValue(sem)==1 ) - globalPM->pcm->addPCM16(pcm_data); + globalPM->pcm()->addPCM16(pcm_data); //SDL_mutexV(mutex);