Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
36744 commits 17 branches 142 tags 291 MiB
Commit graph

167 commits

Author SHA1 Message Date
Nils Wallménius
65331f1749 Revert some changes that broke looping in midiplayer 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15631 a1c6a512-1295-4272-9138-f99709370657
 2007-11-15 21:20:29 +00:00
Nils Wallménius
0fd4c2e455 Rearrange logic in the synthVoice loop to do less tests and remove need of a struct member for a small speedup, move some memory lookups out of the loop for a small speedup, further cosmetic changes to the synthVoice function. Change isUsed to a bool for clearer logic and also a tiny speedup 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15563 a1c6a512-1295-4272-9138-f99709370657
 2007-11-11 01:02:45 +00:00
Stepan Moskovchenko
bdfe87c0f1 MIDI: Make seeking neater by moving it into another file. Will be more useful later. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15467 a1c6a512-1295-4272-9138-f99709370657
 2007-11-05 05:35:10 +00:00
Stepan Moskovchenko
3be1ca0281 MIDI: Improve seeking (especially near the end of the file) by disabling playback during the seek. Next 
step is to prevent delta value calculation during seeking, and just recompute the current deltas once 
seeking is over.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15426 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 06:31:33 +00:00
Stéphane Doyon
775279b63e Fix warnings. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15421 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 04:59:24 +00:00
Stepan Moskovchenko
cd963d84ca MIDI: Allow seeking forward and backward using the left/right keys. Currently seeks in 5 second 
increments, but this can be set to any amount. Also implemented a counter for playing time, which can 
pretty easily be used to determine the length of the file, in seconds, before playing it. The time 
isn't displayed anywhere right now, but all this can be useful if this thing is turned into a codec, or 
at least gets a nice UI.



git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15418 a1c6a512-1295-4272-9138-f99709370657
 2007-11-03 04:09:38 +00:00
Jonathan Gordon
a256878e77 enable jpeg, mpegplayer and midiplay on the mr500 (only jpeg is actually usable though, mpegplayer data aborts) 
fix the config which should have been done a few commits ago


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15296 a1c6a512-1295-4272-9138-f99709370657
 2007-10-25 07:44:56 +00:00
Nils Wallménius
a3117328e9 Fix vroken logic that _could_ lead to memory corruption though it was very unlikely 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15281 a1c6a512-1295-4272-9138-f99709370657
 2007-10-23 15:00:45 +00:00
Nils Wallménius
2d91cf3ea3 Increase temp buffer size to fit more samples, put in simple safeguard to avoid memory corruption when writing to the temp buffer 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15253 a1c6a512-1295-4272-9138-f99709370657
 2007-10-21 22:50:10 +00:00
Stepan Moskovchenko
47d8323deb MIDI: Fix ringing/beeks in music caused by improper parsing of some pitch bend events. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15252 a1c6a512-1295-4272-9138-f99709370657
 2007-10-21 19:47:33 +00:00
Nils Wallménius
ab5a38db92 Clean out an unused struct member from the synthObject struct 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15189 a1c6a512-1295-4272-9138-f99709370657
 2007-10-18 13:43:13 +00:00
Stepan Moskovchenko
c3584c0d63 MIDI: Scale each instrument by a calibration value, since not all patches are at the same base volume. 
This should make some files sound more natural, without some instruments overpowering others. 
Ultimately, these values need to be moved to the config file, and the table should probably be put in 
IRAM or something.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15161 a1c6a512-1295-4272-9138-f99709370657
 2007-10-17 05:06:57 +00:00
Stepan Moskovchenko
d33645ba13 MIDI: Optimize the new pitch bending code for a small speedup. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15160 a1c6a512-1295-4272-9138-f99709370657
 2007-10-17 03:48:24 +00:00
Stepan Moskovchenko
1515ff8522 MIDI: At long last, though quick and dirty, pitch bend depth! Or, I think it works. Tested on two 
files. Let me know if anyone discovers any problems with this. This commit also includes Nils's synth 
loop optimization patch. I hope committing it does not cause problems.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15112 a1c6a512-1295-4272-9138-f99709370657
 2007-10-15 05:11:37 +00:00
Nils Wallménius
f619f81676 Change loop structure for sample synthesizing. Gives a nice speedup on both coldfire and arm targets. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15036 a1c6a512-1295-4272-9138-f99709370657
 2007-10-08 19:28:41 +00:00
Nils Wallménius
1d7912955b Get rid of unnecessary memory acesses in a loop, gives slight speedup 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14996 a1c6a512-1295-4272-9138-f99709370657
 2007-10-05 21:03:56 +00:00
