From d2f848fe39f951c8ea456429cd4290f125d11772 Mon Sep 17 00:00:00 2001 From: Wincent Balin Date: Thu, 3 Jun 2010 02:34:19 +0000 Subject: pdbox: Added keypad for iPod 1G-4G. Reordered SOURCES alphabetically. git-svn-id: svn://svn.rockbox.org/rockbox/trunk@26500 a1c6a512-1295-4272-9138-f99709370657 --- apps/plugins/pdbox/SOURCES | 50 +++++++++++++++++++++++----------------------- apps/plugins/pdbox/pdbox.h | 18 ++++++++++++++--- 2 files changed, 40 insertions(+), 28 deletions(-) (limited to 'apps/plugins/pdbox') diff --git a/apps/plugins/pdbox/SOURCES b/apps/plugins/pdbox/SOURCES index f872b017c9..5619767044 100644 --- a/apps/plugins/pdbox/SOURCES +++ b/apps/plugins/pdbox/SOURCES @@ -5,67 +5,67 @@ pdbox-gui.c PDa/src/s_audio_rockbox.c -PDa/src/d_ugen.c PDa/src/d_arithmetic.c +PDa/src/d_ctl.c PDa/src/d_dac.c -PDa/src/d_misc.c PDa/src/d_fft.c -PDa/src/d_imayer_fft.c -PDa/src/d_mayer_fft.c PDa/src/d_fftroutine.c PDa/src/d_global.c +PDa/src/d_imayer_fft.c +PDa/src/d_mayer_fft.c +PDa/src/d_misc.c PDa/src/d_resample.c -PDa/src/d_ctl.c PDa/src/d_soundfile.c +PDa/src/d_ugen.c +PDa/src/g_all_guis.c +PDa/src/g_array.c +PDa/src/g_bang.c PDa/src/g_canvas.c +PDa/src/g_editor.c PDa/src/g_graph.c -PDa/src/g_text.c -PDa/src/g_rtext.c -PDa/src/g_array.c -PDa/src/g_template.c -PDa/src/g_io.c -PDa/src/g_scalar.c -PDa/src/g_traversal.c PDa/src/g_guiconnect.c -PDa/src/g_readwrite.c -PDa/src/g_editor.c -PDa/src/g_all_guis.c -PDa/src/g_bang.c PDa/src/g_hdial.c PDa/src/g_hslider.c +PDa/src/g_io.c PDa/src/g_mycanvas.c PDa/src/g_numbox.c +PDa/src/g_readwrite.c +PDa/src/g_rtext.c +PDa/src/g_scalar.c +PDa/src/g_template.c +PDa/src/g_text.c PDa/src/g_toggle.c +PDa/src/g_traversal.c PDa/src/g_vdial.c PDa/src/g_vslider.c PDa/src/g_vumeter.c -PDa/src/m_pd.c -PDa/src/m_class.c -PDa/src/m_obj.c PDa/src/m_atom.c -PDa/src/m_memory.c PDa/src/m_binbuf.c +PDa/src/m_class.c PDa/src/m_conf.c +PDa/src/m_fixed.c PDa/src/m_glob.c +PDa/src/m_memory.c +PDa/src/m_obj.c +PDa/src/m_pd.c PDa/src/m_sched.c -PDa/src/m_fixed.c +PDa/src/s_audio.c PDa/src/s_file.c -PDa/src/s_print.c PDa/src/s_loader.c PDa/src/s_path.c -PDa/src/s_audio.c +PDa/src/s_print.c +PDa/src/x_acoustics.c PDa/src/x_arithmetic.c PDa/src/x_connective.c PDa/src/x_interface.c PDa/src/x_misc.c -PDa/src/x_time.c -PDa/src/x_acoustics.c PDa/src/x_net.c PDa/src/x_qlist.c +PDa/src/x_time.c PDa/intern/biquad~.c PDa/intern/bp~.c diff --git a/apps/plugins/pdbox/pdbox.h b/apps/plugins/pdbox/pdbox.h index e0a0fb59c7..2ee32a0dc8 100644 --- a/apps/plugins/pdbox/pdbox.h +++ b/apps/plugins/pdbox/pdbox.h @@ -225,7 +225,7 @@ enum pd_key_id /* Map real keys to virtual ones. Feel free to add your preferred keymap here. */ -#if defined(IRIVER_H300_SERIES) +#if (CONFIG_KEYPAD == IRIVER_H300_PAD) /* Added by wincent */ #define PDPOD_QUIT (BUTTON_OFF) #define PDPOD_PLAY (BUTTON_ON) @@ -235,7 +235,7 @@ enum pd_key_id #define PDPOD_WHEELLEFT (BUTTON_DOWN) #define PDPOD_WHEELRIGHT (BUTTON_UP) #define PDPOD_ACTION (BUTTON_MODE) -#elif defined(IRIVER_H100_SERIES) +#elif (CONFIG_KEYPAD == IRIVER_H100_PAD) /* Added by wincent */ #define PDPOD_QUIT (BUTTON_OFF) #define PDPOD_PLAY (BUTTON_REC) @@ -245,7 +245,8 @@ enum pd_key_id #define PDPOD_WHEELLEFT (BUTTON_DOWN) #define PDPOD_WHEELRIGHT (BUTTON_UP) #define PDPOD_ACTION (BUTTON_ON) -#elif CONFIG_KEYPAD == SANSA_FUZE_PAD +#elif (CONFIG_KEYPAD == SANSA_FUZE_PAD) + /* Added by funman */ #define PDPOD_QUIT (BUTTON_HOME|BUTTON_REPEAT) #define PDPOD_PLAY BUTTON_UP #define PDPOD_PREVIOUS BUTTON_LEFT @@ -254,6 +255,17 @@ enum pd_key_id #define PDPOD_WHEELLEFT BUTTON_SCROLL_BACK #define PDPOD_WHEELRIGHT BUTTON_SCROLL_FWD #define PDPOD_ACTION BUTTON_DOWN +#elif (CONFIG_KEYPAD == IPOD_4G_PAD) || (CONFIG_KEYPAD == IPOD_3G_PAD) || \ + (CONFIG_KEYPAD == IPOD_1G2G_PAD) + /* Added by wincent */ + #define PDPOD_QUIT (BUTTON_SELECT | BUTTON_MENU) + #define PDPOD_PLAY (BUTTON_PLAY) + #define PDPOD_PREVIOUS (BUTTON_LEFT) + #define PDPOD_NEXT (BUTTON_RIGHT) + #define PDPOD_MENU (BUTTON_MENU) + #define PDPOD_WHEELLEFT (BUTTON_SCROLL_BACK) + #define PDPOD_WHEELRIGHT (BUTTON_SCROLL_FWD) + #define PDPOD_ACTION (BUTTON_SELECT) #else #warning "No keys defined for this architecture!" #endif -- cgit