devs/foxbox
1
0
Fork 0
forked from len0rd/rockbox
Code Pull requests Activity

Tiny bit of code policing: remove unneeded variable and spaces at end-of-line.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@15356 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Steve Bavin 2007-10-29 13:55:34 +00:00
parent 1f415e2fe3
commit 7707f7fac9
1 changed files with 47 additions and 47 deletions
Download patch file Download diff file Expand all files Collapse all files

14
apps/playback.c
View file

@ -1746,14 +1746,16 @@ static void codec_discard_codec_callback(void)
} }
} }
static inline void codec_gapless_track_change(void) { static inline void codec_gapless_track_change(void)
{
/* callback keeps the progress bar moving while the pcmbuf empties */ /* callback keeps the progress bar moving while the pcmbuf empties */
pcmbuf_set_position_callback(codec_pcmbuf_position_callback); pcmbuf_set_position_callback(codec_pcmbuf_position_callback);
/* set the pcmbuf callback for when the track really changes */ /* set the pcmbuf callback for when the track really changes */
pcmbuf_set_event_handler(codec_pcmbuf_track_changed_callback); pcmbuf_set_event_handler(codec_pcmbuf_track_changed_callback);
} }
static inline void codec_crossfade_track_change(void) { static inline void codec_crossfade_track_change(void)
{
/* Initiate automatic crossfade mode */ /* Initiate automatic crossfade mode */
pcmbuf_crossfade_init(false); pcmbuf_crossfade_init(false);
/* Notify the wps that the track change starts now */ /* Notify the wps that the track change starts now */
@ -1762,8 +1764,6 @@ static inline void codec_crossfade_track_change(void) {
static void codec_track_skip_done(bool was_manual) static void codec_track_skip_done(bool was_manual)
{ {
int crossfade_mode = global_settings.crossfade;
/* Manual track change (always crossfade or flush audio). */ /* Manual track change (always crossfade or flush audio). */
if (was_manual) if (was_manual)
{ {
@ -1773,9 +1773,9 @@ static void codec_track_skip_done(bool was_manual)
} }
/* Automatic track change w/crossfade, if not in "Track Skip Only" mode. */ /* Automatic track change w/crossfade, if not in "Track Skip Only" mode. */
else if (pcmbuf_is_crossfade_enabled() && !pcmbuf_is_crossfade_active() else if (pcmbuf_is_crossfade_enabled() && !pcmbuf_is_crossfade_active()
&& crossfade_mode != CROSSFADE_ENABLE_TRACKSKIP) && global_settings.crossfade != CROSSFADE_ENABLE_TRACKSKIP)
{ {
if (crossfade_mode == CROSSFADE_ENABLE_SHUFFLE_AND_TRACKSKIP) if (global_settings.crossfade == CROSSFADE_ENABLE_SHUFFLE_AND_TRACKSKIP)
{ {
if (global_settings.playlist_shuffle) if (global_settings.playlist_shuffle)
/* shuffle mode is on, so crossfade: */ /* shuffle mode is on, so crossfade: */
@ -2029,7 +2029,7 @@ static void codec_thread(void)
LOGFQUEUE("codec > codec Q_CODEC_LOAD"); LOGFQUEUE("codec > codec Q_CODEC_LOAD");
queue_post(&codec_queue, Q_CODEC_LOAD, 0); queue_post(&codec_queue, Q_CODEC_LOAD, 0);
} }
else else if (curtrack_id3.codectype != 0) /* Sucky workaround */
{ {
const char *codec_fn = const char *codec_fn =
get_codec_filename(curtrack_id3.codectype); get_codec_filename(curtrack_id3.codectype);