Nils Wallménius
5118f48d73 A loop with one iteration is a little strange, also put it inside an #if block to not rely on gcc otimizing it away 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14990 a1c6a512-1295-4272-9138-f99709370657
 2007-10-05 12:22:58 +00:00
Nils Wallménius
8219f2801a Make synthVoice return int instead of short, gives a nice speed up also add a comment 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14988 a1c6a512-1295-4272-9138-f99709370657
 2007-10-05 11:15:04 +00:00
Nils Wallménius
ca46a3d095 Increase output buffer size to 32kB, results in less buffer missing in general and avoids buffer misses when lcd remote is plugged in while playing and ticking reduction is enabled. Increase max voices used on coldfire targets to 24 and reduce voices used on pp targets to 16. Put one more struct in iram for a slight speedup on coldfire. Fix comments in midiutil.h 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14984 a1c6a512-1295-4272-9138-f99709370657
 2007-10-04 21:01:40 +00:00
Nils Wallménius
e1940b87b0 Optimisation of the midi player, reducing the number of multiplications and memory accesses inside a very frequently executed loop, also does shifting of the whole sample when synthing is done which improves accurracy slightly, ~10% fewer buffer misses 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14983 a1c6a512-1295-4272-9138-f99709370657
 2007-10-04 19:36:42 +00:00
Nils Wallménius
84fcf967e4 Oops, forgot one file 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14979 a1c6a512-1295-4272-9138-f99709370657
 2007-10-04 10:32:28 +00:00
Nils Wallménius
cb9ba11de6 Remove wrapper for pressNote and make the function externally visible 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14978 a1c6a512-1295-4272-9138-f99709370657
 2007-10-04 10:30:01 +00:00
Nils Wallménius
4ebe69293c Put a struct in iram for a small speedup on coldfire 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14973 a1c6a512-1295-4272-9138-f99709370657
 2007-10-03 20:38:04 +00:00
Stepan Moskovchenko
1ba018bb01 Add drum names, make cowbell a default instrument (no way to remap them from UI yet). Add non-static 
wrapper for pressnote (is there a better way?). Beatbox only tested on H300; compile at own risk.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14972 a1c6a512-1295-4272-9138-f99709370657
 2007-10-03 17:42:16 +00:00
Nils Wallménius
f9664e7e87 Unroll a frequently executed loop a little for a small speedup 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14924 a1c6a512-1295-4272-9138-f99709370657
 2007-09-30 19:22:57 +00:00
Nils Wallménius
6386dbe861 static/inline/iram raid gives nice speedup 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14915 a1c6a512-1295-4272-9138-f99709370657
 2007-09-30 11:21:25 +00:00
Stepan Moskovchenko
1ed54f4302 Maybe 25 was too much with the new decay rates. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14911 a1c6a512-1295-4272-9138-f99709370657
 2007-09-30 09:04:39 +00:00
Stepan Moskovchenko
414724e2f4 MIDI: Kick up number of voices and decrease the decay rate, taking 
advantage of the recent speedups. Some instruments sound a lot more 
natural now.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14910 a1c6a512-1295-4272-9138-f99709370657
 2007-09-30 09:01:38 +00:00
Nils Wallménius
c6c7b73a15 Fix bug that caused only half the output buffer to be used, gives a quite nice speedup on coldifre, clean up some commented out #ifdefs 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14904 a1c6a512-1295-4272-9138-f99709370657
 2007-09-29 16:06:16 +00:00
Stepan Moskovchenko
aaf3e3269c MIDI: Fix off by one error with the guitar. Wow, I can't believe the off-keyness is finally fixed. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14897 a1c6a512-1295-4272-9138-f99709370657
 2007-09-29 03:07:31 +00:00
Stepan Moskovchenko
d1e306077f MIDI: Fix two year old loop bug that caused distortion on some instruments. I been looking for this one 
for at least 6 months.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14896 a1c6a512-1295-4272-9138-f99709370657
 2007-09-29 02:20:49 +00:00
Nils Wallménius
6888db3240 Do not duplicate const table, make getEvent function static inline, gives about a ~1.5% speedup, put tick function in iram, ~3.5% speedup 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14873 a1c6a512-1295-4272-9138-f99709370657
 2007-09-27 20:17:38 +00:00
Nils Wallménius
93787dd42c Simplify the sendEvent function, makes it _slightly_ faster and quite a bit smaller, build midiplay with -O2 for coldfire, gives about a 23% speedup 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14872 a1c6a512-1295-4272-9138-f99709370657
 2007-09-27 18:29:50 +00:00
