summaryrefslogtreecommitdiff
path: root/apps/gui/skin_engine/skin_touchsupport.c
diff options
context:
space:
mode:
Diffstat (limited to 'apps/gui/skin_engine/skin_touchsupport.c')
-rw-r--r--apps/gui/skin_engine/skin_touchsupport.c26
1 files changed, 13 insertions, 13 deletions
diff --git a/apps/gui/skin_engine/skin_touchsupport.c b/apps/gui/skin_engine/skin_touchsupport.c
index b952709562..cd2f5b6cd2 100644
--- a/apps/gui/skin_engine/skin_touchsupport.c
+++ b/apps/gui/skin_engine/skin_touchsupport.c
@@ -18,7 +18,7 @@
18 * KIND, either express or implied. 18 * KIND, either express or implied.
19 * 19 *
20 ****************************************************************************/ 20 ****************************************************************************/
21 21
22#include "config.h" 22#include "config.h"
23#include <stdio.h> 23#include <stdio.h>
24#include "action.h" 24#include "action.h"
@@ -80,7 +80,7 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
80 regions = SKINOFFSETTOPTR(skin_buffer, regions->next); 80 regions = SKINOFFSETTOPTR(skin_buffer, regions->next);
81 continue; 81 continue;
82 } 82 }
83 if (data->touchscreen_locked && 83 if (data->touchscreen_locked &&
84 (r->action != ACTION_TOUCH_SOFTLOCK && !r->allow_while_locked)) 84 (r->action != ACTION_TOUCH_SOFTLOCK && !r->allow_while_locked))
85 { 85 {
86 regions = SKINOFFSETTOPTR(skin_buffer, regions->next); 86 regions = SKINOFFSETTOPTR(skin_buffer, regions->next);
@@ -143,7 +143,7 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
143 r->last_press = current_tick; 143 r->last_press = current_tick;
144 break; 144 break;
145 default: 145 default:
146 if (r->armed && ((repeated && needs_repeat) || 146 if (r->armed && ((repeated && needs_repeat) ||
147 (released && !needs_repeat))) 147 (released && !needs_repeat)))
148 { 148 {
149 returncode = r->action; 149 returncode = r->action;
@@ -166,7 +166,7 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
166 skin_disarm_touchregions(gwps); 166 skin_disarm_touchregions(gwps);
167 if (temp && temp->press_length == LONG_PRESS) 167 if (temp && temp->press_length == LONG_PRESS)
168 temp->armed = false; 168 temp->armed = false;
169 169
170 if (returncode != ACTION_NONE) 170 if (returncode != ACTION_NONE)
171 { 171 {
172 if (global_settings.party_mode) 172 if (global_settings.party_mode)
@@ -227,9 +227,9 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
227 case ACTION_SETTINGS_INC: 227 case ACTION_SETTINGS_INC:
228 case ACTION_SETTINGS_DEC: 228 case ACTION_SETTINGS_DEC:
229 { 229 {
230 const struct settings_list *setting = 230 const struct settings_list *setting =
231 temp->setting_data.setting; 231 temp->setting_data.setting;
232 option_select_next_val(setting, 232 option_select_next_val(setting,
233 returncode == ACTION_SETTINGS_DEC, 233 returncode == ACTION_SETTINGS_DEC,
234 true); 234 true);
235 returncode = ACTION_REDRAW; 235 returncode = ACTION_REDRAW;
@@ -245,7 +245,7 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
245 case F_T_CUSTOM: 245 case F_T_CUSTOM:
246 s->custom_setting 246 s->custom_setting
247 ->load_from_cfg(s->setting, SKINOFFSETTOPTR(skin_buffer, data->value.text)); 247 ->load_from_cfg(s->setting, SKINOFFSETTOPTR(skin_buffer, data->value.text));
248 break; 248 break;
249 case F_T_INT: 249 case F_T_INT:
250 case F_T_UINT: 250 case F_T_UINT:
251 *(int*)s->setting = data->value.number; 251 *(int*)s->setting = data->value.number;
@@ -287,7 +287,7 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
287 break; 287 break;
288 case ACTION_TOUCH_SHUFFLE: /* toggle shuffle mode */ 288 case ACTION_TOUCH_SHUFFLE: /* toggle shuffle mode */
289 { 289 {
290 global_settings.playlist_shuffle = 290 global_settings.playlist_shuffle =
291 !global_settings.playlist_shuffle; 291 !global_settings.playlist_shuffle;
292 replaygain_update(); 292 replaygain_update();
293 if (global_settings.playlist_shuffle) 293 if (global_settings.playlist_shuffle)
@@ -299,7 +299,7 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
299 break; 299 break;
300 case ACTION_TOUCH_REPMODE: /* cycle the repeat mode setting */ 300 case ACTION_TOUCH_REPMODE: /* cycle the repeat mode setting */
301 { 301 {
302 const struct settings_list *rep_setting = 302 const struct settings_list *rep_setting =
303 find_setting(&global_settings.repeat_mode); 303 find_setting(&global_settings.repeat_mode);
304 option_select_next_val(rep_setting, false, true); 304 option_select_next_val(rep_setting, false, true);
305 audio_flush_and_reload_tracks(); 305 audio_flush_and_reload_tracks();
@@ -307,15 +307,15 @@ int skin_get_touchaction(struct gui_wps *gwps, int* edge_offset)
307 } 307 }
308 break; 308 break;
309 case ACTION_TOUCH_SETTING: 309 case ACTION_TOUCH_SETTING:
310 { 310 {
311 struct progressbar *bar = 311 struct progressbar *bar =
312 SKINOFFSETTOPTR(skin_buffer, temp->bar); 312 SKINOFFSETTOPTR(skin_buffer, temp->bar);
313 if (bar && edge_offset) 313 if (bar && edge_offset)
314 { 314 {
315 int val, count; 315 int val, count;
316 get_setting_info_for_bar(bar->setting, &count, &val); 316 get_setting_info_for_bar(bar->setting, bar->setting_offset, &count, &val);
317 val = *edge_offset * count / 1000; 317 val = *edge_offset * count / 1000;
318 update_setting_value_from_touch(bar->setting, val); 318 update_setting_value_from_touch(bar->setting, bar->setting_offset, val);
319 } 319 }
320 } 320 }
321 break; 321 break;