diff options
| author | Michael Sevakis <jethead71@rockbox.org> | 2011-12-08 21:45:53 +0000 |
|---|---|---|
| committer | Michael Sevakis <jethead71@rockbox.org> | 2011-12-08 21:45:53 +0000 |
| commit | d2c1ece304d0a9eb1a29401ee24b889aea1bff8c (patch) | |
| tree | 905f2e3a2b076200fda4033a2d5f9c1daffc8038 | |
| parent | 5af1e2f5313458469dca17b580be29cb2e8158c7 (diff) | |
Move the PCMREC_E/W_* defines back to pcm_record.h because they're part of the recording engine interface. Leave the low-level DMA error defines in pcm.h.
git-svn-id: svn://svn.rockbox.org/rockbox/trunk@31184 a1c6a512-1295-4272-9138-f99709370657
| -rw-r--r-- | apps/recorder/pcm_record.h | 19 | ||||
| -rw-r--r-- | firmware/export/pcm.h | 19 |
2 files changed, 19 insertions, 19 deletions
diff --git a/apps/recorder/pcm_record.h b/apps/recorder/pcm_record.h index f29d0a5da8..3d9bb4c379 100644 --- a/apps/recorder/pcm_record.h +++ b/apps/recorder/pcm_record.h @@ -22,6 +22,25 @@ #ifndef PCM_RECORD_H #define PCM_RECORD_H +/** Warnings **/ +/* pcm (dma) buffer has overflowed */ +#define PCMREC_W_PCM_BUFFER_OVF 0x00000001 +/* encoder output buffer has overflowed */ +#define PCMREC_W_ENC_BUFFER_OVF 0x00000002 +/** Errors **/ +/* failed to load encoder */ +#define PCMREC_E_LOAD_ENCODER 0x80001000 +/* error originating in encoder */ +#define PCMREC_E_ENCODER 0x80002000 +/* filename queue has desynced from stream markers */ +#define PCMREC_E_FNQ_DESYNC 0x80004000 +/* I/O error has occurred */ +#define PCMREC_E_IO 0x80008000 +#ifdef DEBUG +/* encoder has written past end of allocated space */ +#define PCMREC_E_CHUNK_OVF 0x80010000 +#endif /* DEBUG */ + /** General functions for high level codec recording **/ /* pcm_rec_error_clear is deprecated for general use. audio_error_clear should be used */ diff --git a/firmware/export/pcm.h b/firmware/export/pcm.h index fb6581b119..40d5afc0ba 100644 --- a/firmware/export/pcm.h +++ b/firmware/export/pcm.h @@ -28,25 +28,6 @@ #define DMA_REC_ERROR_SPDIF (-2) #endif -/** Warnings **/ -/* pcm (dma) buffer has overflowed */ -#define PCMREC_W_PCM_BUFFER_OVF 0x00000001 -/* encoder output buffer has overflowed */ -#define PCMREC_W_ENC_BUFFER_OVF 0x00000002 -/** Errors **/ -/* failed to load encoder */ -#define PCMREC_E_LOAD_ENCODER 0x80001000 -/* error originating in encoder */ -#define PCMREC_E_ENCODER 0x80002000 -/* filename queue has desynced from stream markers */ -#define PCMREC_E_FNQ_DESYNC 0x80004000 -/* I/O error has occurred */ -#define PCMREC_E_IO 0x80008000 -#ifdef DEBUG -/* encoder has written past end of allocated space */ -#define PCMREC_E_CHUNK_OVF 0x80010000 -#endif /* DEBUG */ - /** RAW PCM routines used with playback and recording **/ /* Typedef for registered callbacks */ |