[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [15830] branches/sound-branch/intern/ soundsystem: const correctness, convered SND_3d.cpp to unix endline, removed some warnings.

[Robert Holcomb]

Revision: 15830
          http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15830
Author:   scourage
Date:     2008-07-28 03:32:14 +0200 (Mon, 28 Jul 2008)

Log Message:
-----------
const correctness, convered SND_3d.cpp to unix endline, removed some warnings. 

Modified Paths:
--------------
    branches/sound-branch/intern/soundsystem/SND_3d.cpp
    branches/sound-branch/intern/soundsystem/SND_C-api.h
    branches/sound-branch/intern/soundsystem/SND_device.cpp
    branches/sound-branch/intern/soundsystem/SND_factory.cpp
    branches/sound-branch/intern/soundsystem/SND_internal.h

Modified: branches/sound-branch/intern/soundsystem/SND_3d.cpp
===================================================================
--- branches/sound-branch/intern/soundsystem/SND_3d.cpp	2008-07-28 00:55:28 UTC (rev 15829)
+++ branches/sound-branch/intern/soundsystem/SND_3d.cpp	2008-07-28 01:32:14 UTC (rev 15830)
@@ -1,31 +1,33 @@
 #include "SND_internal.h"
 
-void SND_SetListenerGain(float gain)
-{
-   gSndCfg.mListenerGain=gain;
-}
-
-void SND_SetDopplerVelocity(float vel)
-{
-   gSndCfg.mListenerDopplerVelocity=vel;
-}
-
-void SND_SetDopplerFactor(float factor)
-{
-   gSndCfg.mListenernDopplerFactor=factor;
-}
-
-float SND_GetListenerGain()
-{
-   return gSndCfg.mListenerGain;
-}
-
-float SND_GetDopplerVelocity()
-{
-   return gSndCfg.mListenerDopplerVelocity;
-}
-
-float SND_GetDopplerFactor()
-{
-   return gSndCfg.mListenernDopplerFactor;
-}
\ No newline at end of file
+void SND_SetListenerGain(float gain)
+{
+   gSndCfg.mListenerGain=gain;
+}
+
+void SND_SetDopplerVelocity(float vel)
+{
+   gSndCfg.mListenerDopplerVelocity=vel;
+}
+
+void SND_SetDopplerFactor(float factor)
+{
+   gSndCfg.mListenernDopplerFactor=factor;
+}
+
+float SND_GetListenerGain()
+{
+   return gSndCfg.mListenerGain;
+}
+
+float SND_GetDopplerVelocity()
+{
+   return gSndCfg.mListenerDopplerVelocity;
+}
+
+float SND_GetDopplerFactor()
+{
+   return gSndCfg.mListenernDopplerFactor;
+}
+
+

Modified: branches/sound-branch/intern/soundsystem/SND_C-api.h
===================================================================
--- branches/sound-branch/intern/soundsystem/SND_C-api.h	2008-07-28 00:55:28 UTC (rev 15829)
+++ branches/sound-branch/intern/soundsystem/SND_C-api.h	2008-07-28 01:32:14 UTC (rev 15830)
@@ -55,7 +55,7 @@
 
 // audio device backend
 extern int		SND_GetNumDevices();
-extern char*	SND_GetDeviceName( int deviceIdx );
+extern const char*	SND_GetDeviceName( int deviceIdx );
 extern void		SND_GetActiveDevice( int* deviceIdx, SND_DeviceInfo *info );
 extern void		SND_SetActiveDevice( int deviceIdx, SND_DeviceInfo *info );
 

Modified: branches/sound-branch/intern/soundsystem/SND_device.cpp
===================================================================
--- branches/sound-branch/intern/soundsystem/SND_device.cpp	2008-07-28 00:55:28 UTC (rev 15829)
+++ branches/sound-branch/intern/soundsystem/SND_device.cpp	2008-07-28 01:32:14 UTC (rev 15830)
@@ -5,7 +5,7 @@
 	return gSndCfg.mDevices.size();
 }
 