Stepan Moskovchenko
8b6d28790e Some MIDI changes, and add a new musical plugin I'm working on... Not fully done yet, so commented out 
of SUBDIRS. (If people are against having half-baked plugins in SVN, please let me know and I will 
remove it).


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14863 a1c6a512-1295-4272-9138-f99709370657
 2007-09-27 03:59:33 +00:00
Nils Wallménius
ddee0f16d3 Use uint32_t type for the pitch table 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14844 a1c6a512-1295-4272-9138-f99709370657
 2007-09-24 21:13:20 +00:00
Nils Wallménius
ff7b3c5e4e Fix midi playback on 64 bit sims and const a table 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14842 a1c6a512-1295-4272-9138-f99709370657
 2007-09-24 16:47:34 +00:00
Nils Wallménius
0e49605aaa Move all of midiplay into its subdir and add a Makefile for it, add header files as necessary. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14841 a1c6a512-1295-4272-9138-f99709370657
 2007-09-24 15:57:32 +00:00
Karl Kurbjun
e571cfb070 vel/MROBE500 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14813 a1c6a512-1295-4272-9138-f99709370657
 2007-09-22 04:55:44 +00:00
Nils Wallménius
04b3435afd Clean up hard-coded paths 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@14662 a1c6a512-1295-4272-9138-f99709370657
 2007-09-10 09:46:36 +00:00
Michael Sevakis
8676dc25f5 Missed a couple. Hopefully fix all warnings. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13234 a1c6a512-1295-4272-9138-f99709370657
 2007-04-21 19:07:15 +00:00
Michael Sevakis
26d242ae65 General housekeeping: Make plugin buffer functions take size_t * instead of int * to match the parameter type of the buffer functions called in the core. Get rid of unsafe int * <==> size_t * casting. Use ssize_t where int was used and size_t where unsigned int was used in the buffer calls to not alter signedness in the plugins. No API version change since it should only be an issue for 64-bit sim builds. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13233 a1c6a512-1295-4272-9138-f99709370657
 2007-04-21 18:38:25 +00:00
Jens Arnold
b1f0049307 Fix the undefined char symbols appearing in many output lines. This printf does neither support nor need \n. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13229 a1c6a512-1295-4272-9138-f99709370657
 2007-04-21 05:35:17 +00:00
Linus Nielsen Feltzing
7c4b786851 Some quick and dirty MIDI player optimizations, now it works on the X5 and M5 too 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@13108 a1c6a512-1295-4272-9138-f99709370657
 2007-04-11 10:48:50 +00:00
Jens Arnold
79c8a8cbbe Let GCC check arguments of some more printf-style functions, also for plugins and codecs. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12815 a1c6a512-1295-4272-9138-f99709370657
 2007-03-17 09:02:53 +00:00
Jens Arnold
4d6374c923 Get rid of the 'center' parameter for splashes. There were only 2 of almost 500 splashes which were not centered. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12807 a1c6a512-1295-4272-9138-f99709370657
 2007-03-16 21:56:08 +00:00
Stepan Moskovchenko
65ef67e0f1 Fix a nasty little bug that would under the right conditions cause 
memory corruption and other weirdness.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11978 a1c6a512-1295-4272-9138-f99709370657
 2007-01-10 17:53:54 +00:00
Stepan Moskovchenko
94d9d152b6 More ADSR related voodoo. Hopefully will get to patch prescaler soon. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11118 a1c6a512-1295-4272-9138-f99709370657
 2006-10-03 23:27:44 +00:00
Stepan Moskovchenko
c84461fb8f More adsr related nonsense, argh! Fix adsr related problem on some notes being stopped instead of 
looped. Ramping code still not quite right, but dont want to lose this.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11117 a1c6a512-1295-4272-9138-f99709370657
 2006-10-03 21:09:47 +00:00
Stepan Moskovchenko
ba0d55510f Get rid of old junk and fix warning. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11106 a1c6a512-1295-4272-9138-f99709370657
 2006-10-02 04:30:19 +00:00
Stepan Moskovchenko
80b4882922 I have an iRiver again, yay! Make notes ramp down in a better way. Fix 
note-off pop/click due to waveform index out of bounds access.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11105 a1c6a512-1295-4272-9138-f99709370657
 2006-10-02 04:13:33 +00:00
Antoine Cellerier
13be687920 == -> =. this should fix a build warning 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10518 a1c6a512-1295-4272-9138-f99709370657
 2006-08-10 21:25:21 +00:00
