Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
input.c: remove unnecessary casts
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
  • Loading branch information
wpwrak authored and Sebastien Bourdeauducq committed Nov 1, 2011
1 parent 0239b6c commit 74534ef
Showing 1 changed file with 5 additions and 8 deletions.
13 changes: 5 additions & 8 deletions src/input.c
Expand Up @@ -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 */
Expand Down Expand Up @@ -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;
Expand Down

0 comments on commit 74534ef

Please sign in to comment.