-char* SND_GetDeviceName( int deviceIdx )
+const char* SND_GetDeviceName( int deviceIdx )
 {
 	assert( 0 <= deviceIdx && deviceIdx < (int)gSndCfg.mDevices.size() );
 	

Modified: branches/sound-branch/intern/soundsystem/SND_factory.cpp
===================================================================
--- branches/sound-branch/intern/soundsystem/SND_factory.cpp	2008-07-28 00:55:28 UTC (rev 15829)
+++ branches/sound-branch/intern/soundsystem/SND_factory.cpp	2008-07-28 01:32:14 UTC (rev 15830)
@@ -5,7 +5,7 @@
 class nullDeviceFactory : public SND_DeviceFactory
 {
 public:
-	char			*getName() { return "Null Device"; }
+	const char			*getName() { return "Null Device"; }
 	SND_Device		*createInstance() { return new SND_NullDevice(); }
 };
 
@@ -13,7 +13,7 @@
 class wavReaderFactory : public SND_ReaderFactory
 {
 public:
-	char				*getName() { return "tinySND Wav Reader"; }
+	const char				*getName() { return "tinySND Wav Reader"; }
 	SND_DataProvider	*createInstance(char *filename) { return new SND_WavReader(filename); }
 };
 
@@ -21,7 +21,7 @@
 class aiffReaderFactory : public SND_ReaderFactory
 {
 public:
-	char				*getName() { return "tinySND Aiff Reader"; }
+	const char				*getName() { return "tinySND Aiff Reader"; }
 	SND_DataProvider	*createInstance(char *filename) { return new SND_AiffReader(filename); }
 };
 
@@ -31,7 +31,7 @@
 class sdlDeviceFactory : public SND_DeviceFactory
 {
 public:
-	char			*getName() { return "SDL Device"; }
+	const char			*getName() { return "SDL Device"; }
 	SND_Device		*createInstance() { return new sdlDevice(); }
 };
 #endif
@@ -41,7 +41,7 @@
 class portaudioDeviceFactory : public SND_DeviceFactory
 {
 public:
-	char			*getName() { return "PortAudio Device"; }
+	const char			*getName() { return "PortAudio Device"; }
 	SND_Device		*createInstance() { return new portaudioDevice(); }
 };
 #endif
@@ -51,7 +51,7 @@
 class jackDeviceFactory : public SND_DeviceFactory
 {
 public:
-	char			*getName() { return "Jack Device"; }
+	const char			*getName() { return "Jack Device"; }
 	SND_Device		*createInstance() { return new jackDevice(); }
 };
 #endif
@@ -61,7 +61,7 @@
 class vorbisReaderFactory : public SND_ReaderFactory
 {
 public:
-	char				*getName() { return "vorbis Reader"; }
+	const char				*getName() { return "vorbis Reader"; }
 	SND_DataProvider	*createInstance(char *filename) { return new vorbisReader(filename); }
 };
 #endif
@@ -71,7 +71,7 @@
 class madReaderFactory : public SND_ReaderFactory
 {
 public:
-	char				*getName() { return "mad Reader"; }
+	const char				*getName() { return "mad Reader"; }
 	SND_DataProvider	*createInstance(char *filename) { return new madReader(filename); }
 };
 #endif
@@ -81,14 +81,14 @@
 class ffmpegReaderFactory : public SND_ReaderFactory
 {
 public:
-	char				*getName() { return "ffmpeg Reader"; }
+	const char				*getName() { return "ffmpeg Reader"; }
 	SND_DataProvider	*createInstance(char *filename) { return new ffmpegReader(filename); }
 };
 #include "ffmpegWriter.h"
 class ffmpegWriterFactory : public SND_WriterFactory
 {
 public:
-	char				*getName() { return "ffmpeg Writer"; }
+	const char				*getName() { return "ffmpeg Writer"; }
 	SND_DataConsumer	*createInstance(char *filename) { return new ffmpegWriter(filename); }
 };
 #endif
@@ -98,14 +98,14 @@
 class sndfileReaderFactory : public SND_ReaderFactory
 {
 public:
-	char				*getName() { return "sndfile Reader"; }
+	const char				*getName() { return "sndfile Reader"; }
 	SND_DataProvider	*createInstance(char *filename) { return new sndfileReader(filename); }
 };
 #include "sndfileWriter.h"
 class sndfileWriterFactory : public SND_WriterFactory
 {
 public:
-	char				*getName() { return "sndfile Writer"; }
+	const char				*getName() { return "sndfile Writer"; }
 	SND_DataConsumer	*createInstance(char *filename) { return new sndfileWriter(filename); }
 };
 #endif

Modified: branches/sound-branch/intern/soundsystem/SND_internal.h
===================================================================
--- branches/sound-branch/intern/soundsystem/SND_internal.h	2008-07-28 00:55:28 UTC (rev 15829)
+++ branches/sound-branch/intern/soundsystem/SND_internal.h	2008-07-28 01:32:14 UTC (rev 15830)
@@ -54,7 +54,7 @@
 {
 public:
 	virtual					~SND_DeviceFactory(){}
-	virtual char			*getName() = 0;
+	virtual const char			*getName() = 0;
 	virtual SND_Device		*createInstance() = 0;
 };
 
@@ -62,7 +62,7 @@
 {
 public:
 	virtual						~SND_ReaderFactory(){}
-	virtual char				*getName() = 0;
+	virtual const char				*getName() = 0;
 	virtual SND_DataProvider	*createInstance(char *filename) = 0;
 };
 
@@ -70,7 +70,7 @@
 {
 public:
 	virtual						~SND_WriterFactory(){}
-	virtual char				*getName() = 0;
+	virtual const char				*getName() = 0;
 	virtual SND_DataConsumer	*createInstance(char *filename) = 0;
 };