Antoine Cellerier
f28c35effc Fix typo 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10269 a1c6a512-1295-4272-9138-f99709370657
 2006-07-20 22:31:59 +00:00
Stepan Moskovchenko
b9b2bcd9b9 Fixed freezing after loader error messages. 
Added RMID (Windows MIDI) header support. Added .RMI extension to
viewers.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9888 a1c6a512-1295-4272-9138-f99709370657
 2006-05-08 02:43:29 +00:00
Stepan Moskovchenko
68af7bae87 Added ability to adjust the volume during playback. 
Gracefully fail if no soundset installed.
Yet more messing with the ramping code. I swear, that will be the end of
me.
Basic skipping support- skip foreward a bit if Right is pressed.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9883 a1c6a512-1295-4272-9138-f99709370657
 2006-05-07 07:12:07 +00:00
Stepan Moskovchenko
28b5afd05a Optimize synth code by pre-computing the volume scaling for each note. 
Scaling is now calculated once per MIDI event at the most, instead of
once per sample. Increase voice ramping speed, increase number of
active voices a little.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9870 a1c6a512-1295-4272-9138-f99709370657
 2006-05-03 19:32:22 +00:00
Stepan Moskovchenko
47efba8bbf Fix file descriptor leak that would cause a hard lockup every 7 files 
played. A few other cosmetic changes. please, please no red build =)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9865 a1c6a512-1295-4272-9138-f99709370657
 2006-05-03 05:18:18 +00:00
Stepan Moskovchenko
b2f1b5dd18 ---------------------------------------------------------------------- 
Added Karl Kurbjun's sound output patch, cleaned up some output.
Main file is now midiplay.c, midi2wav is still in there for anyone who
wants it. Set sampling rate to 22k, and increased note decay time.
Reduced number of concurrent active voices and made new notes replace
used voices if none are available. This makes lag less apparent.
I really hope this wont go red. (turns around and runs)


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@9858 a1c6a512-1295-4272-9138-f99709370657
 2006-05-01 23:22:59 +00:00
Dave Chapman
9e19c95d8e Replace SWAB16 and SWAB32 with a comprehensive set of byte-swap macros - letoh16, letoh32, htole16, htole32, betoh16, betoh32, htobe16 and htobe32 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7584 a1c6a512-1295-4272-9138-f99709370657
 2005-10-06 19:27:43 +00:00
Stepan Moskovchenko
1874a33298 Uncomment one line, which makes bad 80s music sound a bit better. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7291 a1c6a512-1295-4272-9138-f99709370657
 2005-08-07 23:39:23 +00:00
Stepan Moskovchenko
fb3e9a4073 Fix error/warning, change pitch bend to 9 bits 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@7288 a1c6a512-1295-4272-9138-f99709370657
 2005-08-07 22:20:40 +00:00
Tomas Salfischberger
2ed84ec2ca The synthVoice() function declaration was wrong (caused a warning). And because of that GCC didn't notice the error on line 390: synthVoice(currentVoice). 
In revision 1.4 Steven made currentVoice global, so the function declaration should be: synthVoice(void), wich fixes a warning. And the call should be just synthVoice() wich fixes a hidden error.

Hope I saw this right... please correct me if this isn't the way you ment is Seven.


git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6708 a1c6a512-1295-4272-9138-f99709370657
 2005-06-14 16:17:11 +00:00
Stepan Moskovchenko
9ec1ff8cf5 Fixed warnings, adapted to Rockbox coding style, optimized to 78% realtime. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6329 a1c6a512-1295-4272-9138-f99709370657
 2005-04-20 21:07:13 +00:00
Stepan Moskovchenko
1f5fb99819 Some shifting optimizations. Working code. 50% realtime. 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6323 a1c6a512-1295-4272-9138-f99709370657
 2005-04-19 15:57:07 +00:00
Stepan Moskovchenko
4b773c0c4c Added xxx2wav support, an icon, and some optimizations 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6306 a1c6a512-1295-4272-9138-f99709370657
 2005-04-16 03:35:20 +00:00
Daniel Stenberg
cdd35ba220 fix compiler error 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6305 a1c6a512-1295-4272-9138-f99709370657
 2005-04-15 21:17:01 +00:00
Stepan Moskovchenko
5811214b0c Code cleanup, fix warnings, error checking, add midi2wav to viewers.config 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6304 a1c6a512-1295-4272-9138-f99709370657
 2005-04-15 20:27:04 +00:00
Stepan Moskovchenko
215e492a12 Added MIDI synthesizer plugin 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@6287 a1c6a512-1295-4272-9138-f99709370657
 2005-04-15 06:08:55 +00:00