diff options
Diffstat (limited to 'firmware/export')
-rw-r--r-- | firmware/export/fiiolinux_codec.h | 2 | ||||
-rw-r--r-- | firmware/export/pcm-internal.h | 3 | ||||
-rw-r--r-- | firmware/export/pcm.h | 2 | ||||
-rw-r--r-- | firmware/export/rocker_codec.h | 2 | ||||
-rw-r--r-- | firmware/export/xduoolinux_codec.h | 2 |
5 files changed, 3 insertions, 8 deletions
diff --git a/firmware/export/fiiolinux_codec.h b/firmware/export/fiiolinux_codec.h index 118a0928d7..5fa7ae2b10 100644 --- a/firmware/export/fiiolinux_codec.h +++ b/firmware/export/fiiolinux_codec.h | |||
@@ -7,6 +7,6 @@ AUDIOHW_SETTING(VOLUME, "dB", 0, 1, -100, 0, -30) | |||
7 | AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 4, 0) | 7 | AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 4, 0) |
8 | #endif | 8 | #endif |
9 | 9 | ||
10 | #define AUDIOHW_MUTE_ON_PAUSE | 10 | #define AUDIOHW_MUTE_ON_STOP |
11 | 11 | ||
12 | void audiohw_mute(int mute); | 12 | void audiohw_mute(int mute); |
diff --git a/firmware/export/pcm-internal.h b/firmware/export/pcm-internal.h index 7670f99f04..d5d46c33e1 100644 --- a/firmware/export/pcm-internal.h +++ b/firmware/export/pcm-internal.h | |||
@@ -119,7 +119,6 @@ pcm_play_dma_status_callback(enum pcm_dma_status status) | |||
119 | 119 | ||
120 | #if defined(HAVE_SW_VOLUME_CONTROL) && !defined(PCM_SW_VOLUME_UNBUFFERED) | 120 | #if defined(HAVE_SW_VOLUME_CONTROL) && !defined(PCM_SW_VOLUME_UNBUFFERED) |
121 | void pcm_play_dma_start_int(const void *addr, size_t size); | 121 | void pcm_play_dma_start_int(const void *addr, size_t size); |
122 | void pcm_play_dma_pause_int(bool pause); | ||
123 | void pcm_play_dma_stop_int(void); | 122 | void pcm_play_dma_stop_int(void); |
124 | void pcm_play_stop_int(void); | 123 | void pcm_play_stop_int(void); |
125 | const void *pcm_play_dma_get_peak_buffer_int(int *count); | 124 | const void *pcm_play_dma_get_peak_buffer_int(int *count); |
@@ -139,7 +138,6 @@ void * pcm_dma_addr(void *addr); | |||
139 | #endif | 138 | #endif |
140 | 139 | ||
141 | extern volatile bool pcm_playing; | 140 | extern volatile bool pcm_playing; |
142 | extern volatile bool pcm_paused; | ||
143 | 141 | ||
144 | void pcm_play_dma_lock(void); | 142 | void pcm_play_dma_lock(void); |
145 | void pcm_play_dma_unlock(void); | 143 | void pcm_play_dma_unlock(void); |
@@ -147,7 +145,6 @@ void pcm_play_dma_init(void) INIT_ATTR; | |||
147 | void pcm_play_dma_postinit(void); | 145 | void pcm_play_dma_postinit(void); |
148 | void pcm_play_dma_start(const void *addr, size_t size); | 146 | void pcm_play_dma_start(const void *addr, size_t size); |
149 | void pcm_play_dma_stop(void); | 147 | void pcm_play_dma_stop(void); |
150 | void pcm_play_dma_pause(bool pause); | ||
151 | const void * pcm_play_dma_get_peak_buffer(int *count); | 148 | const void * pcm_play_dma_get_peak_buffer(int *count); |
152 | 149 | ||
153 | void pcm_dma_apply_settings(void); | 150 | void pcm_dma_apply_settings(void); |
diff --git a/firmware/export/pcm.h b/firmware/export/pcm.h index 23c0bd4a0b..61e11ef801 100644 --- a/firmware/export/pcm.h +++ b/firmware/export/pcm.h | |||
@@ -90,8 +90,6 @@ const void* pcm_get_peak_buffer(int* count); | |||
90 | size_t pcm_get_bytes_waiting(void); | 90 | size_t pcm_get_bytes_waiting(void); |
91 | 91 | ||
92 | void pcm_play_stop(void); | 92 | void pcm_play_stop(void); |
93 | void pcm_play_pause(bool play); | ||
94 | bool pcm_is_paused(void); | ||
95 | bool pcm_is_playing(void); | 93 | bool pcm_is_playing(void); |
96 | 94 | ||
97 | #ifdef HAVE_RECORDING | 95 | #ifdef HAVE_RECORDING |
diff --git a/firmware/export/rocker_codec.h b/firmware/export/rocker_codec.h index c1ee7b87bc..9eb4954f0b 100644 --- a/firmware/export/rocker_codec.h +++ b/firmware/export/rocker_codec.h | |||
@@ -5,7 +5,7 @@ | |||
5 | AUDIOHW_SETTING(VOLUME, "dB", 1, 5, -115*10, 0, -30*10) | 5 | AUDIOHW_SETTING(VOLUME, "dB", 1, 5, -115*10, 0, -30*10) |
6 | #endif | 6 | #endif |
7 | 7 | ||
8 | //#define AUDIOHW_MUTE_ON_PAUSE | 8 | //#define AUDIOHW_MUTE_ON_STOP |
9 | //#define AUDIOHW_NEEDS_INITIAL_UNMUTE | 9 | //#define AUDIOHW_NEEDS_INITIAL_UNMUTE |
10 | 10 | ||
11 | /* Note: Due to Kernel bug, we can't use MUTE_ON_PAUSE with backlight fading */ | 11 | /* Note: Due to Kernel bug, we can't use MUTE_ON_PAUSE with backlight fading */ |
diff --git a/firmware/export/xduoolinux_codec.h b/firmware/export/xduoolinux_codec.h index 744be58e30..301a341f15 100644 --- a/firmware/export/xduoolinux_codec.h +++ b/firmware/export/xduoolinux_codec.h | |||
@@ -7,7 +7,7 @@ AUDIOHW_SETTING(FILTER_ROLL_OFF, "", 0, 1, 0, 4, 0) | |||
7 | #endif | 7 | #endif |
8 | 8 | ||
9 | // We want this, but the codec takes over a second to unmute! | 9 | // We want this, but the codec takes over a second to unmute! |
10 | //#define AUDIOHW_MUTE_ON_PAUSE | 10 | //#define AUDIOHW_MUTE_ON_STOP |
11 | 11 | ||
12 | #if defined(XDUOO_X3II) | 12 | #if defined(XDUOO_X3II) |
13 | /* The AK4490 glitches when switching sample rates */ | 13 | /* The AK4490 glitches when switching sample rates */ |