diff options
-rw-r--r-- | apps/action.c | 4 | ||||
-rw-r--r-- | apps/gui/option_select.c | 2 | ||||
-rw-r--r-- | apps/gui/pitchscreen.c | 2 | ||||
-rw-r--r-- | apps/menus/recording_menu.c | 4 | ||||
-rw-r--r-- | apps/mpeg.c | 2 | ||||
-rw-r--r-- | apps/settings.c | 6 | ||||
-rw-r--r-- | firmware/system.c | 2 | ||||
-rw-r--r-- | firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | 4 |
8 files changed, 13 insertions, 13 deletions
diff --git a/apps/action.c b/apps/action.c index 8a72dcdce7..21198889d2 100644 --- a/apps/action.c +++ b/apps/action.c | |||
@@ -167,7 +167,7 @@ static int get_action_worker(int context, int timeout, | |||
167 | #endif | 167 | #endif |
168 | #ifndef HAS_BUTTON_HOLD | 168 | #ifndef HAS_BUTTON_HOLD |
169 | screen_has_lock = ((context & ALLOW_SOFTLOCK) == ALLOW_SOFTLOCK); | 169 | screen_has_lock = ((context & ALLOW_SOFTLOCK) == ALLOW_SOFTLOCK); |
170 | if (screen_has_lock && (keys_locked == true)) | 170 | if (screen_has_lock && keys_locked) |
171 | { | 171 | { |
172 | if (button == unlock_combo) | 172 | if (button == unlock_combo) |
173 | { | 173 | { |
@@ -267,7 +267,7 @@ bool action_userabort(int timeout) | |||
267 | #ifndef HAS_BUTTON_HOLD | 267 | #ifndef HAS_BUTTON_HOLD |
268 | bool is_keys_locked(void) | 268 | bool is_keys_locked(void) |
269 | { | 269 | { |
270 | return (screen_has_lock && (keys_locked == true)); | 270 | return (screen_has_lock && keys_locked); |
271 | } | 271 | } |
272 | #endif | 272 | #endif |
273 | 273 | ||
diff --git a/apps/gui/option_select.c b/apps/gui/option_select.c index 08d9d6e777..7b6c489bf3 100644 --- a/apps/gui/option_select.c +++ b/apps/gui/option_select.c | |||
@@ -158,7 +158,7 @@ void option_talk_value(const struct settings_list *setting, int value, bool enqu | |||
158 | { | 158 | { |
159 | if ((setting->flags & F_BOOL_SETTING) == F_BOOL_SETTING) | 159 | if ((setting->flags & F_BOOL_SETTING) == F_BOOL_SETTING) |
160 | { | 160 | { |
161 | bool val = value==1?true:false; | 161 | bool val = (value==1); |
162 | talk_id(val? setting->bool_setting->lang_yes : | 162 | talk_id(val? setting->bool_setting->lang_yes : |
163 | setting->bool_setting->lang_no, enqueue); | 163 | setting->bool_setting->lang_no, enqueue); |
164 | } | 164 | } |
diff --git a/apps/gui/pitchscreen.c b/apps/gui/pitchscreen.c index 05eb1d48ac..485eb7861c 100644 --- a/apps/gui/pitchscreen.c +++ b/apps/gui/pitchscreen.c | |||
@@ -351,7 +351,7 @@ int gui_syncpitchscreen_run(void) | |||
351 | if (pitch_mode == PITCH_MODE_ABSOLUTE) { | 351 | if (pitch_mode == PITCH_MODE_ABSOLUTE) { |
352 | pitch = pitch_increase(pitch, delta, true); | 352 | pitch = pitch_increase(pitch, delta, true); |
353 | } else { | 353 | } else { |
354 | pitch = pitch_increase_semitone(pitch, delta > 0 ? true:false); | 354 | pitch = pitch_increase_semitone(pitch, delta > 0); |
355 | } | 355 | } |
356 | 356 | ||
357 | delta = 0; | 357 | delta = 0; |
diff --git a/apps/menus/recording_menu.c b/apps/menus/recording_menu.c index 7805e8602c..c15a18291c 100644 --- a/apps/menus/recording_menu.c +++ b/apps/menus/recording_menu.c | |||
@@ -450,9 +450,9 @@ static void trigger_speak_item(const struct settings_list **settings, | |||
450 | selected_setting == STOP_THRESHOLD) && | 450 | selected_setting == STOP_THRESHOLD) && |
451 | temp == 0) | 451 | temp == 0) |
452 | { | 452 | { |
453 | talk_id(LANG_OFF, title?true:false); | 453 | talk_id(LANG_OFF, title); |
454 | } else { | 454 | } else { |
455 | option_talk_value(s, temp, title?true:false); | 455 | option_talk_value(s, temp, title); |
456 | } | 456 | } |
457 | } | 457 | } |
458 | int rectrigger(void) | 458 | int rectrigger(void) |
diff --git a/apps/mpeg.c b/apps/mpeg.c index 0353bcc399..8518ab68e6 100644 --- a/apps/mpeg.c +++ b/apps/mpeg.c | |||
@@ -2414,7 +2414,7 @@ void audio_set_recording_options(struct audio_recording_options *options) | |||
2414 | { | 2414 | { |
2415 | bool is_mpeg1; | 2415 | bool is_mpeg1; |
2416 | 2416 | ||
2417 | is_mpeg1 = (options->rec_frequency < 3)?true:false; | 2417 | is_mpeg1 = (options->rec_frequency < 3); |
2418 | 2418 | ||
2419 | rec_version_index = is_mpeg1?3:2; | 2419 | rec_version_index = is_mpeg1?3:2; |
2420 | rec_frequency_index = options->rec_frequency % 3; | 2420 | rec_frequency_index = options->rec_frequency % 3; |
diff --git a/apps/settings.c b/apps/settings.c index a782ac5548..0457f879c6 100644 --- a/apps/settings.c +++ b/apps/settings.c | |||
@@ -315,9 +315,9 @@ bool settings_load_config(const char* file, bool apply) | |||
315 | { | 315 | { |
316 | int temp; | 316 | int temp; |
317 | if (cfg_string_to_int(i,&temp,value)) | 317 | if (cfg_string_to_int(i,&temp,value)) |
318 | *(bool*)settings[i].setting = (temp==0?false:true); | 318 | *(bool*)settings[i].setting = (temp!=0); |
319 | if (settings[i].bool_setting->option_callback) | 319 | if (settings[i].bool_setting->option_callback) |
320 | settings[i].bool_setting->option_callback(temp==0?false:true); | 320 | settings[i].bool_setting->option_callback(temp!=0); |
321 | break; | 321 | break; |
322 | } | 322 | } |
323 | case F_T_CHARPTR: | 323 | case F_T_CHARPTR: |
@@ -1132,7 +1132,7 @@ bool set_option(const char* string, const void* variable, enum optiontype type, | |||
1132 | if (!option_screen(&item, NULL, false, NULL)) | 1132 | if (!option_screen(&item, NULL, false, NULL)) |
1133 | { | 1133 | { |
1134 | if (type == BOOL) | 1134 | if (type == BOOL) |
1135 | *(bool*)variable = (temp == 1? true: false); | 1135 | *(bool*)variable = (temp == 1); |
1136 | else | 1136 | else |
1137 | *(int*)variable = temp; | 1137 | *(int*)variable = temp; |
1138 | return false; | 1138 | return false; |
diff --git a/firmware/system.c b/firmware/system.c index 290452b0af..87fc40850f 100644 --- a/firmware/system.c +++ b/firmware/system.c | |||
@@ -107,7 +107,7 @@ void cpu_boost_(bool on_off, char* location, int line) | |||
107 | { | 107 | { |
108 | int message = (cpu_boost_first+cpu_boost_calls_count)%MAX_BOOST_LOG; | 108 | int message = (cpu_boost_first+cpu_boost_calls_count)%MAX_BOOST_LOG; |
109 | snprintf(cpu_boost_calls[message], MAX_PATH, | 109 | snprintf(cpu_boost_calls[message], MAX_PATH, |
110 | "%c %s:%d",on_off==true?'B':'U',location,line); | 110 | "%c %s:%d",on_off?'B':'U',location,line); |
111 | cpu_boost_calls_count++; | 111 | cpu_boost_calls_count++; |
112 | } | 112 | } |
113 | #else | 113 | #else |
diff --git a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c index 97372acdd5..f3d9aac168 100644 --- a/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c +++ b/firmware/target/arm/s3c2440/gigabeat-fx/backlight-meg-fx.c | |||
@@ -323,7 +323,7 @@ static void __backlight_dim(bool dim_now) | |||
323 | { | 323 | { |
324 | /* dont let the interrupt tick happen */ | 324 | /* dont let the interrupt tick happen */ |
325 | backlight_control = BACKLIGHT_CONTROL_IDLE; | 325 | backlight_control = BACKLIGHT_CONTROL_IDLE; |
326 | backlight_target = (dim_now == true) ? 0 : _backlight_brightness; | 326 | backlight_target = dim_now ? 0 : _backlight_brightness; |
327 | if(backlight_target==0 && _backlight_brightness==0) | 327 | if(backlight_target==0 && _backlight_brightness==0) |
328 | { | 328 | { |
329 | if(dim_now == false) | 329 | if(dim_now == false) |
@@ -361,7 +361,7 @@ static inline void __buttonlight_off(void) | |||
361 | static void __buttonlight_dim(bool dim_now) | 361 | static void __buttonlight_dim(bool dim_now) |
362 | { | 362 | { |
363 | buttonlight_control = BUTTONLIGHT_CONTROL_IDLE; | 363 | buttonlight_control = BUTTONLIGHT_CONTROL_IDLE; |
364 | buttonlight_target = (dim_now == true) ? 0 : buttonlight_brightness; | 364 | buttonlight_target = dim_now ? 0 : buttonlight_brightness; |
365 | if(buttonlight_target==0 && buttonlight_brightness==0) | 365 | if(buttonlight_target==0 && buttonlight_brightness==0) |
366 | { | 366 | { |
367 | if(dim_now == false) | 367 | if(dim_now == false) |