tree.c move voice filetypes to its own conditional

Change-Id: I3a5171378355e64192de1e29f62d52e03771afe4
This commit is contained in:
William Wilgus 2022-11-21 22:51:38 -05:00 committed by William Wilgus
parent efdc6feddb
commit d077fec5f1

View file

@ -257,9 +257,6 @@ static int tree_voice_cb(int selected_item, void * data)
talk_id(is_dir ? VOICE_DIR : VOICE_FILE, false); talk_id(is_dir ? VOICE_DIR : VOICE_FILE, false);
talk_number(selected_item+1 - (is_dir ? 0 : local_tc->dirsindir), talk_number(selected_item+1 - (is_dir ? 0 : local_tc->dirsindir),
true); true);
if(global_settings.talk_filetype
&& !is_dir && *local_tc->dirfilter < NUM_FILTER_MODES)
say_filetype(attr);
break; break;
case 2: /* spelled */ case 2: /* spelled */
talk_shutup(); talk_shutup();
@ -267,13 +264,18 @@ static int tree_voice_cb(int selected_item, void * data)
{ {
if(is_dir) if(is_dir)
talk_id(VOICE_DIR, true); talk_id(VOICE_DIR, true);
else if(*local_tc->dirfilter < NUM_FILTER_MODES)
say_filetype(attr);
} }
talk_spell(name, true); talk_spell(name, true);
break; break;
} }
} }
if(global_settings.talk_filetype && !is_dir
&& *local_tc->dirfilter < NUM_FILTER_MODES)
{
say_filetype(attr);
}
return 0; return 0;
} }