diff options
| author | Denis Kenzior <denkenz@gmail.com> | 2012-10-31 08:46:43 -0500 |
|---|---|---|
| committer | Denis Kenzior <denkenz@gmail.com> | 2012-10-31 16:14:27 -0500 |
| commit | 9d223e7e39230639bcc6a7149105960dfda7ccf3 (patch) | |
| tree | 170e06bcec6dcc6a0baff64683e23d01a5640df2 /src/stk.c | |
| parent | 329158cdc2166701fd22974d7c4effa3ac5cc928 (diff) | |
| download | ofono-9d223e7e39230639bcc6a7149105960dfda7ccf3.tar.bz2 | |
stk: Tweak the concept of continuous tones
The spec explicitly mentions continuous or repeatable tones. 02.40 only
mentions the RP-ACK tone as a single tone, all other tones seem to be
repeatable
Diffstat (limited to 'src/stk.c')
| -rw-r--r-- | src/stk.c | 16 |
1 files changed, 12 insertions, 4 deletions
@@ -2488,7 +2488,7 @@ static gboolean handle_command_play_tone(const struct stk_command *cmd, static const struct { const char *name; /* Continuous true/false according to 02.40 */ - gboolean continuous; + gboolean repeatable; } tone_infos[] = { /* Default */ [0x00] = { "general-beep", FALSE }, @@ -2498,9 +2498,9 @@ static gboolean handle_command_play_tone(const struct stk_command *cmd, [0x02] = { "busy", TRUE }, [0x03] = { "congestion", TRUE }, [0x04] = { "radio-path-acknowledge", FALSE }, - [0x05] = { "radio-path-not-available", FALSE }, + [0x05] = { "radio-path-not-available", TRUE }, [0x06] = { "error", TRUE }, - [0x07] = { "call-waiting", FALSE }, + [0x07] = { "call-waiting", TRUE }, [0x08] = { "ringing-tone", TRUE }, /* Proprietary */ @@ -2557,7 +2557,15 @@ static gboolean handle_command_play_tone(const struct stk_command *cmd, else timeout = manufacturer_timeout; - if (!tone_infos[pt->tone].continuous) + /* + * According to TS 102.223 section 6.6.6: + * "the length of time for which the Terminal shall generate the tone, + * if the tone is contunious or repeatable. For single tones, the + * value of this data object shall be ignored by the Terminal. If no + * duration is specified, the Terminal shall default to a duration + * determined by the Terminal manufacturer + */ + if (!tone_infos[pt->tone].repeatable) /* Duration ignored */ err = stk_agent_play_tone(stk->current_agent, text, &pt->icon_id, vibrate, |