Nyaaori/rockbox
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

AB_REPEAT_ENABLE was never defined to 2

Browse source 
There's only 2 possibilities: defined or undefined

git-svn-id: svn://svn.rockbox.org/rockbox/trunk@27483 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Rafaël Carré 2010-07-18 18:13:53 +00:00
parent bff5e3d7ab
commit 7d4414ebd8
55 changed files with 55 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/abrepeat.h
View file

@ -28,9 +28,7 @@
#define AB_MARKER_NONE 0
#if (AB_REPEAT_ENABLE == 1)
#include "settings.h"
#endif
void ab_repeat_init(void);
#if 0 /* Currently unused */
@ -68,11 +66,7 @@ static inline bool ab_B_marker_set(void)
static inline bool ab_repeat_mode_enabled(void)
{
#if (AB_REPEAT_ENABLE == 2)
return ab_A_marker_set() || ab_B_marker_set();
#else
return global_settings.repeat_mode == REPEAT_AB;
#endif
}
static inline bool ab_reached_B_marker(unsigned int song_position)

2
apps/gui/statusbar.c
View file

@ -325,7 +325,7 @@ void gui_statusbar_draw(struct gui_statusbar * bar, bool force_redraw, struct vi
case REPEAT_AB:
gui_statusbar_icon_play_mode(display, Icon_RepeatAB);
break;
#endif /* AB_REPEAT_ENABLE == 1 */
#endif /* AB_REPEAT_ENABLE */
case REPEAT_ONE:
gui_statusbar_icon_play_mode(display, Icon_RepeatOne);

8
apps/gui/wps.c
View file

@ -888,10 +888,6 @@ long gui_wps_show(void)
{
ab_jump_to_A_marker();
break;
#if (AB_REPEAT_ENABLE == 2)
} else {
ab_reset_markers();
#endif
}
}
else
@ -915,10 +911,6 @@ long gui_wps_show(void)
{
ab_jump_to_A_marker();
break;
#if (AB_REPEAT_ENABLE == 2)
} else {
ab_reset_markers();
#endif
}
}
else

2
firmware/export/config/application.h
View file

@ -56,7 +56,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config/archosfmrecorder.h
View file

@ -71,7 +71,7 @@
#define CONFIG_TUNER S1A0903X01
#endif
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this if you have a MAS3587F */
#define CONFIG_CODEC MAS3587F

2
firmware/export/config/archosondiofm.h
View file

@ -41,7 +41,7 @@
/* Define this to enable morse code input */
#define HAVE_MORSE_INPUT
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* define this if you have access to the pitchscreen */

2
firmware/export/config/archosondiosp.h
View file

@ -34,7 +34,7 @@
/* Define this to enable morse code input */
#define HAVE_MORSE_INPUT
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* define this if you have access to the pitchscreen */

2
firmware/export/config/archosplayer.h
View file

@ -24,7 +24,7 @@
/* define this if you have the Player's keyboard */
#define CONFIG_KEYPAD PLAYER_PAD
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* The number of bytes reserved for loadable plugins */

2
firmware/export/config/archosrecorder.h
View file

@ -60,7 +60,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x8000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this if you have a MAS3587F */
#define CONFIG_CODEC MAS3587F

2
firmware/export/config/archosrecorderv2.h
View file

@ -66,7 +66,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x8000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this if you have a MAS3587F */
#define CONFIG_CODEC MAS3587F

2
firmware/export/config/cowond2.h
View file

@ -104,7 +104,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config/gigabeatfx.h
View file

@ -104,7 +104,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this if you have the WM8975 audio codec */
#define HAVE_WM8751

2
firmware/export/config/gogearhdd1630.h
View file

@ -111,7 +111,7 @@
/* WM8731 has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
/* TODO: #define AB_REPEAT_ENABLE 1 */
/* TODO: #define AB_REPEAT_ENABLE */
/* FM Tuner */
#define CONFIG_TUNER TEA5767

2
firmware/export/config/gogearhdd6330.h
View file

@ -111,7 +111,7 @@
/* WM8731 has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
/* TODO: #define AB_REPEAT_ENABLE 1 */
/* TODO: #define AB_REPEAT_ENABLE */
/* FM Tuner */
#define CONFIG_TUNER TEA5767

2
firmware/export/config/gogearsa9200.h
View file

