len0rd/rockbox
1
0
Fork 1
mirror of https://github.com/Rockbox/rockbox.git synced 2025-10-13 18:17:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Get rid of a committed #define from kernel.h that didn't make the final cut. Put voice_wait in voice_thread.h where it ought.

Browse source 
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@29787 a1c6a512-1295-4272-9138-f99709370657
This commit is contained in:
Michael Sevakis 2011-04-27 04:00:48 +00:00
parent a089b00ea0
commit 82e97363f1
4 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

3
apps/misc.c
View file

@ -83,6 +83,9 @@
#include "bookmark.h" #include "bookmark.h"
#include "wps.h" #include "wps.h"
#include "playback.h" #include "playback.h"
#if CONFIG_CODEC == SWCODEC
#include "voice_thread.h"
#endif
#ifdef BOOTFILE #ifdef BOOTFILE
#if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF) \ #if !defined(USB_NONE) && !defined(USB_HANDLED_BY_OF) \

1
apps/playback.h
View file

@ -70,7 +70,6 @@ struct bufopen_bitmap_data {
#endif #endif
/* Functions */ /* Functions */
void voice_wait(void);
bool audio_is_thread_ready(void); bool audio_is_thread_ready(void);
int audio_track_count(void); int audio_track_count(void);
long audio_filebufused(void); long audio_filebufused(void);

1
apps/voice_thread.h
View file

@ -27,6 +27,7 @@ void mp3_play_stop(void);
void mp3_play_pause(bool play); void mp3_play_pause(bool play);
bool mp3_is_playing(void); bool mp3_is_playing(void);
void voice_wait(void);
void voice_stop(void); void voice_stop(void);
void voice_thread_init(void); void voice_thread_init(void);
void voice_thread_resume(void); void voice_thread_resume(void);

1
firmware/export/kernel.h
View file

@ -86,7 +86,6 @@
#define SYS_VOLUME_CHANGED MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 5) #define SYS_VOLUME_CHANGED MAKE_SYS_EVENT(SYS_EVENT_CLS_MISC, 5)
#define IS_SYSEVENT(ev) ((ev & SYS_EVENT) == SYS_EVENT) #define IS_SYSEVENT(ev) ((ev & SYS_EVENT) == SYS_EVENT)
#define EVENT_RESERVED (~0)
#ifndef TIMEOUT_BLOCK #ifndef TIMEOUT_BLOCK
#define TIMEOUT_BLOCK -1 #define TIMEOUT_BLOCK -1