diff options
author | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-15 12:27:07 +0000 |
---|---|---|
committer | Linus Nielsen Feltzing <linus@haxx.se> | 2006-08-15 12:27:07 +0000 |
commit | 224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9 (patch) | |
tree | bae2154b272f786983cf8e6de28d33f98f327560 /apps/recorder/radio.c | |
parent | c0f8b187706364f5e4bda2ac26750d14454c901d (diff) | |
download | rockbox-224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9.tar.gz rockbox-224c0a13ebb5828b9bc06a9c1c23ae17f0ac19f9.zip |
Finally, the new button action system is here, thanks to Jonathan Gordon. Some button mappings have changed and other things may break. Comments should go to the forum, http://forums.rockbox.org/index.php?topic=5829.0 or the mailing list.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@10582 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder/radio.c')
-rw-r--r-- | apps/recorder/radio.c | 21 |
1 files changed, 7 insertions, 14 deletions
diff --git a/apps/recorder/radio.c b/apps/recorder/radio.c index 1d39fefd21..c292909b33 100644 --- a/apps/recorder/radio.c +++ b/apps/recorder/radio.c | |||
@@ -1359,6 +1359,7 @@ bool handle_radio_presets_menu(void) | |||
1359 | int handle_radio_presets_cb(int key, int m) | 1359 | int handle_radio_presets_cb(int key, int m) |
1360 | { | 1360 | { |
1361 | (void)m; | 1361 | (void)m; |
1362 | #if 0 /* this screen needs fixing! */ | ||
1362 | switch(key) | 1363 | switch(key) |
1363 | { | 1364 | { |
1364 | #ifdef FM_PRESET_ADD | 1365 | #ifdef FM_PRESET_ADD |
@@ -1372,7 +1373,7 @@ int handle_radio_presets_cb(int key, int m) | |||
1372 | #ifdef FM_PRESET | 1373 | #ifdef FM_PRESET |
1373 | case FM_PRESET: | 1374 | case FM_PRESET: |
1374 | menu_draw(m); | 1375 | menu_draw(m); |
1375 | key = MENU_EXIT; /* Fake an exit */ | 1376 | key = ACTION_STD_EXIT; /* Fake an exit */ |
1376 | break; | 1377 | break; |
1377 | #endif | 1378 | #endif |
1378 | #endif | 1379 | #endif |
@@ -1409,21 +1410,11 @@ int handle_radio_presets_cb(int key, int m) | |||
1409 | case MENU_ENTER2 | BUTTON_REL: | 1410 | case MENU_ENTER2 | BUTTON_REL: |
1410 | #endif | 1411 | #endif |
1411 | case MENU_ENTER | BUTTON_REL: | 1412 | case MENU_ENTER | BUTTON_REL: |
1412 | key = MENU_ENTER; /* fake enter for short press */ | 1413 | key = ACTION_STD_SELECT; /* fake enter for short press */ |
1413 | break; | 1414 | break; |
1414 | 1415 | ||
1415 | /* ignore down events */ | 1416 | /* ignore down events */ |
1416 | #ifdef MENU_RC_ENTER | 1417 | case ACTION_STD_SELECT: |
1417 | case MENU_RC_ENTER: | ||
1418 | #endif | ||
1419 | #ifdef MENU_RC_ENTER2 | ||
1420 | case MENU_RC_ENTER2: | ||
1421 | #endif | ||
1422 | |||
1423 | #ifdef MENU_ENTER2 | ||
1424 | case MENU_ENTER2: | ||
1425 | #endif | ||
1426 | case MENU_ENTER: | ||
1427 | /* Ignore the release events */ | 1418 | /* Ignore the release events */ |
1428 | #ifdef FM_PRESET_ADD | 1419 | #ifdef FM_PRESET_ADD |
1429 | case FM_PRESET_ADD | BUTTON_REL: | 1420 | case FM_PRESET_ADD | BUTTON_REL: |
@@ -1434,6 +1425,7 @@ int handle_radio_presets_cb(int key, int m) | |||
1434 | key = BUTTON_NONE; | 1425 | key = BUTTON_NONE; |
1435 | break; | 1426 | break; |
1436 | } | 1427 | } |
1428 | #endif | ||
1437 | return key; | 1429 | return key; |
1438 | } | 1430 | } |
1439 | 1431 | ||
@@ -1611,6 +1603,7 @@ static bool scan_presets(void) | |||
1611 | int radio_menu_cb(int key, int m) | 1603 | int radio_menu_cb(int key, int m) |
1612 | { | 1604 | { |
1613 | (void)m; | 1605 | (void)m; |
1606 | #if 0 /* this screen needs fixing! */ | ||
1614 | switch(key) | 1607 | switch(key) |
1615 | { | 1608 | { |
1616 | #if (CONFIG_KEYPAD != IRIVER_H100_PAD) && (CONFIG_KEYPAD != IRIVER_H300_PAD) && (CONFIG_KEYPAD != IAUDIO_X5_PAD) | 1609 | #if (CONFIG_KEYPAD != IRIVER_H100_PAD) && (CONFIG_KEYPAD != IRIVER_H300_PAD) && (CONFIG_KEYPAD != IAUDIO_X5_PAD) |
@@ -1631,7 +1624,7 @@ int radio_menu_cb(int key, int m) | |||
1631 | key = MENU_ENTER; /* fake downpress, next menu doesn't like release */ | 1624 | key = MENU_ENTER; /* fake downpress, next menu doesn't like release */ |
1632 | break; | 1625 | break; |
1633 | } | 1626 | } |
1634 | 1627 | #endif | |
1635 | return key; | 1628 | return key; |
1636 | } | 1629 | } |
1637 | 1630 | ||