bitPickups/android-audio-recorder
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'audiorecorder-1.1.9'

Browse source
This commit is contained in:
Alexey Kuznetsov 2016-03-26 19:20:33 +03:00
commit b9926a3696
3 changed files with 11 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
app/build.gradle
View file

@ -8,8 +8,8 @@ android {
applicationId "com.github.axet.audiorecorder"
minSdkVersion 16
targetSdkVersion 23
versionCode 29
versionName "1.1.8"
versionCode 30
versionName "1.1.9"
}
signingConfigs {
release {

2
app/src/main/java/com/github/axet/audiorecorder/activities/RecordingActivity.java
View file

@ -461,7 +461,7 @@ public class RecordingActivity extends AppCompatActivity {
return;
RawSamples rs = new RawSamples(storage.getTempRecording());
rs.trunk(editSample);
rs.trunk(editSample + 1);
rs.close();
edit(false);
loadSamples();

12
app/src/main/java/com/github/axet/audiorecorder/widgets/PitchView.java
View file

@ -167,7 +167,7 @@ public class PitchView extends ViewGroup {
Paint p = paint;
if (edit != null && i >= editPos)
if ((edit != null || play != null) && i >= editPos)
p = cutColor;
// left channel pitch
@ -176,12 +176,12 @@ public class PitchView extends ViewGroup {
canvas.drawLine(x, mid, x, mid + mid * right + 1, p);
}
if (edit != null && editFlash) {
if ((edit != null || play != null) && editFlash) {
float x = editPos * pitchSize + pitchSize / 2f;
canvas.drawLine(x, 0, x, getHeight(), editPaint);
}
if (edit != null && playPos > 0) {
if (play != null && playPos > 0) {
float x = playPos * pitchSize + pitchSize / 2f;
canvas.drawLine(x, 0, x, getHeight(), playPaint);
}
@ -491,7 +491,7 @@ public class PitchView extends ViewGroup {
if (stableCount > 20) {
stableRefresh = true;
}
stableCount ++;
stableCount++;
}
if (delay > 0)
@ -519,11 +519,15 @@ public class PitchView extends ViewGroup {
handler.removeCallbacks(play);
play = null;
}
if (edit == null) {
edit();
}
return;
}
if (edit != null)
handler.removeCallbacks(edit);
edit = null;
if (draw != null)
handler.removeCallbacks(draw);