This patch to Flickernoise removes a number of casts that serve no
purpose and - in the case of handle_midi_msg - clutter code that
needs some more fixing.
I didn't run the code but I checked that the assembler output is
equivalent. It's not identical because the line numbers of four
asserts changed.
There is a bit more redundancy in the form of
... | (foo << bar) | ...
which could be written as
... | foo << bar | ...
I didn't touch these since some people prefer the parentheses as
part of their coding style. If you want such things gone as well,
please let me know.
- Werner
---
src/input.c | 13 +++++--------
1 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/src/input.c b/src/input.c
index 4d0e4c4..6c7e5c8 100644
--- a/src/input.c
+++ b/src/input.c
@@ -67,10 +67,7 @@ static int handle_mouse_event(mtk_event *e, unsigned char
*msg)
unsigned int mstate;
int n;
- mstate = ((unsigned int)msg[0] << 24)
- |((unsigned int)msg[1] << 16)
- |((unsigned int)msg[2] << 8)
- |((unsigned int)msg[3]);
+ mstate = (msg[0] << 24) | (msg[1] << 16) | (msg[2] << 8) | msg[3];
n = 0;
/* left mouse button pressed */
@@ -237,19 +234,19 @@ static int handle_ir_event(mtk_event *e, unsigned char
*msg)
static int handle_midi_msg(mtk_event *e, unsigned char *msg)
{
- e->press.code = ((unsigned int)(msg[0]) & 0x0f) << 16; /* set channel */
+ e->press.code = (msg[0] & 0x0f) << 16; /* set channel */
switch(msg[0] & 0xf0) {
case 0x90: /* Note On */
e->type = EVENT_TYPE_MIDI_NOTEON;
- e->press.code |= (unsigned int)msg[1];
+ e->press.code |= msg[1];
return 1;
case 0xb0: /* Controller */
e->type = EVENT_TYPE_MIDI_CONTROLLER;
- e->press.code |= ((unsigned int)msg[1] << 8) |
(unsigned int)msg[2];
+ e->press.code |= (msg[1] << 8) | msg[2];
return 1;
case 0xe0: /* Pitch */
e->type = EVENT_TYPE_MIDI_PITCH;
- e->press.code |= (unsigned int)msg[2];
+ e->press.code |= msg[2];
return 1;
default:
return 0;
--
1.7.0.4
_______________________________________________
http://lists.milkymist.org/listinfo.cgi/devel-milkymist.org
IRC: #milkymist@Freenode
