diff options
author | Michael Sevakis <jethead71@rockbox.org> | 2007-02-08 10:36:49 +0000 |
---|---|---|
committer | Michael Sevakis <jethead71@rockbox.org> | 2007-02-08 10:36:49 +0000 |
commit | 0f17532c9ddb2282c385ce6ad501a2e5d94acbe5 (patch) | |
tree | 02df2cb3f274e9106c21abf1926441bd7f3429c3 /apps/recorder/recording.c | |
parent | fe3cfcc9b2b0ce5f0862f891762794ddf42bb6ab (diff) | |
download | rockbox-0f17532c9ddb2282c385ce6ad501a2e5d94acbe5.tar.gz rockbox-0f17532c9ddb2282c385ce6ad501a2e5d94acbe5.zip |
Revert the changes using global status for the screen states. It should wait for a more comprehensive plan to maximize benefit if any can be had.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@12231 a1c6a512-1295-4272-9138-f99709370657
Diffstat (limited to 'apps/recorder/recording.c')
-rw-r--r-- | apps/recorder/recording.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/apps/recorder/recording.c b/apps/recorder/recording.c index a0a929f3a6..eb6f9b20ca 100644 --- a/apps/recorder/recording.c +++ b/apps/recorder/recording.c | |||
@@ -70,6 +70,13 @@ | |||
70 | #include "radio.h" | 70 | #include "radio.h" |
71 | #ifdef HAVE_RECORDING | 71 | #ifdef HAVE_RECORDING |
72 | 72 | ||
73 | static bool in_screen = false; | ||
74 | |||
75 | bool in_recording_screen(void) | ||
76 | { | ||
77 | return in_screen; | ||
78 | } | ||
79 | |||
73 | #define PM_HEIGHT ((LCD_HEIGHT >= 72) ? 2 : 1) | 80 | #define PM_HEIGHT ((LCD_HEIGHT >= 72) ? 2 : 1) |
74 | 81 | ||
75 | #if CONFIG_KEYPAD == RECORDER_PAD | 82 | #if CONFIG_KEYPAD == RECORDER_PAD |
@@ -794,7 +801,7 @@ bool recording_screen(bool no_source) | |||
794 | 801 | ||
795 | struct audio_recording_options rec_options; | 802 | struct audio_recording_options rec_options; |
796 | 803 | ||
797 | global_status.in_recording_screen = true; | 804 | in_screen = true; |
798 | cursor = 0; | 805 | cursor = 0; |
799 | #if (CONFIG_LED == LED_REAL) && !defined(SIMULATOR) | 806 | #if (CONFIG_LED == LED_REAL) && !defined(SIMULATOR) |
800 | ata_set_led_enabled(false); | 807 | ata_set_led_enabled(false); |
@@ -1764,7 +1771,7 @@ bool recording_screen(bool no_source) | |||
1764 | peak_meter_trigger(false); | 1771 | peak_meter_trigger(false); |
1765 | peak_meter_set_trigger_listener(NULL); | 1772 | peak_meter_set_trigger_listener(NULL); |
1766 | 1773 | ||
1767 | global_status.in_recording_screen = false; | 1774 | in_screen = false; |
1768 | sound_settings_apply(); | 1775 | sound_settings_apply(); |
1769 | 1776 | ||
1770 | FOR_NB_SCREENS(i) | 1777 | FOR_NB_SCREENS(i) |