diff options
| author | Joerg Mueller <nexyon@gmail.com> | 2010-07-31 02:34:27 +0400 |
|---|---|---|
| committer | Joerg Mueller <nexyon@gmail.com> | 2010-07-31 02:34:27 +0400 |
| commit | 61c9e46aad2cf679331341c7d38f10bec19203a9 (patch) | |
| tree | 84f7231156c8c35cc8acd785fc48a96cd1d2d820 /intern/audaspace | |
| parent | c59b930d135ce7527542da96d1984842cf5e42ff (diff) | |
| parent | e4a16c8010f8bdf4bed4e2661929cd0858649d25 (diff) | |
svn merge -r 30718:30912 https://svn.blender.org/svnroot/bf-blender/trunk/blender
Diffstat (limited to 'intern/audaspace')
| -rw-r--r-- | intern/audaspace/intern/AUD_IReader.h | 2 | ||||
| -rw-r--r-- | intern/audaspace/intern/AUD_StreamBufferFactory.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/intern/audaspace/intern/AUD_IReader.h b/intern/audaspace/intern/AUD_IReader.h index baba587ea03..816abfea7f3 100644 --- a/intern/audaspace/intern/AUD_IReader.h +++ b/intern/audaspace/intern/AUD_IReader.h @@ -60,7 +60,7 @@ public: virtual void seek(int position)=0; /** - * Returns an aproximated length of the source in samples. + * Returns an approximated length of the source in samples. * For readers of the type buffer this has to return a correct value! * \return The length as sample count. May be negative if unknown. * \see getType diff --git a/intern/audaspace/intern/AUD_StreamBufferFactory.cpp b/intern/audaspace/intern/AUD_StreamBufferFactory.cpp index 4079079cb33..c1eb8161e30 100644 --- a/intern/audaspace/intern/AUD_StreamBufferFactory.cpp +++ b/intern/audaspace/intern/AUD_StreamBufferFactory.cpp @@ -41,7 +41,7 @@ AUD_StreamBufferFactory::AUD_StreamBufferFactory(AUD_IFactory* factory) : int index = 0; sample_t* buffer; - // get an aproximated size if possible + // get an approximated size if possible int size = reader->getLength(); if(size <= 0) |