diff options
| -rw-r--r-- | apps/gui/statusbar.c | 1 | ||||
| -rw-r--r-- | apps/recorder/pcm_record.h | 24 | ||||
| -rw-r--r-- | firmware/drivers/tuner/s1a0903x01.c | 1 | ||||
| -rw-r--r-- | firmware/export/pcm.h | 24 |
4 files changed, 26 insertions, 24 deletions
diff --git a/apps/gui/statusbar.c b/apps/gui/statusbar.c index b50ca3b9fb..1e42a6ef93 100644 --- a/apps/gui/statusbar.c +++ b/apps/gui/statusbar.c @@ -37,6 +37,7 @@ #ifdef HAVE_RECORDING #include "audio.h" #include "recording.h" +#include "pcm_record.h" #endif /* FIXME: should be removed from icon.h to avoid redefinition, diff --git a/apps/recorder/pcm_record.h b/apps/recorder/pcm_record.h index f805313fe5..f29d0a5da8 100644 --- a/apps/recorder/pcm_record.h +++ b/apps/recorder/pcm_record.h @@ -22,30 +22,6 @@ #ifndef PCM_RECORD_H #define PCM_RECORD_H -#define DMA_REC_ERROR_DMA (-1) -#ifdef HAVE_SPDIF_REC -#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 allotted 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/drivers/tuner/s1a0903x01.c b/firmware/drivers/tuner/s1a0903x01.c index f6442b269f..d2d9de8cfe 100644 --- a/firmware/drivers/tuner/s1a0903x01.c +++ b/firmware/drivers/tuner/s1a0903x01.c @@ -27,6 +27,7 @@ #include "tuner.h" /* tuner abstraction interface */ #include "fmradio.h" /* physical interface driver */ #include "sound.h" +#include "mas.h" #define DEFAULT_IN1 0x100003 /* Mute */ #define DEFAULT_IN2 0x140884 /* 5kHz, 7.2MHz crystal */ diff --git a/firmware/export/pcm.h b/firmware/export/pcm.h index 97a1939dbb..1660f0670d 100644 --- a/firmware/export/pcm.h +++ b/firmware/export/pcm.h @@ -23,6 +23,30 @@ #include <sys/types.h> +#define DMA_REC_ERROR_DMA (-1) +#ifdef HAVE_SPDIF_REC +#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 allotted space */ +#define PCMREC_E_CHUNK_OVF 0x80010000 +#endif /* DEBUG */ + /** RAW PCM routines used with playback and recording **/ /* Typedef for registered callback */ |