@ -94,7 +94,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this for LCD backlight available */
#define HAVE_BACKLIGHT

2
firmware/export/config/iaudio7.h
View file

@ -107,7 +107,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config/iaudiom3.h
View file

@ -72,7 +72,7 @@
#define CONFIG_KEYPAD IAUDIO_M3_PAD
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* Define this if you do software codec */

2
firmware/export/config/iaudiom5.h
View file

@ -89,7 +89,7 @@
/* Define this to enable morse code input */
#define HAVE_MORSE_INPUT
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* Define this if you do software codec */

2
firmware/export/config/iaudiox5.h
View file

@ -91,7 +91,7 @@
/* Define this to enable morse code input */
#define HAVE_MORSE_INPUT
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* Define this if you do software codec */

2
firmware/export/config/ipod4g.h
View file

@ -106,7 +106,7 @@
/* Define this if you have the WM8975 audio codec */
#define HAVE_WM8975
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* define this if you have a disk storage, i.e. something

2
firmware/export/config/ipodcolor.h
View file

@ -90,7 +90,7 @@
/* Define this if you have the WM8975 audio codec */
#define HAVE_WM8975
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* define this if you have a disk storage, i.e. something

2
firmware/export/config/ipodmini1g.h
View file

@ -110,7 +110,7 @@
/* WM8721 has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* define this if you have a disk storage, i.e. something

2
firmware/export/config/ipodmini2g.h
View file

@ -108,7 +108,7 @@
/* WM8721 has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* define this if you have a disk storage, i.e. something

2
firmware/export/config/ipodnano1g.h
View file

@ -90,7 +90,7 @@
/* Define this if you have the WM8975 audio codec */
#define HAVE_WM8975
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* Define this for LCD backlight available */

2
firmware/export/config/ipodnano2g.h
View file

@ -97,7 +97,7 @@
#define CONFIG_KEYPAD IPOD_4G_PAD
//#define AB_REPEAT_ENABLE 1
//#define AB_REPEAT_ENABLE
//#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* Define this to enable morse code input */

2
firmware/export/config/ipodvideo.h
View file

@ -95,7 +95,7 @@
/* Define this if you have the WM8758 audio codec */
#define HAVE_WM8758
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* define this if you have a disk storage, i.e. something

4
firmware/export/config/iriverh10.h
View file

@ -110,7 +110,7 @@
/* WM8731 has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner */
#define CONFIG_TUNER TEA5767
@ -119,7 +119,7 @@
/* Define this for LCD backlight available */
#define HAVE_BACKLIGHT
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */

2
firmware/export/config/iriverh100.h
View file

@ -105,7 +105,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define CONFIG_TUNER TEA5767
#define CONFIG_TUNER_XTAL 32768

4
firmware/export/config/iriverh10_5gb.h
View file

@ -89,7 +89,7 @@
/* WM8731 has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner */
#define CONFIG_TUNER TEA5767
@ -102,7 +102,7 @@
/* Define this for LCD backlight available */
#define HAVE_BACKLIGHT
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define BATTERY_CAPACITY_DEFAULT 820 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 700 /* min. capacity selectable */

2
firmware/export/config/iriverh120.h
View file

@ -104,7 +104,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define CONFIG_TUNER TEA5767
#define CONFIG_TUNER_XTAL 32768

2
firmware/export/config/iriverh300.h
View file

@ -100,7 +100,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define CONFIG_TUNER TEA5767
#define CONFIG_TUNER_XTAL 32768

2
firmware/export/config/logikdax.h
View file

@ -79,7 +79,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x10000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config/meizum3.h
View file

@ -76,7 +76,7 @@
#define CONFIG_KEYPAD MEIZU_M3_PAD
//#define AB_REPEAT_ENABLE 1
//#define AB_REPEAT_ENABLE
//#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* Define this if you do software codec */

2
firmware/export/config/meizum6sl.h
View file

@ -76,7 +76,7 @@
#define CONFIG_KEYPAD MEIZU_M6SL_PAD
//#define AB_REPEAT_ENABLE 1
//#define AB_REPEAT_ENABLE
//#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* Define this if you do software codec */

2
firmware/export/config/meizum6sp.h
View file

