devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Fix r30130 red. New functions in misc.c shouldn't be compiled if '__PCTOOL__' is defined.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@30131 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-07-08 22:51:12 +00:00
parent 5663e1cd0a
commit b2dbc2fe70
1 changed files with 50 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

99
apps/misc.c
View file

@ -837,6 +837,56 @@ char *strip_extension(char* buffer, int buffer_size, const char *filename)
return buffer;
}
#if CONFIG_CODEC == SWCODEC
/* Play a standard sound */
void system_sound_play(enum system_sound sound)
{
static const struct beep_params
{
int *setting;
unsigned short frequency;
unsigned short duration;
unsigned short amplitude;
} beep_params[] =
{
[SOUND_KEYCLICK] =
{ &global_settings.keyclick,
4000, KEYCLICK_DURATION, 2500 },
[SOUND_TRACK_SKIP] =
{ &global_settings.beep,
2000, 100, 2500 },
[SOUND_TRACK_NO_MORE] =
{ &global_settings.beep,
1000, 100, 1500 },
};
const struct beep_params *params = &beep_params[sound];
if (*params->setting)
{
beep_play(params->frequency, params->duration,
params->amplitude * *params->setting);
}
}
/* Produce keyclick based upon button and global settings */
void keyclick_click(int button)
{
/* Settings filters */
if (global_settings.keyclick &&
(global_settings.keyclick_repeats || !(button & BUTTON_REPEAT)))
{
/* Button filters */
if (button != BUTTON_NONE && !(button & BUTTON_REL)
&& !(button & (SYS_EVENT|BUTTON_MULTIMEDIA)) )
{
system_sound_play(SOUND_KEYCLICK);
}
}
}
#endif /* CONFIG_CODEC == SWCODEC */
#endif /* !defined(__PCTOOL__) */
/* Read (up to) a line of text from fd into buffer and return number of bytes
@ -1036,52 +1086,3 @@ enum current_activity get_current_activity(void)
{
return current_activity[current_activity_top?current_activity_top-1:0];
}
#if CONFIG_CODEC == SWCODEC
/* Play a standard sound */
void system_sound_play(enum system_sound sound)
{
static const struct beep_params
{
int *setting;
unsigned short frequency;
unsigned short duration;
unsigned short amplitude;
} beep_params[] =
{
[SOUND_KEYCLICK] =
{ &global_settings.keyclick,
4000, KEYCLICK_DURATION, 2500 },
[SOUND_TRACK_SKIP] =
{ &global_settings.beep,
2000, 100, 2500 },
[SOUND_TRACK_NO_MORE] =
{ &global_settings.beep,
1000, 100, 1500 },
};
const struct beep_params *params = &beep_params[sound];
if (*params->setting)
{
beep_play(params->frequency, params->duration,
params->amplitude * *params->setting);
}
}
/* Produce keyclick based upon button and global settings */
void keyclick_click(int button)
{
/* Settings filters */
if (global_settings.keyclick &&
(global_settings.keyclick_repeats || !(button & BUTTON_REPEAT)))
{
/* Button filters */
if (button != BUTTON_NONE && !(button & BUTTON_REL)
&& !(button & (SYS_EVENT|BUTTON_MULTIMEDIA)) )
{
system_sound_play(SOUND_KEYCLICK);
}
}
}
#endif /* CONFIG_CODEC == SWCODEC */