Thomas Martitz
b66d07a9e3
Fix red on hwcodec.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30338 a1c6a512-1295-4272-9138-f99709370657
2011-08-22 09:56:58 +00:00
Thomas Martitz
29abe81889
Talk: Unify hwcodec and swcodec handling.
...
Do it the hwcodec way which doesn't need a buffer_alloc(). The buffer for the
.talk files is now allocated together with the voicefile buffer.
Should also fix a panic when the .talk file buffer was allocated late at runtime.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30335 a1c6a512-1295-4272-9138-f99709370657
2011-08-21 15:05:57 +00:00
Thomas Martitz
89c8cbebf2
Add change that got lost somehow in r30308.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30312 a1c6a512-1295-4272-9138-f99709370657
2011-08-14 15:51:08 +00:00
Thomas Martitz
b8fabfef84
Fix remaining problems.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30311 a1c6a512-1295-4272-9138-f99709370657
2011-08-14 15:43:43 +00:00
Thomas Martitz
8a701e5488
Fix errors and warnings.
...
The buffer_offset paramter of audio_init_recording() is removed as it
was unused in both implementations.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30310 a1c6a512-1295-4272-9138-f99709370657
2011-08-14 15:37:05 +00:00
Thomas Martitz
d1322b7159
GSoC/Buflib: Replace all direct accesses to audiobuf with buffer API functions.
...
Namely, introduce buffer_get_buffer() and buffer_release_buffer().
buffer_get_buffer() aquires all available and grabs a lock, attempting to
call buffer_alloc() or buffer_get_buffer() while this lock is locked will cause
a panicf() (doesn't actually happen, but is for debugging purpose).
buffer_release_buffer() unlocks that lock and can additionally increment the
audiobuf buffer to make an allocation. Pass 0 to only unlock if buffer was
used temporarily only.
buffer_available() is a replacement function to query audiobuflen, i.e. what's
left in the buffer.
Buffer init is moved up in the init chain and handles ipodvideo64mb internally.
Further changes happened to mp3data.c and talk.c as to not call the above API
functions, but get the buffer from callers. The caller is the audio system
which has the buffer lock while mp3data.c and talk mess with the buffer.
mpeg.c now implements some buffer related functions of playback.h, especially
audio_get_buffer(), allowing to reduce #ifdef hell a tiny bit.
audiobuf and audiobufend are local to buffer.c now.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30308 a1c6a512-1295-4272-9138-f99709370657
2011-08-14 15:13:00 +00:00
Andree Buschmann
460d54977a
FS#11939: Simplify talk_time_unit().
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29347 a1c6a512-1295-4272-9138-f99709370657
2011-02-20 15:23:18 +00:00
Andree Buschmann
e3abdb1a52
Undo unwanted commit r29310.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29311 a1c6a512-1295-4272-9138-f99709370657
2011-02-15 20:10:50 +00:00
Andree Buschmann
237ca504e1
All AAC-HE files will double the frame sample count, not only AAC-HE files with SBR upsampling. This change fixes issues with some m4a files reported in the forums.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29310 a1c6a512-1295-4272-9138-f99709370657
2011-02-15 20:00:28 +00:00
Andree Buschmann
c0b0cd5905
Do not fiddle with audiobuf in talk_init() when no voice file is present. Avoids stopping of audio playback when changing languages without using voice files. Closes FS#10479.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29300 a1c6a512-1295-4272-9138-f99709370657
2011-02-13 21:30:13 +00:00
Andree Buschmann
5d849a963e
Clean up multiple definitions of RAM size. Remove -DMEM (make) and MEM (code), use the already defined MEMORYSIZE instead.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29189 a1c6a512-1295-4272-9138-f99709370657
2011-02-02 17:43:32 +00:00
Rafaël Carré
ca91d0fd7a
FS#11587 : voice for SWCODEC and low memory
...
On these targets the full voice file can't be loaded so only load 64
clips at a time (the size of the queue)
Voice now works on clipv1
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27962 a1c6a512-1295-4272-9138-f99709370657
2010-09-01 00:08:50 +00:00
Jeffrey Goode
9e28863669
lang.h voice comments were off by 1, fixed
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26296 a1c6a512-1295-4272-9138-f99709370657
2010-05-26 03:51:13 +00:00
Jeffrey Goode
7c52a17b9f
Oops, didnt mean to enable logf in talk.c
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26295 a1c6a512-1295-4272-9138-f99709370657
2010-05-26 03:14:30 +00:00
Jeffrey Goode
fe0f5baa73
Fix crash in talk.c logf line when outputting voice only clips, more comments in lang.h
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26294 a1c6a512-1295-4272-9138-f99709370657
2010-05-26 03:11:00 +00:00
Rafaël Carré
338e4d76aa
fix inverted logic in r26047: voice works again
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26049 a1c6a512-1295-4272-9138-f99709370657
2010-05-15 11:19:25 +00:00
Rafaël Carré
77ec4b301b
talk_init() : don't try to load the voice file if it won't fit in memory
...
now playback still works if voicing is enabled on the clipv1
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26047 a1c6a512-1295-4272-9138-f99709370657
2010-05-15 10:05:47 +00:00
Thomas Martitz
50a6ca39ad
Move c/h files implementing/defining standard library stuff into a new libc directory, also standard'ify some parts of the code base (almost entirely #include fixes).
...
This is to a) to cleanup firmware/common and firmware/include a bit, but also b) for Rockbox as an application which should use the host system's c library and headers, separating makes it easy to exclude our files from the build.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25850 a1c6a512-1295-4272-9138-f99709370657
2010-05-06 21:04:40 +00:00
Jeffrey Goode
433cad6446
Add logf line to talk.c
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@25808 a1c6a512-1295-4272-9138-f99709370657
2010-05-04 14:30:47 +00:00
Bertrik Sikken
2ac91dcd98
Kill some global variables
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@24888 a1c6a512-1295-4272-9138-f99709370657
2010-02-24 19:40:45 +00:00
Jeffrey Goode
9a4420bf96
FS#10739: playback.c code split
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@23444 a1c6a512-1295-4272-9138-f99709370657
2009-10-31 19:17:36 +00:00
Nils Wallménius
3d4701a6e4
FS#10080
...
* Move strncpy() from core to the pluginlib
* Introduce strlcpy() and use that instead in most places (use memcpy in a few) in core and some plugins
* Drop strncpy() from the codec api as no codec used it
* Bump codec and plugin api versions
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@21863 a1c6a512-1295-4272-9138-f99709370657
2009-07-14 13:57:45 +00:00
Bertrik Sikken
0023943439
Fix duplicate #includes
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@20977 a1c6a512-1295-4272-9138-f99709370657
2009-05-17 14:50:19 +00:00
Frank Gevaerts
19d1cacb1a
cleanup storage defines
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18950 a1c6a512-1295-4272-9138-f99709370657
2008-10-31 21:25:04 +00:00
Björn Stenberg
51b45d5602
Split id3.c/h into metadata.c/h and metadata/mp3.c. Updated all references. Moved mp3data.c/h from firmware to apps.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18814 a1c6a512-1295-4272-9138-f99709370657
2008-10-15 06:38:51 +00:00
Nils Wallménius
b82fd56e0f
Delete unused function, const police, minor style police
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18664 a1c6a512-1295-4272-9138-f99709370657
2008-09-29 16:29:51 +00:00
Stéphane Doyon
3eb76d053d
talk.c helper functions to voice a filename, in a more generic way
...
than from tree.c
Voice a file or dir's thumbnail from path components,
or spell last path component. Ability to prefix the thumbnail or
spelling with some talk ids.
This is the talk_file patch from FS#6323, just refactored a bit.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18048 a1c6a512-1295-4272-9138-f99709370657
2008-07-15 14:55:31 +00:00
Stéphane Doyon
c893affeef
Accept FS#8918: Voice multiple thumbnails and talk race fixes.
...
-Allows loading multiple thumbnails back-to-back in the one thumbnail buffer.
-Mutex to prevent race conditions with talk queue indices and
thumbnail buffer state.
-Synchronous shutup.
-Shutup is a noop if no voice is queued.
-mp3_play_stop() does nothing until the audio thread is ready.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@18046 a1c6a512-1295-4272-9138-f99709370657
2008-07-15 14:06:11 +00:00
Daniel Stenberg
2acc0ac542
Updated our source code header to explicitly mention that we are GPL v2 or
...
later. We still need to hunt down snippets used that are not. 1324 modified
files...
http://www.rockbox.org/mail/archive/rockbox-dev-archive-2008-06/0060.shtml
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17847 a1c6a512-1295-4272-9138-f99709370657
2008-06-28 18:10:04 +00:00
Nicolas Pennequin
357ffb3c46
Convert the whole codebase to UTF-8, except docs/COMMITTERS and tools/creative.c, which need checking.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17369 a1c6a512-1295-4272-9138-f99709370657
2008-05-05 10:32:46 +00:00
Nils Wallménius
dbffb91706
Oops, our snprintf doesn't support some fancy features so use something that works instead :)
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17187 a1c6a512-1295-4272-9138-f99709370657
2008-04-20 14:07:21 +00:00
Nils Wallménius
2521bf5d26
Fix speaking of decimal values to work when decimals != 1, spell the fractional part instead of speaking it like a number, break out a part of output_dyn_value into a separate function and use it
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17185 a1c6a512-1295-4272-9138-f99709370657
2008-04-20 11:02:42 +00:00
Nils Wallménius
e510bc93f9
Remove DEBUGF tht slipped in
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17169 a1c6a512-1295-4272-9138-f99709370657
2008-04-19 13:35:23 +00:00
Nils Wallménius
05d2bfd5e0
Introduce support for passing decimal numbers in talk ids and speak them, use in the settings menu to fix FS#7622
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@17168 a1c6a512-1295-4272-9138-f99709370657
2008-04-19 13:19:04 +00:00
Steve Bavin
cd88e2ad93
Code police raid on the settings code, consting and putting headers alongside their implementation.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@16798 a1c6a512-1295-4272-9138-f99709370657
2008-03-25 15:24:03 +00:00
Stéphane Doyon
d6e22443c4
Remove a function that is no longer used.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15791 a1c6a512-1295-4272-9138-f99709370657
2007-11-24 14:28:22 +00:00
Nils Wallménius
acbd780239
Make id's created with the TALK_ID macro work in 64 bit sims
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15723 a1c6a512-1295-4272-9138-f99709370657
2007-11-20 19:50:52 +00:00
Michael Sevakis
99617d71ba
Make speex the new voice format for SWCODEC targets (non-Archos). Remove codec swapping and build speex voice decoding directly into the core binary.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15668 a1c6a512-1295-4272-9138-f99709370657
2007-11-18 17:12:19 +00:00
Nils Wallménius
f801714572
Actually check if a voice file has the correct version before using it
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15629 a1c6a512-1295-4272-9138-f99709370657
2007-11-15 19:32:15 +00:00
Jonathan Gordon
c14430a9c1
compile talk.c on hwcodec sim. it wont actually talk though
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15512 a1c6a512-1295-4272-9138-f99709370657
2007-11-07 09:28:07 +00:00
Stéphane Doyon
8b8785b541
Accept FS#7798: Voice unit for time
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15416 a1c6a512-1295-4272-9138-f99709370657
2007-11-03 03:43:12 +00:00
Steve Bavin
072a3c5017
Complete info screen voicing; now consistent with displayed screen
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15284 a1c6a512-1295-4272-9138-f99709370657
2007-10-24 12:32:12 +00:00
Steve Bavin
32a9575130
FS#7994 - Rename talk.c API, make talk_disable() affect all talking (not just menus), hopefully save some space.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15206 a1c6a512-1295-4272-9138-f99709370657
2007-10-19 15:31:42 +00:00
Stéphane Doyon
3e31d50955
Export shutup() function from talk.c.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15061 a1c6a512-1295-4272-9138-f99709370657
2007-10-10 03:12:17 +00:00
Jonathan Gordon
d7d6b780d4
Accept FS#7897 with some changes by me. moves the code to talk time/date out of main_menu.c to make it hopefully more useful.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15011 a1c6a512-1295-4272-9138-f99709370657
2007-10-07 08:12:01 +00:00
Linus Nielsen Feltzing
bd4aea3769
Increased the talk thumbnail size to 64Kbytes
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14987 a1c6a512-1295-4272-9138-f99709370657
2007-10-05 08:14:09 +00:00
Thom Johansen
294ec1d110
Remove the ID3 tag version priority setting on the grounds of it being pretty pointless. ID3v2 tags are superior to ID3v1 tags, and needs less seeking around to find.
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14750 a1c6a512-1295-4272-9138-f99709370657
2007-09-19 10:40:55 +00:00
Nils Wallménius
441fa76a6d
Fix flushing of voice during playback, patch in FS#6239 by Stephane Doyon and Daniel Dalton
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14517 a1c6a512-1295-4272-9138-f99709370657
2007-08-29 15:11:19 +00:00
Peter D'Hoye
ebcf06d237
Make peakmeter release setting work in units per tick (was units per read), add the unit and make it voiced. Make old leftover in lang file deprecated
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14390 a1c6a512-1295-4272-9138-f99709370657
2007-08-18 23:03:03 +00:00
Nils Wallménius
75b07e99b6
Fix speaking of 'Yes' for little endian players and fix a comment
...
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14246 a1c6a512-1295-4272-9138-f99709370657
2007-08-08 21:12:43 +00:00