@ -82,7 +82,7 @@
#define CONFIG_KEYPAD MEIZU_M6SP_PAD
//#define AB_REPEAT_ENABLE 1
//#define AB_REPEAT_ENABLE
//#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* Define this if you do software codec */

2
firmware/export/config/mrobe100.h
View file

@ -91,7 +91,7 @@
#define HAVE_WM8751
#define CODEC_SRCTRL_44100HZ (0x40|(0x11 << 1)|1)
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* define this if you have a disk storage, i.e. something
that needs spinups and can cause skips when shaked */

2
firmware/export/config/samsungyh820.h
View file

@ -126,7 +126,7 @@
/* AK4537 has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */

2
firmware/export/config/samsungyh920.h
View file

@ -133,7 +133,7 @@
/* AK4537 has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define BATTERY_CAPACITY_DEFAULT 1550 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 1500 /* min. capacity selectable */

2
firmware/export/config/samsungyh925.h
View file

@ -130,7 +130,7 @@
/* AK4537 has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define BATTERY_CAPACITY_DEFAULT 900 /* default battery capacity */
#define BATTERY_CAPACITY_MIN 500 /* min. capacity selectable */

2
firmware/export/config/samsungyps3.h
View file

@ -80,7 +80,7 @@
/* We have headphone detection */
#define HAVE_HEADPHONE_DETECTION
//#define AB_REPEAT_ENABLE 1
//#define AB_REPEAT_ENABLE
//#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* Define this if you do software codec */

2
firmware/export/config/sansac100.h
View file

@ -68,7 +68,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x50000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config/sansac200.h
View file

@ -112,7 +112,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner */
#define CONFIG_TUNER LV24020LP

2
firmware/export/config/sansac200v2.h
View file

@ -109,7 +109,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x14000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner - suspected to be the SI4702 */
#define CONFIG_TUNER SI4700

2
firmware/export/config/sansaclip.h
View file

@ -113,7 +113,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x10000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner */
#define CONFIG_TUNER SI4700 /* in fact SI4702 but let's hope it's compatible */

2
firmware/export/config/sansaclipplus.h
View file

@ -120,7 +120,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner */
#define CONFIG_TUNER (SI4700|RDA5802) /* in fact SI4702 */

2
firmware/export/config/sansaclipv2.h
View file

@ -116,7 +116,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner */
#define CONFIG_TUNER SI4700 /* in fact SI4702 */

2
firmware/export/config/sansae200.h
View file

@ -105,7 +105,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner */
#define CONFIG_TUNER LV24020LP

2
firmware/export/config/sansae200v2.h
View file

@ -103,7 +103,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner - suspected to be the SI4702 */
#define CONFIG_TUNER SI4700

2
firmware/export/config/sansafuze.h
View file

@ -109,7 +109,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner - suspected to be the SI4702 */
#define CONFIG_TUNER SI4700

2
firmware/export/config/sansafuzev2.h
View file

@ -118,7 +118,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* FM Tuner - suspected to be the SI4702 */
#define CONFIG_TUNER SI4700

2
firmware/export/config/sansam200.h
View file

@ -76,7 +76,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x10000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this if you do software codec */
#define CONFIG_CODEC SWCODEC

2
firmware/export/config/sansam200v4.h
View file

@ -81,7 +81,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x10000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define CONFIG_TUNER TEA5767
#define CONFIG_TUNER_XTAL 32768

2
firmware/export/config/sansaview.h
View file

@ -99,7 +99,7 @@
/* The number of bytes reserved for loadable plugins */
#define PLUGIN_BUFFER_SIZE 0x80000
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* Define this for LCD backlight available */
#define HAVE_BACKLIGHT

2
firmware/export/config/tatungtpj1022.h
View file

@ -68,7 +68,7 @@
/* Define this if you have the WM8731 audio codec */
#define HAVE_WM8731
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
/* define this if you have a disk storage, i.e. something
that needs spinups and can cause skips when shaked */

2
firmware/export/config/vibe500.h
View file

@ -104,7 +104,7 @@
/* WM8731 has no tone controls, so we use the software ones */
#define HAVE_SW_TONE_CONTROLS
#define AB_REPEAT_ENABLE 1
#define AB_REPEAT_ENABLE
#define ACTION_WPSAB_SINGLE ACTION_WPS_BROWSE
/* Define this for LCD backlight available */