nihilazo/rockbox
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Patch #4899 by Robert Keevil - Automatic pause on iPod when removing the headphones

Browse Source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@11057 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Linus Nielsen Feltzing 2006-09-26 10:03:56 +00:00
parent 9f960e405f
commit 537c7546f9
15 changed files with 220 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
apps/codecs.c
View File

@ -218,6 +218,7 @@ struct codec_api ci = {
enc_wavbuf_near_empty,
enc_get_wav_data,
&enc_set_header_callback,
44100,
#endif
/* new stuff at the end, sort into place next time

1
apps/codecs.h
View File

@ -303,6 +303,7 @@ struct codec_api {
char* (*enc_get_wav_data)(int size);
void (**enc_set_header_callback)(void *head_buffer,
int head_size, int num_samples, bool is_file_header);
int sample_rate;
#endif
/* new stuff at the end, sort into place next time

56
apps/lang/english.lang
View File

@ -9806,3 +9806,59 @@
*: ""
</voice>
</phrase>
<phrase>
id: LANG_UNPLUG
desc: in settings_menu.
user:
<source>
*: "Pause on headphone unplug"
</source>
<dest>
*: "Pause on headphone unplug"
</dest>
<voice>
*: "Pause on headphone unplug"
</voice>
</phrase>
<phrase>
id: LANG_UNPLUG_RESUME
desc: in pause_phones_menu.
user:
<source>
*: "Pause and Resume"
</source>
<dest>
*: "Pause and Resume"
</dest>
<voice>
*: "Pause and Resume"
</voice>
</phrase>
<phrase>
id: LANG_UNPLUG_RW
desc: in pause_phones_menu.
user:
<source>
*: "Duration to rewind"
</source>
<dest>
*: "Duration to rewind"
</dest>
<voice>
*: "Duration to rewind"
</voice>
</phrase>
<phrase>
id: LANG_UNPLUG_DISABLE_AUTORESUME
desc: in pause_phones_menu.
user:
<source>
*: "Disable auto-resume if phones not present"
</source>
<dest>
*: "Disable auto-resume if phones not present"
</dest>
<voice>
*: "Disable auto-resume if phones not present"
</voice>
</phrase>

36
apps/misc.c
View File

@ -580,6 +580,33 @@ void car_adapter_mode_init(void)
}
#endif
#ifdef HAVE_HEADPHONE_DETECTION
void unplug_change(bool inserted)
{
if (global_settings.unplug_mode)
{
if (inserted)
{
if ( global_settings.unplug_mode > 1 )
audio_resume();
backlight_on();
} else {
audio_pause();
if (global_settings.unplug_rw)
{
if ( audio_current_track()->elapsed >
(unsigned long)(global_settings.unplug_rw*1000))
audio_ff_rewind(audio_current_track()->elapsed -
(global_settings.unplug_rw*1000));
else
audio_ff_rewind(0);
}
}
}
}
#endif
long default_event_handler_ex(long event, void (*callback)(void *), void *parameter)
{
switch(event)
@ -608,6 +635,15 @@ long default_event_handler_ex(long event, void (*callback)(void *), void *parame
case SYS_CHARGER_DISCONNECTED:
car_adapter_mode_processing(false);
return SYS_CHARGER_DISCONNECTED;
#endif
#ifdef HAVE_HEADPHONE_DETECTION
case SYS_PHONE_PLUGGED:
unplug_change(true);
return SYS_PHONE_PLUGGED;
case SYS_PHONE_UNPLUGGED:
unplug_change(false);
return SYS_PHONE_UNPLUGGED;
#endif
}
return 0;

6
apps/settings.c
View File

@ -655,6 +655,12 @@ static const struct bit_entry hd_bits[] =
#endif
#endif
#ifdef HAVE_HEADPHONE_DETECTION
{2, S_O(unplug_mode), 0, "pause on headphone unplug", NULL},
{4, S_O(unplug_rw), 0, "rewind duration on pause", NULL},
{1, S_O(unplug_autoresume), 0, "disable autoresume if phones not present", off_on },
#endif
/* If values are just added to the end, no need to bump the version. */
/* new stuff to be added at the end */

6
apps/settings.h
View File

@ -486,6 +486,12 @@ struct user_settings
#endif
bool hold_lr_for_scroll_in_list; /* hold L/R scrolls the list left/right */
int show_path_in_browser; /* 0=off, 1=current directory, 2=full path */
#ifdef HAVE_HEADPHONE_DETECTION
int unplug_mode; /* pause on headphone unplug */
int unplug_rw; /* time in s to rewind when pausing */
bool unplug_autoresume; /* disable auto-resume if no phones */
#endif
};
enum optiontype { INT, BOOL };

56
apps/settings_menu.c
View File

