[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [23031] branches/blender2.5/blender/intern /audaspace: * clean out some warnings (unrefenced vars mainly)
Nathan Letwory
jesterking at letwory.net
Sun Sep 6 16:32:02 CEST 2009
Revision: 23031
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=23031
Author: jesterking
Date: 2009-09-06 16:32:02 +0200 (Sun, 06 Sep 2009)
Log Message:
-----------
* clean out some warnings (unrefenced vars mainly)
Modified Paths:
--------------
branches/blender2.5/blender/intern/audaspace/FX/AUD_DoubleReader.cpp
branches/blender2.5/blender/intern/audaspace/FX/AUD_PingPongFactory.cpp
branches/blender2.5/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
branches/blender2.5/blender/intern/audaspace/intern/AUD_C-API.cpp
branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.cpp
Modified: branches/blender2.5/blender/intern/audaspace/FX/AUD_DoubleReader.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/FX/AUD_DoubleReader.cpp 2009-09-06 13:20:05 UTC (rev 23030)
+++ branches/blender2.5/blender/intern/audaspace/FX/AUD_DoubleReader.cpp 2009-09-06 14:32:02 UTC (rev 23031)
@@ -47,7 +47,7 @@
AUD_THROW(AUD_ERROR_READER);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
if(reader1)
{
Modified: branches/blender2.5/blender/intern/audaspace/FX/AUD_PingPongFactory.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/FX/AUD_PingPongFactory.cpp 2009-09-06 13:20:05 UTC (rev 23030)
+++ branches/blender2.5/blender/intern/audaspace/FX/AUD_PingPongFactory.cpp 2009-09-06 14:32:02 UTC (rev 23031)
@@ -46,7 +46,7 @@
{
reader2 = factory.createReader();
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
reader2 = 0;
}
Modified: branches/blender2.5/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp 2009-09-06 13:20:05 UTC (rev 23030)
+++ branches/blender2.5/blender/intern/audaspace/OpenAL/AUD_OpenALDevice.cpp 2009-09-06 14:32:02 UTC (rev 23031)
@@ -544,13 +544,13 @@
if(alGetError() != AL_NO_ERROR)
AUD_THROW(AUD_ERROR_OPENAL);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
alDeleteSources(1, &sound->source);
throw;
}
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
delete sound; AUD_DELETE("handle")
alcProcessContext(m_context);
@@ -648,19 +648,19 @@
if(alGetError() != AL_NO_ERROR)
AUD_THROW(AUD_ERROR_OPENAL);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
alDeleteSources(1, &sound->source);
throw;
}
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
alDeleteBuffers(AUD_OPENAL_CYCLE_BUFFERS, sound->buffers);
throw;
}
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
delete sound; AUD_DELETE("handle")
delete reader; AUD_DELETE("reader")
@@ -1051,13 +1051,13 @@
if(alGetError() != AL_NO_ERROR)
AUD_THROW(AUD_ERROR_OPENAL);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
alDeleteBuffers(1, &bf->buffer);
throw;
}
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
delete bf; AUD_DELETE("bufferedfactory")
delete reader; AUD_DELETE("reader")
Modified: branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerReader.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerReader.cpp 2009-09-06 13:20:05 UTC (rev 23030)
+++ branches/blender2.5/blender/intern/audaspace/SDL/AUD_SDLMixerReader.cpp 2009-09-06 14:32:02 UTC (rev 23031)
@@ -87,7 +87,7 @@
specs.rate) == -1)
AUD_THROW(AUD_ERROR_SDL);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
delete m_reader; AUD_DELETE("reader")
throw;
Modified: branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2009-09-06 13:20:05 UTC (rev 23030)
+++ branches/blender2.5/blender/intern/audaspace/ffmpeg/AUD_FFMPEGReader.cpp 2009-09-06 14:32:02 UTC (rev 23031)
@@ -119,7 +119,7 @@
// find audio stream and codec
m_stream = -1;
- for(int i = 0; i < m_formatCtx->nb_streams; i++)
+ for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
if((m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
&& (m_stream < 0))
{
@@ -146,7 +146,7 @@
m_specs.format = FFMPEG_TO_AUD(m_codecCtx->sample_fmt);
m_specs.rate = (AUD_SampleRate) m_codecCtx->sample_rate;
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
av_close_input_file(m_formatCtx);
throw;
@@ -188,7 +188,7 @@
// find audio stream and codec
m_stream = -1;
- for(int i = 0; i < m_formatCtx->nb_streams; i++)
+ for(unsigned int i = 0; i < m_formatCtx->nb_streams; i++)
if((m_formatCtx->streams[i]->codec->codec_type == CODEC_TYPE_AUDIO)
&& (m_stream < 0))
{
@@ -215,7 +215,7 @@
m_specs.format = FFMPEG_TO_AUD(m_codecCtx->sample_fmt);
m_specs.rate = (AUD_SampleRate) m_codecCtx->sample_rate;
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
av_close_input_stream(m_formatCtx);
av_free(m_byteiocontext); AUD_DELETE("byteiocontext")
Modified: branches/blender2.5/blender/intern/audaspace/intern/AUD_C-API.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/intern/AUD_C-API.cpp 2009-09-06 13:20:05 UTC (rev 23030)
+++ branches/blender2.5/blender/intern/audaspace/intern/AUD_C-API.cpp 2009-09-06 14:32:02 UTC (rev 23031)
@@ -116,7 +116,7 @@
return true;
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return false;
}
@@ -204,7 +204,7 @@
{
return new AUD_StreamBufferFactory(sound);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return NULL;
}
@@ -218,7 +218,7 @@
{
return new AUD_DelayFactory(sound, delay);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return NULL;
}
@@ -232,7 +232,7 @@
{
return new AUD_LimiterFactory(sound, start, end);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return NULL;
}
@@ -246,7 +246,7 @@
{
return new AUD_PingPongFactory(sound);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return NULL;
}
@@ -260,7 +260,7 @@
{
return new AUD_LoopFactory(sound);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return NULL;
}
@@ -278,7 +278,7 @@
{
return AUD_device->sendMessage(handle, message);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
}
}
@@ -299,7 +299,7 @@
{
return AUD_device->play(sound, keep);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return NULL;
}
@@ -360,7 +360,7 @@
else
return AUD_device->play(sound, keep);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return NULL;
}
@@ -376,7 +376,7 @@
if(AUD_3ddevice)
return AUD_3ddevice->updateListener(*data);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
}
return false;
@@ -391,7 +391,7 @@
if(AUD_3ddevice)
return AUD_3ddevice->setSetting(setting, value);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
}
return false;
@@ -406,7 +406,7 @@
if(AUD_3ddevice)
return AUD_3ddevice->getSetting(setting);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
}
return 0.0;
@@ -424,7 +424,7 @@
if(AUD_3ddevice)
return AUD_3ddevice->updateSource(handle, *data);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
}
}
@@ -443,7 +443,7 @@
if(AUD_3ddevice)
return AUD_3ddevice->setSourceSetting(handle, setting, value);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
}
}
@@ -461,7 +461,7 @@
if(AUD_3ddevice)
return AUD_3ddevice->getSourceSetting(handle, setting);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
}
}
@@ -481,7 +481,7 @@
{
return AUD_device->setCapability(AUD_CAPS_SOURCE_VOLUME, &caps);
}
- catch(AUD_Exception e) {}
+ catch(AUD_Exception) {}
}
return false;
}
@@ -499,7 +499,7 @@
{
return AUD_device->setCapability(AUD_CAPS_SOURCE_PITCH, &caps);
}
- catch(AUD_Exception e) {}
+ catch(AUD_Exception) {}
}
return false;
}
@@ -510,7 +510,7 @@
{
return new AUD_ReadDevice(specs);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return NULL;
}
@@ -525,7 +525,7 @@
{
return device->play(sound) != NULL;
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return false;
}
@@ -540,7 +540,7 @@
{
return device->read(buffer, length);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
return false;
}
@@ -554,7 +554,7 @@
{
delete device;
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
}
}
Modified: branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.cpp
===================================================================
--- branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.cpp 2009-09-06 13:20:05 UTC (rev 23030)
+++ branches/blender2.5/blender/intern/audaspace/jack/AUD_JackDevice.cpp 2009-09-06 14:32:02 UTC (rev 23031)
@@ -35,7 +35,7 @@
int AUD_JackDevice::jack_mix(jack_nframes_t length, void *data)
{
AUD_JackDevice* device = (AUD_JackDevice*)data;
- int samplesize = AUD_SAMPLE_SIZE(device->m_specs);
+ unsigned int samplesize = AUD_SAMPLE_SIZE(device->m_specs);
if(device->m_buffer->getSize() < samplesize * length)
device->m_buffer->resize(samplesize * length);
device->mix(device->m_buffer->getBuffer(), length);
@@ -44,10 +44,10 @@
float* out;
int count = device->m_specs.channels;
- for(int i = 0; i < count; i++)
+ for(unsigned int i = 0; i < count; i++)
{
out = (float*)jack_port_get_buffer(device->m_ports[i], length);
- for(int j = 0; j < length; j++)
+ for(unsigned int j = 0; j < length; j++)
out[j] = in[j * count + i];
}
@@ -105,7 +105,7 @@
if(jack_activate(m_client))
AUD_THROW(AUD_ERROR_JACK);
}
- catch(AUD_Exception e)
+ catch(AUD_Exception)
{
jack_client_close(m_client);
delete[] m_ports; AUD_DELETE("jack_port")
More information about the Bf-blender-cvs
mailing list