ShuriZma
/
flycast
mirror of https://github.com/flyinghead/flycast.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Addressed review points 

-cleanup vmu that gets replaced by the mic
-got rid of confusing old commented code
-stopped big memory leak if mic data was not getting read but it was
recording
This commit is contained in:
Bryan Barnes 2014-02-02 21:40:18 -05:00
parent 6df7f8912c
commit f571b187b0
2 changed files with 4 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
shell/android/jni/src/Android.cpp
View File

@ -14,6 +14,7 @@
#include "cfg/cfg.h" #include "cfg/cfg.h"
#include "rend/TexCache.h" #include "rend/TexCache.h"
#include "hw/maple/maple_devs.h" #include "hw/maple/maple_devs.h"
#include "hw/maple/maple_if.h"
#include "util.h" #include "util.h"
@ -214,6 +215,7 @@ JNIEXPORT void JNICALL Java_com_reicast_emulator_JNIdc_setupMic(JNIEnv *env,jobj
{ {
sipemu = env->NewGlobalRef(sip); sipemu = env->NewGlobalRef(sip);
getmicdata = env->GetMethodID(env->GetObjectClass(sipemu),"getData","()[B"); getmicdata = env->GetMethodID(env->GetObjectClass(sipemu),"getData","()[B");
delete MapleDevices[0][1];
mcfg_Create(MDT_Microphone,0,1); mcfg_Create(MDT_Microphone,0,1);
} }

18
shell/android/src/com/reicast/emulator/SipEmulator.java
View File

@ -1,6 +1,5 @@
package com.reicast.emulator; package com.reicast.emulator;
import java.util.LinkedList;
import java.util.concurrent.ConcurrentLinkedQueue; import java.util.concurrent.ConcurrentLinkedQueue;
import android.media.AudioFormat; import android.media.AudioFormat;
@ -37,7 +36,6 @@ public class SipEmulator extends Thread {
init(); init();
} }
private void init(){ private void init(){
@ -55,7 +53,6 @@ public class SipEmulator extends Thread {
continueRecording = false; continueRecording = false;
firstGet = true; firstGet = true;
} }
public void startRecording(){ public void startRecording(){
Log.d(TAG, "SipEmulator startRecording called"); Log.d(TAG, "SipEmulator startRecording called");
@ -97,26 +94,15 @@ public class SipEmulator extends Thread {
public void run() { public void run() {
Log.d(TAG, "recordThread starting"); Log.d(TAG, "recordThread starting");
//sleep to let some data come in
// try {
// Thread.sleep(TIME_TO_WAIT_BETWEEN_POLLS);
// } catch (InterruptedException e) {
// e.printStackTrace();
// }
while(continueRecording){ while(continueRecording){
byte[] freshData = new byte[ONE_BLIP_SIZE]; byte[] freshData = new byte[ONE_BLIP_SIZE];
// read blocks // read blocks
int bytesRead = record.read(freshData, 0, ONE_BLIP_SIZE); int bytesRead = record.read(freshData, 0, ONE_BLIP_SIZE);
//Log.d(TAG, "recordThread recorded: "+bytesRead); //Log.d(TAG, "recordThread recorded: "+bytesRead);
bytesReadBuffer.add(freshData); if(!firstGet){
/* bytesReadBuffer.add(freshData);
try {
Thread.sleep(TIME_TO_WAIT_BETWEEN_POLLS);
} catch (InterruptedException e) {
e.printStackTrace();
} }
*/
} }
} }