@ -1664,6 +1664,57 @@ static bool tagcache_settings_menu(void)
return result;
}
#ifdef HAVE_HEADPHONE_DETECTION
static bool unplug_mode(void)
{
static const struct opt_items names[] = {
{ STR(LANG_OFF) },
{ STR(LANG_PAUSE) },
{ STR(LANG_UNPLUG_RESUME) },
};
bool ret;
ret=set_option( str(LANG_UNPLUG),
&global_settings.unplug_mode, INT, names, 3, NULL);
return ret;
}
static bool unplug_rw(void)
{
bool ret;
ret = set_int(str(LANG_UNPLUG_RW), "s", UNIT_SEC,
&global_settings.unplug_rw,
NULL, 1, 0, 15, NULL );
audio_set_crossfade(global_settings.unplug_rw);
return ret;
}
static bool unplug_autoresume(void)
{
return set_bool( str(LANG_UNPLUG_DISABLE_AUTORESUME),
&global_settings.unplug_autoresume );
}
static bool unplug_menu(void)
{
int m;
bool result;
static const struct menu_item items[] = {
{ ID2P(LANG_UNPLUG), unplug_mode },
{ ID2P(LANG_UNPLUG_RW), unplug_rw },
{ ID2P(LANG_UNPLUG_DISABLE_AUTORESUME), unplug_autoresume },
};
m=menu_init( items, sizeof(items) / sizeof(*items), NULL,
NULL, NULL, NULL);
result = menu_run(m);
menu_exit(m);
return result;
}
#endif
static bool playback_settings_menu(void)
{
int m;
@ -1687,7 +1738,10 @@ static bool playback_settings_menu(void)
{ ID2P(LANG_SPDIF_ENABLE), spdif },
#endif
{ ID2P(LANG_ID3_ORDER), id3_order },
{ ID2P(LANG_NEXT_FOLDER), next_folder }
{ ID2P(LANG_NEXT_FOLDER), next_folder },
#ifdef HAVE_HEADPHONE_DETECTION
{ ID2P(LANG_UNPLUG), unplug_menu }
#endif
};
bool old_shuffle = global_settings.playlist_shuffle;

15
apps/tree.c
View File

@ -466,7 +466,20 @@ static void start_resume(bool just_powered_on)
/* always resume? */
if ( global_settings.resume || ! just_powered_on)
do_resume = true;
#ifdef HAVE_HEADPHONE_DETECTION
{
if ( just_powered_on )
{
if ( !global_settings.unplug_autoresume
|| headphones_inserted() )
do_resume = true;
}
else
do_resume = true;
}
#else
do_resume = true;
#endif
if (! do_resume) return;

28
firmware/drivers/button.c
View File

@ -92,6 +92,10 @@ static bool remote_button_hold_only(void);
int int_btn = BUTTON_NONE;
#endif
#ifdef HAVE_HEADPHONE_DETECTION
bool phones_present = false;
#endif
#if (CONFIG_KEYPAD == IPOD_4G_PAD) && !defined(IPOD_MINI)
static void opto_i2c_init(void)
{
@ -433,6 +437,23 @@ static void button_tick(void)
}
#endif
#ifdef HAVE_HEADPHONE_DETECTION
if ( headphones_inserted() )
{
if (! phones_present )
{
queue_post(&button_queue, SYS_PHONE_PLUGGED, NULL);
phones_present = true;
}
} else {
if ( phones_present )
{
queue_post(&button_queue, SYS_PHONE_UNPLUGGED, NULL);
phones_present = false;
}
}
#endif
btn = button_read();
/* Find out if a key has been released */
@ -1327,3 +1348,10 @@ void button_clear_queue(void)
queue_clear(&button_queue);
}
#ifdef HAVE_HEADPHONE_DETECTION
bool headphones_inserted(void)
{
return (GPIOA_INPUT_VAL & 0x80)?true:false;
}
#endif

3
firmware/export/button.h
View File

@ -54,6 +54,9 @@ bool button_hold(void);
#ifdef HAS_REMOTE_BUTTON_HOLD
bool remote_button_hold(void);
#endif
#ifdef HAVE_HEADPHONE_DETECTION
bool headphones_inserted(void);
#endif
#define BUTTON_NONE 0x00000000

3
firmware/export/config-ipod4g.h
View File

@ -109,6 +109,9 @@
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ
/* Define this if you can detect headphones */
#define HAVE_HEADPHONE_DETECTION
#define BOOTFILE_EXT "ipod"
#define BOOTFILE "rockbox." BOOTFILE_EXT

3
firmware/export/config-ipodcolor.h
View File

@ -105,6 +105,9 @@
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ
/* Define this if you can detect headphones */
#define HAVE_HEADPHONE_DETECTION
#define BOOTFILE_EXT "ipod"
#define BOOTFILE "rockbox." BOOTFILE_EXT

3
firmware/export/config-ipodnano.h
View File

@ -110,6 +110,9 @@
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ
/* Define this if you can detect headphones */
#define HAVE_HEADPHONE_DETECTION
#define BOOTFILE_EXT "ipod"
#define BOOTFILE "rockbox." BOOTFILE_EXT

3
firmware/export/config-ipodvideo.h
View File

@ -110,6 +110,9 @@
/* Define this if you have adjustable CPU frequency */
#define HAVE_ADJUSTABLE_CPU_FREQ
/* Define this if you can detect headphones */
#define HAVE_HEADPHONE_DETECTION
#define BOOTFILE_EXT "ipod"
#define BOOTFILE "rockbox." BOOTFILE_EXT

2
firmware/export/kernel.h
View File

@ -46,6 +46,8 @@
#define SYS_FS_CHANGED ((SYS_EVENT | ((long)9 << 27)))
#define SYS_CHARGER_CONNECTED ((SYS_EVENT | ((long)10 << 27)))
#define SYS_CHARGER_DISCONNECTED ((SYS_EVENT | ((long)11 << 27)))
#define SYS_PHONE_PLUGGED ((SYS_EVENT | ((long)12 << 27)))
#define SYS_PHONE_UNPLUGGED ((SYS_EVENT | ((long)13 << 27)))
struct event
{