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) | |
| download | rockbox-d2c1ece304d0a9eb1a29401ee24b889aea1bff8c.tar.gz rockbox-d2c1ece304d0a9eb1a29401ee24b889aea1bff8c.zip | |
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 @@ | |||
| 22 | #ifndef PCM_RECORD_H | 22 | #ifndef PCM_RECORD_H |
| 23 | #define PCM_RECORD_H | 23 | #define PCM_RECORD_H |
| 24 | 24 | ||
| 25 | /** Warnings **/ | ||
| 26 | /* pcm (dma) buffer has overflowed */ | ||
| 27 | #define PCMREC_W_PCM_BUFFER_OVF 0x00000001 | ||
| 28 | /* encoder output buffer has overflowed */ | ||
| 29 | #define PCMREC_W_ENC_BUFFER_OVF 0x00000002 | ||
| 30 | /** Errors **/ | ||
| 31 | /* failed to load encoder */ | ||
| 32 | #define PCMREC_E_LOAD_ENCODER 0x80001000 | ||
| 33 | /* error originating in encoder */ | ||
| 34 | #define PCMREC_E_ENCODER 0x80002000 | ||
| 35 | /* filename queue has desynced from stream markers */ | ||
| 36 | #define PCMREC_E_FNQ_DESYNC 0x80004000 | ||
| 37 | /* I/O error has occurred */ | ||
| 38 | #define PCMREC_E_IO 0x80008000 | ||
| 39 | #ifdef DEBUG | ||
| 40 | /* encoder has written past end of allocated space */ | ||
| 41 | #define PCMREC_E_CHUNK_OVF 0x80010000 | ||
| 42 | #endif /* DEBUG */ | ||
| 43 | |||
| 25 | /** General functions for high level codec recording **/ | 44 | /** General functions for high level codec recording **/ |
| 26 | /* pcm_rec_error_clear is deprecated for general use. audio_error_clear | 45 | /* pcm_rec_error_clear is deprecated for general use. audio_error_clear |
| 27 | should be used */ | 46 | 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 @@ | |||
| 28 | #define DMA_REC_ERROR_SPDIF (-2) | 28 | #define DMA_REC_ERROR_SPDIF (-2) |
| 29 | #endif | 29 | #endif |
| 30 | 30 | ||
| 31 | /** Warnings **/ | ||
| 32 | /* pcm (dma) buffer has overflowed */ | ||
| 33 | #define PCMREC_W_PCM_BUFFER_OVF 0x00000001 | ||
| 34 | /* encoder output buffer has overflowed */ | ||
| 35 | #define PCMREC_W_ENC_BUFFER_OVF 0x00000002 | ||
| 36 | /** Errors **/ | ||
| 37 | /* failed to load encoder */ | ||
| 38 | #define PCMREC_E_LOAD_ENCODER 0x80001000 | ||
| 39 | /* error originating in encoder */ | ||
| 40 | #define PCMREC_E_ENCODER 0x80002000 | ||
| 41 | /* filename queue has desynced from stream markers */ | ||
| 42 | #define PCMREC_E_FNQ_DESYNC 0x80004000 | ||
| 43 | /* I/O error has occurred */ | ||
| 44 | #define PCMREC_E_IO 0x80008000 | ||
| 45 | #ifdef DEBUG | ||
| 46 | /* encoder has written past end of allocated space */ | ||
| 47 | #define PCMREC_E_CHUNK_OVF 0x80010000 | ||
| 48 | #endif /* DEBUG */ | ||
| 49 | |||
| 50 | /** RAW PCM routines used with playback and recording **/ | 31 | /** RAW PCM routines used with playback and recording **/ |
| 51 | 32 | ||
| 52 | /* Typedef for registered callbacks */ | 33 | /* Typedef for registered callbacks */ |