freemyipod r630 - Code Review

Repository:	freemyipod
Revision:	< r629‎ \| r630 \| r631 >
Date:	00:18, 20 February 2011
Author:	theseven
Status:	new
Tags:
Comment:	Installers: Fix button handling
Modified paths:	/apps/installer-ipodclassic/main.c (modified) (history) /apps/installer-ipodnano2g/main.c (modified) (history)

Diff [purge]

Index: apps/installer-ipodclassic/main.c
—	—	@@ -106,6 +106,7 @@
107	107	void handler(void* user, enum button_event eventtype, int which, int value)
108	108	{
109	109	if (eventtype == BUTTON_PRESS) button \|= 1 << which;
	110	+ if (eventtype == BUTTON_RELEASE) button &= ~(1 << which);
110	111	if (eventtype == WHEEL_MOVED_ACCEL)
111	112	scrollpos = MAX(0, MIN(295, scrollpos + value / 8));
112	113	wakeup_signal(&eventwakeup);
—	—	@@ -362,7 +363,6 @@
363	364	shutdown(false);
364	365	reset();
365	366	}
366		~~- button = 0;~~
367	367	}
368	368
369	369	button_unregister_handler(hook);
Index: apps/installer-ipodnano2g/main.c
—	—	@@ -74,6 +74,7 @@
75	75	void handler(void* user, enum button_event eventtype, int which, int value)
76	76	{
77	77	if (eventtype == BUTTON_PRESS) button \|= 1 << which;
	78	+ if (eventtype == BUTTON_RELEASE) button &= ~(1 << which);
78	79	if (eventtype == WHEEL_MOVED_ACCEL)
79	80	scrollpos = MAX(0, MIN(309, scrollpos + value / 8));
80	81	wakeup_signal(&eventwakeup);
—	—	@@ -755,7 +756,6 @@
756	757	shutdown(false);
757	758	reset();
758	759	}
759		~~- button = 0;~~
760	760	}
761	761
762	762	button_unregister_handler(hook);
—	—	@@ -794,7 +794,6 @@
795	795	shutdown(false);
796	796	reset();
797	797	}
798		~~- button = 0;~~
799	798	}
800	799
801	800	button_unregister_handler(hook);
—	—	@@ -818,7 +817,6 @@
819	818	break;
820	819	}
821	820	else if (button == 4) break;
822		~~- button = 0;~~
823	821	}
824	822
825	823	button_unregister_handler(hook);