diff options
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/Python/AUD_PyAPI.cpp | 6 | ||||
| -rw-r--r-- | intern/audaspace/SDL/AUD_SDLDevice.cpp | 2 | ||||
| -rw-r--r-- | intern/audaspace/intern/AUD_C-API.cpp | 2 | ||||
| -rw-r--r-- | intern/audaspace/intern/AUD_SilenceReader.cpp | 2 | ||||
| -rw-r--r-- | intern/audaspace/intern/AUD_SinusFactory.h | 2 | ||||
| -rw-r--r-- | intern/audaspace/intern/AUD_Space.h | 4 |
6 files changed, 9 insertions, 9 deletions
diff --git a/intern/audaspace/Python/AUD_PyAPI.cpp b/intern/audaspace/Python/AUD_PyAPI.cpp index dc019c1f245..300fd55e23b 100644 --- a/intern/audaspace/Python/AUD_PyAPI.cpp +++ b/intern/audaspace/Python/AUD_PyAPI.cpp @@ -128,7 +128,7 @@ Factory_new(PyTypeObject *type, PyObject *args, PyObject *kwds) } PyDoc_STRVAR(M_aud_Factory_sine_doc, - "sine(frequency, rate=44100)\n\n" + "sine(frequency, rate=48000)\n\n" "Creates a sine factory which plays a sine wave.\n\n" ":arg frequency: The frequency of the sine wave in Hz.\n" ":type frequency: float\n" @@ -142,7 +142,7 @@ static PyObject * Factory_sine(PyTypeObject* type, PyObject *args) { float frequency; - double rate = 44100; + double rate = 48000; if(!PyArg_ParseTuple(args, "f|d:sine", &frequency, &rate)) return NULL; @@ -2115,7 +2115,7 @@ Device_new(PyTypeObject *type, PyObject *args, PyObject *kwds) static const char *kwlist[] = {"type", "rate", "channels", "format", "buffer_size", "name", NULL}; int device; - double rate = AUD_RATE_44100; + double rate = AUD_RATE_48000; int channels = AUD_CHANNELS_STEREO; int format = AUD_FORMAT_FLOAT32; int buffersize = AUD_DEFAULT_BUFFER_SIZE; diff --git a/intern/audaspace/SDL/AUD_SDLDevice.cpp b/intern/audaspace/SDL/AUD_SDLDevice.cpp index 0be8db91d28..23729a7a171 100644 --- a/intern/audaspace/SDL/AUD_SDLDevice.cpp +++ b/intern/audaspace/SDL/AUD_SDLDevice.cpp @@ -48,7 +48,7 @@ AUD_SDLDevice::AUD_SDLDevice(AUD_DeviceSpecs specs, int buffersize) if(specs.format == AUD_FORMAT_INVALID) specs.format = AUD_FORMAT_S16; if(specs.rate == AUD_RATE_INVALID) - specs.rate = AUD_RATE_44100; + specs.rate = AUD_RATE_48000; m_specs = specs; diff --git a/intern/audaspace/intern/AUD_C-API.cpp b/intern/audaspace/intern/AUD_C-API.cpp index 6d8d2d1f41e..db3d157df72 100644 --- a/intern/audaspace/intern/AUD_C-API.cpp +++ b/intern/audaspace/intern/AUD_C-API.cpp @@ -918,7 +918,7 @@ AUD_Sound *AUD_Sequence_create(float fps, int muted) // specs are changed at a later point! AUD_Specs specs; specs.channels = AUD_CHANNELS_STEREO; - specs.rate = AUD_RATE_44100; + specs.rate = AUD_RATE_48000; AUD_Sound *sequencer = new AUD_Sound(boost::shared_ptr<AUD_SequencerFactory>(new AUD_SequencerFactory(specs, fps, muted))); return sequencer; } diff --git a/intern/audaspace/intern/AUD_SilenceReader.cpp b/intern/audaspace/intern/AUD_SilenceReader.cpp index 948868508fc..5d7e83f7f09 100644 --- a/intern/audaspace/intern/AUD_SilenceReader.cpp +++ b/intern/audaspace/intern/AUD_SilenceReader.cpp @@ -59,7 +59,7 @@ int AUD_SilenceReader::getPosition() const AUD_Specs AUD_SilenceReader::getSpecs() const { AUD_Specs specs; - specs.rate = AUD_RATE_44100; + specs.rate = AUD_RATE_48000; specs.channels = AUD_CHANNELS_MONO; return specs; } diff --git a/intern/audaspace/intern/AUD_SinusFactory.h b/intern/audaspace/intern/AUD_SinusFactory.h index d1909dedb66..c8d409a4aff 100644 --- a/intern/audaspace/intern/AUD_SinusFactory.h +++ b/intern/audaspace/intern/AUD_SinusFactory.h @@ -59,7 +59,7 @@ public: * \param sampleRate The target sample rate for playback. */ AUD_SinusFactory(float frequency, - AUD_SampleRate sampleRate = AUD_RATE_44100); + AUD_SampleRate sampleRate = AUD_RATE_48000); /** * Returns the frequency of the sine wave. diff --git a/intern/audaspace/intern/AUD_Space.h b/intern/audaspace/intern/AUD_Space.h index ec2c06900ac..26bbdc5a8f7 100644 --- a/intern/audaspace/intern/AUD_Space.h +++ b/intern/audaspace/intern/AUD_Space.h @@ -50,9 +50,9 @@ /// Returns the bigger of the two values. #define AUD_MAX(a, b) (((a) > (b)) ? (a) : (b)) -// 5 sec * 44100 samples/sec * 4 bytes/sample * 6 channels +// 5 sec * 48000 samples/sec * 4 bytes/sample * 6 channels /// The size by which a buffer should be resized if the final extent is unknown. -#define AUD_BUFFER_RESIZE_BYTES 5292000 +#define AUD_BUFFER_RESIZE_BYTES 5760000 /// The default playback buffer size of a device. #define AUD_DEFAULT_BUFFER_SIZE 1024 |