summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorMichael Sevakis <jethead71@rockbox.org>2012-02-20 00:47:21 -0500
committerMichael Sevakis <jethead71@rockbox.org>2012-02-20 00:47:21 -0500
commit5833cc181bfe5c70515617808b7ca38d42f685de (patch)
tree94beb5da8c9b9ba97815f79bde73d3210232f051 /apps
parent9c3ce33d4e583139265e53fb6d0fa9955b8dbf93 (diff)
downloadrockbox-5833cc181bfe5c70515617808b7ca38d42f685de.tar.gz
rockbox-5833cc181bfe5c70515617808b7ca38d42f685de.tar.bz2
rockbox-5833cc181bfe5c70515617808b7ca38d42f685de.zip
pcmbuf minor cleaning
Group functions a bit better and expunge some obsolete function prototypes. Change-Id: Ifaf8a265dbe0a9f081e524b2e646e2dc50c6aa43
Diffstat (limited to 'apps')
-rw-r--r--apps/pcmbuf.c30
-rw-r--r--apps/pcmbuf.h22
2 files changed, 29 insertions, 23 deletions
diff --git a/apps/pcmbuf.c b/apps/pcmbuf.c
index aa30c64912..55a364b1be 100644
--- a/apps/pcmbuf.c
+++ b/apps/pcmbuf.c
@@ -1275,6 +1275,23 @@ void pcmbuf_soft_mode(bool shhh)
}
+/** Time and position */
+
+/* Return the current position key value */
+unsigned int pcmbuf_get_position_key(void)
+{
+ return position_key;
+}
+
+/* Set position updates to be synchronous and immediate in addition to during
+ PCM frames - cancelled upon first codec insert or upon stopping */
+void pcmbuf_sync_position_update(void)
+{
+ pcmbuf_sync_position = true;
+}
+
+
+
/** Misc */
bool pcmbuf_is_lowdata(void)
@@ -1291,16 +1308,3 @@ void pcmbuf_set_low_latency(bool state)
{
low_latency_mode = state;
}
-
-/* Return the current position key value */
-unsigned int pcmbuf_get_position_key(void)
-{
- return position_key;
-}
-
-/* Set position updates to be synchronous and immediate in addition to during
- PCM frames - cancelled upon first codec insert or upon stopping */
-void pcmbuf_sync_position_update(void)
-{
- pcmbuf_sync_position = true;
-}
diff --git a/apps/pcmbuf.h b/apps/pcmbuf.h
index 3261b20b35..9010fcc64d 100644
--- a/apps/pcmbuf.h
+++ b/apps/pcmbuf.h
@@ -34,8 +34,8 @@ size_t pcmbuf_init(unsigned char *bufend);
void pcmbuf_play_start(void);
void pcmbuf_play_stop(void);
void pcmbuf_pause(bool pause);
-void pcmbuf_monitor_track_change(bool monitor);
-void pcmbuf_sync_position_update(void);
+
+/* Track change */
/* Track change origin type */
enum pcm_track_change_type
@@ -45,6 +45,7 @@ enum pcm_track_change_type
TRACK_CHANGE_AUTO, /* Automatic change (from codec) */
TRACK_CHANGE_END_OF_DATA, /* Expect no more data (from codec) */
};
+void pcmbuf_monitor_track_change(bool monitor);
void pcmbuf_start_track_change(enum pcm_track_change_type type);
/* Crossfade */
@@ -62,22 +63,23 @@ static FORCE_INLINE bool pcmbuf_is_same_size(void)
{ return true; }
#endif
-/* Voice */
-void *pcmbuf_request_voice_buffer(int *count);
-void pcmbuf_write_voice_complete(int count);
-
/* Debug menu, other metrics */
size_t pcmbuf_free(void);
size_t pcmbuf_get_bufsize(void);
-int pcmbuf_descs(void);
int pcmbuf_used_descs(void);
-unsigned int pcmbuf_get_position_key(void);
+int pcmbuf_descs(void);
-/* Misc */
+/* Fading and channel volume control */
void pcmbuf_fade(bool fade, bool in);
bool pcmbuf_fading(void);
void pcmbuf_soft_mode(bool shhh);
+
+/* Time and position */
+unsigned int pcmbuf_get_position_key(void);
+void pcmbuf_sync_position_update(void);
+
+/* Misc */
bool pcmbuf_is_lowdata(void);
void pcmbuf_set_low_latency(bool state);
-#endif
+#endif /* PCMBUF_H */