diff options
Diffstat (limited to 'firmware/target/hosted/android')
-rw-r--r-- | firmware/target/hosted/android/pcm-android.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/firmware/target/hosted/android/pcm-android.c b/firmware/target/hosted/android/pcm-android.c index 7a0f28634e..0428e5f541 100644 --- a/firmware/target/hosted/android/pcm-android.c +++ b/firmware/target/hosted/android/pcm-android.c | |||
@@ -31,8 +31,8 @@ | |||
31 | extern JNIEnv *env_ptr; | 31 | extern JNIEnv *env_ptr; |
32 | 32 | ||
33 | /* infos about our pcm chunks */ | 33 | /* infos about our pcm chunks */ |
34 | static const void *pcm_data_start; | ||
34 | static size_t pcm_data_size; | 35 | static size_t pcm_data_size; |
35 | static char *pcm_data_start; | ||
36 | static int audio_locked = 0; | 36 | static int audio_locked = 0; |
37 | static pthread_mutex_t audio_lock_mutex = PTHREAD_MUTEX_INITIALIZER; | 37 | static pthread_mutex_t audio_lock_mutex = PTHREAD_MUTEX_INITIALIZER; |
38 | 38 | ||
@@ -81,7 +81,7 @@ Java_org_rockbox_RockboxPCM_nativeWrite(JNIEnv *env, jobject this, | |||
81 | if (!pcm_data_size) /* get some initial data */ | 81 | if (!pcm_data_size) /* get some initial data */ |
82 | { | 82 | { |
83 | new_buffer = pcm_play_dma_complete_callback(PCM_DMAST_OK, | 83 | new_buffer = pcm_play_dma_complete_callback(PCM_DMAST_OK, |
84 | (const void**)&pcm_data_start, &pcm_data_size); | 84 | &pcm_data_start, &pcm_data_size); |
85 | } | 85 | } |
86 | 86 | ||
87 | while(left > 0 && pcm_data_size) | 87 | while(left > 0 && pcm_data_size) |
@@ -115,7 +115,7 @@ Java_org_rockbox_RockboxPCM_nativeWrite(JNIEnv *env, jobject this, | |||
115 | if (pcm_data_size == 0) /* need new data */ | 115 | if (pcm_data_size == 0) /* need new data */ |
116 | { | 116 | { |
117 | new_buffer = pcm_play_dma_complete_callback(PCM_DMAST_OK, | 117 | new_buffer = pcm_play_dma_complete_callback(PCM_DMAST_OK, |
118 | (const void**)&pcm_data_start, &pcm_data_size); | 118 | &pcm_data_start, &pcm_data_size); |
119 | } | 119 | } |
120 | else /* increment data pointer and feed more */ | 120 | else /* increment data pointer and feed more */ |
121 | pcm_data_start += transfer_size; | 121 | pcm_data_start += transfer_size; |
@@ -146,7 +146,7 @@ void pcm_dma_apply_settings(void) | |||
146 | 146 | ||
147 | void pcm_play_dma_start(const void *addr, size_t size) | 147 | void pcm_play_dma_start(const void *addr, size_t size) |
148 | { | 148 | { |
149 | pcm_data_start = (char*)addr; | 149 | pcm_data_start = addr; |
150 | pcm_data_size = size; | 150 | pcm_data_size = size; |
151 | 151 | ||
152 | pcm_play_dma_pause(false); | 152 | pcm_play_dma_pause(false); |