summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBertrik Sikken <bertrik@sikken.nl>2012-02-18 12:06:48 +0100
committerBertrik Sikken <bertrik@sikken.nl>2012-02-18 12:06:48 +0100
commit8a87b663edee6dad6c711a03815f655ecbe9c19b (patch)
treef1d6bef84f2f316a06a0a1d413d6e56db11e3c24
parent43a940c8cb7201c8e925ac4ef28aff86cb02f42f (diff)
downloadrockbox-8a87b663edee6dad6c711a03815f655ecbe9c19b.tar.gz
rockbox-8a87b663edee6dad6c711a03815f655ecbe9c19b.zip
midi plugin: make local functions static where possible
Change-Id: I702755529f98015586b5b9592ced75cf7591880c
-rw-r--r--apps/plugins/midi/guspat.c8
-rw-r--r--apps/plugins/midi/midifile.c3
-rw-r--r--apps/plugins/midi/midiplay.c2
-rw-r--r--apps/plugins/midi/midiutil.c2
-rw-r--r--apps/plugins/midi/sequencer.c1
-rw-r--r--apps/plugins/midi/sequencer.h1
-rw-r--r--apps/plugins/midi/synth.c2
7 files changed, 10 insertions, 9 deletions
diff --git a/apps/plugins/midi/guspat.c b/apps/plugins/midi/guspat.c
index ea0ca92518..d8854b84b7 100644
--- a/apps/plugins/midi/guspat.c
+++ b/apps/plugins/midi/guspat.c
@@ -37,12 +37,12 @@ const uint32_t gustable[]=
37 4186073, 4434930, 4698645, 4978041, 5274051, 5587663, 5919922, 6271939, 6644889, 7040015, 7458636, 7902150 37 4186073, 4434930, 4698645, 4978041, 5274051, 5587663, 5919922, 6271939, 6644889, 7040015, 7458636, 7902150
38}; 38};
39 39
40unsigned int readWord(int file) 40static unsigned int readWord(int file)
41{ 41{
42 return (readChar(file)<<0) | (readChar(file)<<8); // | (readChar(file)<<8) | (readChar(file)<<0); 42 return (readChar(file)<<0) | (readChar(file)<<8); // | (readChar(file)<<8) | (readChar(file)<<0);
43} 43}
44 44
45unsigned int readDWord(int file) 45static unsigned int readDWord(int file)
46{ 46{
47 return (readChar(file)<<0) | (readChar(file)<<8) | (readChar(file)<<16) | (readChar(file)<<24); 47 return (readChar(file)<<0) | (readChar(file)<<8) | (readChar(file)<<16) | (readChar(file)<<24);
48} 48}
@@ -50,7 +50,7 @@ unsigned int readDWord(int file)
50int curr_waveform; 50int curr_waveform;
51struct GWaveform waveforms[256] IBSS_ATTR; 51struct GWaveform waveforms[256] IBSS_ATTR;
52 52
53struct GWaveform * loadWaveform(int file) 53static struct GWaveform * loadWaveform(int file)
54{ 54{
55 struct GWaveform * wav = &waveforms[curr_waveform++]; 55 struct GWaveform * wav = &waveforms[curr_waveform++];
56 rb->memset(wav, 0, sizeof(struct GWaveform)); 56 rb->memset(wav, 0, sizeof(struct GWaveform));
@@ -137,7 +137,7 @@ struct GWaveform * loadWaveform(int file)
137 return wav; 137 return wav;
138} 138}
139 139
140int selectWaveform(struct GPatch * pat, int midiNote) 140static int selectWaveform(struct GPatch * pat, int midiNote)
141{ 141{
142 /* We divide by 100 here because everyone's freq formula is slightly different */ 142 /* We divide by 100 here because everyone's freq formula is slightly different */
143 unsigned int tabFreq = gustable[midiNote]/100; /* Comparison */ 143 unsigned int tabFreq = gustable[midiNote]/100; /* Comparison */
diff --git a/apps/plugins/midi/midifile.c b/apps/plugins/midi/midifile.c
index 536a7bbea1..86544fd944 100644
--- a/apps/plugins/midi/midifile.c
+++ b/apps/plugins/midi/midifile.c
@@ -20,6 +20,7 @@
20 ****************************************************************************/ 20 ****************************************************************************/
21#include "plugin.h" 21#include "plugin.h"
22#include "midiutil.h" 22#include "midiutil.h"
23#include "midifile.h"
23 24
24struct Track * readTrack(int file); 25struct Track * readTrack(int file);
25int readID(int file); 26int readID(int file);
@@ -125,7 +126,7 @@ struct MIDIfile * loadFile(const char * filename)
125 126
126int rStatus = 0; 127int rStatus = 0;
127/* Returns 0 if done, 1 if keep going */ 128/* Returns 0 if done, 1 if keep going */
128int readEvent(int file, void * dest) 129static int readEvent(int file, void * dest)
129{ 130{
130 struct Event dummy; 131 struct Event dummy;
131 struct Event * ev = (struct Event *) dest; 132 struct Event * ev = (struct Event *) dest;
diff --git a/apps/plugins/midi/midiplay.c b/apps/plugins/midi/midiplay.c
index 6ef3439ffd..40b4f1c83c 100644
--- a/apps/plugins/midi/midiplay.c
+++ b/apps/plugins/midi/midiplay.c
@@ -319,7 +319,7 @@ static inline void synthbuf(void)
319 samples_in_buf = BUF_SIZE-i; 319 samples_in_buf = BUF_SIZE-i;
320} 320}
321 321
322void get_more(unsigned char** start, size_t* size) 322static void get_more(unsigned char** start, size_t* size)
323{ 323{
324#ifndef SYNC 324#ifndef SYNC
325 if(lastswap != swap) 325 if(lastswap != swap)
diff --git a/apps/plugins/midi/midiutil.c b/apps/plugins/midi/midiutil.c
index f4950408ab..bfac1d5244 100644
--- a/apps/plugins/midi/midiutil.c
+++ b/apps/plugins/midi/midiutil.c
@@ -37,7 +37,7 @@ struct GPatch * drumSet[128];
37 37
38struct SynthObject voices[MAX_VOICES] IBSS_ATTR; 38struct SynthObject voices[MAX_VOICES] IBSS_ATTR;
39 39
40void *alloc(int size) 40static void *alloc(int size)
41{ 41{
42 static char *offset = NULL; 42 static char *offset = NULL;
43 static size_t totalSize = 0; 43 static size_t totalSize = 0;
diff --git a/apps/plugins/midi/sequencer.c b/apps/plugins/midi/sequencer.c
index be26fdd532..e860dbd2dd 100644
--- a/apps/plugins/midi/sequencer.c
+++ b/apps/plugins/midi/sequencer.c
@@ -22,6 +22,7 @@
22#include "midiutil.h" 22#include "midiutil.h"
23#include "guspat.h" 23#include "guspat.h"
24#include "synth.h" 24#include "synth.h"
25#include "sequencer.h"
25 26
26long tempo = 375000; 27long tempo = 375000;
27 28
diff --git a/apps/plugins/midi/sequencer.h b/apps/plugins/midi/sequencer.h
index 0e49747029..9e3c72bc6e 100644
--- a/apps/plugins/midi/sequencer.h
+++ b/apps/plugins/midi/sequencer.h
@@ -22,7 +22,6 @@
22int tick(void); 22int tick(void);
23 23
24/* used by beatbox */ 24/* used by beatbox */
25void pressNote(int ch, int note, int vol);
26void rewindFile(void); 25void rewindFile(void);
27 26
28void seekForward(int nSec); 27void seekForward(int nSec);
diff --git a/apps/plugins/midi/synth.c b/apps/plugins/midi/synth.c
index 663565ecdb..e95dd7cec9 100644
--- a/apps/plugins/midi/synth.c
+++ b/apps/plugins/midi/synth.c
@@ -23,7 +23,7 @@
23#include "midiutil.h" 23#include "midiutil.h"
24#include "synth.h" 24#include "synth.h"
25 25
26void readTextBlock(int file, char * buf) 26static void readTextBlock(int file, char * buf)
27{ 27{
28 char c = 0; 28 char c = 0;
29 do 29 do