Thank you to anyone who has already donated - your generous donations helped make three months of treatment possible.
My brother Nate continues to fight stage IV Hodgkin's lymphoma. He's just 31, with a wife and baby girl. They have no active income (since he's been unable to return to work), no insurance, and cannot afford the treatment he needs. Nate and his family need your help. Please consider a donation, every dollar helps. Thanks.
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 136 137 138 139 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 172 173 174 175 176 177 178 179 180 181 182 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 200 201 202 |
diff --git a/android/src/org/rockbox/Helper/MediaButtonReceiver.java b/android/src/org/rockbox/Helper/MediaButtonReceiver.java index eebdbb9..9a7ab31 100644 public class MediaButtonReceiver RockboxService s = RockboxService.get_instance(); if (s == null || !s.isRockboxRunning()) startService(context, intent); - else if (RockboxFramebuffer.buttonHandler(key.getKeyCode(), false)) - abortBroadcast(); + else + RockboxFramebuffer.buttonHandler(key.getKeyCode(), false); + abortBroadcast(); } } } diff --git a/android/src/org/rockbox/RockboxPCM.java b/android/src/org/rockbox/RockboxPCM.java index 47bc42f..d9150e7 100644 package org.rockbox; import java.util.Arrays; - import android.content.BroadcastReceiver; import android.content.Context; import android.content.Intent; import android.util.Log; public class RockboxPCM extends AudioTrack { - private byte[] raw_data; - private PCMListener l; - private HandlerThread ht; - private Handler h = null; private static final int streamtype = AudioManager.STREAM_MUSIC; private static final int samplerate = 44100; /* should be CHANNEL_OUT_STEREO in 2.0 and above */ public class RockboxPCM extends AudioTrack AudioFormat.CHANNEL_CONFIGURATION_STEREO; private static final int encoding = AudioFormat.ENCODING_PCM_16BIT; - /* 24k is plenty, but some devices may have a higher minimum */ + /* 32k is plenty, but some devices may have a higher minimum */ private static final int buf_len = - Math.max(24<<10, getMinBufferSize(samplerate, channels, encoding)); + Math.max(32<<10, 2*getMinBufferSize(samplerate, channels, encoding)); + private PCMListener l; + private HandlerThread ht; + private Handler h = null; private AudioManager audiomanager; + private RockboxService rbservice; + private byte[] raw_data; + + private int refillmark; private int maxstreamvolume; private int setstreamvolume = -1; private float minpcmvolume; + private float curpcmvolume = 0; private float pcmrange; - private RockboxService rbservice; private void LOG(CharSequence text) { public class RockboxPCM extends AudioTrack ht = new HandlerThread("audio thread", Process.THREAD_PRIORITY_URGENT_AUDIO); ht.start(); + /* getLooper() returns null if thread isn't running */ + while(!ht.isAlive()) + Thread.yield(); + h = new Handler(ht.getLooper()); raw_data = new byte[buf_len]; /* in shorts */ Arrays.fill(raw_data, (byte) 0); - l = new PCMListener(buf_len); /* find cleaner way to get context? */ rbservice = RockboxService.get_instance(); public class RockboxPCM extends AudioTrack setupVolumeHandler(); postVolume(audiomanager.getStreamVolume(streamtype)); + refillmark = buf_len / 2; + l = new PCMListener(buf_len - refillmark); + refillmark = bytes2frames(refillmark); } private native void postVolumeChangedEvent(int volume); public class RockboxPCM extends AudioTrack { if (getState() == AudioTrack.STATE_INITIALIZED) { - if (h == null) - h = new Handler(ht.getLooper()); - if (setNotificationMarkerPosition(bytes2frames(buf_len)/4) + if (setNotificationMarkerPosition(refillmark) != AudioTrack.SUCCESS) LOG("setNotificationMarkerPosition Error"); else setPlaybackPositionUpdateListener(l, h); } - /* need to fill with silence before starting playback */ - write(raw_data, frames2bytes(getPlaybackHeadPosition()), - raw_data.length); + /* need to fill with silence before starting playback */ + write(raw_data, 0, raw_data.length); } play(); } } @Override - public void stop() throws IllegalStateException + public synchronized void stop() throws IllegalStateException { + /* flush pending data, but turn the volume off so it cannot be heard. + * This is so that we don't hear old data if music is resumed very + * quickly after (e.g. when seeking). + */ + float old_vol = curpcmvolume; try { + setStereoVolume(0, 0); + flush(); super.stop(); } catch (IllegalStateException e) { throw new IllegalStateException(e); + } finally { + setStereoVolume(old_vol, old_vol); } + Intent widgetUpdate = new Intent("org.rockbox.UpdateState"); widgetUpdate.putExtra("state", "stop"); RockboxService.get_instance().sendBroadcast(widgetUpdate); RockboxService.get_instance().stopForeground(); } + + public int setStereoVolume(float leftVolume, float rightVolume) + { + curpcmvolume = leftVolume; + return super.setStereoVolume(leftVolume, rightVolume); + } private void set_volume(int volume) { public class RockboxPCM extends AudioTrack private class PCMListener implements OnPlaybackPositionUpdateListener { - private int max_len; - private int refill_mark; private byte[] buf; - public PCMListener(int len) + public PCMListener(int refill_bufsize) { - max_len = len; - /* refill to 100% when reached the 25% */ - buf = new byte[max_len*3/4]; - refill_mark = max_len - buf.length; + buf = new byte[refill_bufsize]; } public void onMarkerReached(AudioTrack track) public class RockboxPCM extends AudioTrack int result = -1; pcm.pcmSamplesToByteArray(buf); result = track.write(buf, 0, buf.length); - if (result >= 0) - { - switch(track.getPlayState()) - { - case AudioTrack.PLAYSTATE_PLAYING: - case AudioTrack.PLAYSTATE_PAUSED: - /* refill at 25% no matter of how many - * bytes we've written */ - if (setNotificationMarkerPosition( - bytes2frames(refill_mark)) - != AudioTrack.SUCCESS) - { - LOG("Error in onMarkerReached: " + - "Could not set notification marker"); - } - else /* recharge */ - setPlaybackPositionUpdateListener(this, h); - break; - case AudioTrack.PLAYSTATE_STOPPED: - LOG("State STOPPED"); - break; - } - } - else + if (result < 0) { LOG("Error in onMarkerReached (result="+result+")"); stop(); } + else /* recharge */ + setNotificationMarkerPosition(refillmark); } public void onPeriodicNotification(AudioTrack track) |
