Merge branch 'master' of github.com:haxenme/NME

git-svn-id: https://nekonme.googlecode.com/svn/trunk@2172 1509560c-5e2a-0410-865c-31c25e1cfdef

Author: jgranick

neash/media/SoundChannel.hx

@@ -56,26 +56,28 @@ class SoundChannel extends EventDispatcher
 {
 if (nmeHandle != null )
 {
- if (nmeDataProvider!=null && nme_sound_channel_needs_data(nmeHandle))
- {
- var request = new SampleDataEvent(SampleDataEvent.SAMPLE_DATA);
- request.position = nme_sound_channel_get_data_position(nmeHandle);
- nmeDataProvider.dispatchEvent(request);
- if (request.data.length > 0)
- nme_sound_channel_add_data(nmeHandle,request.data);
- }
+if (nmeDataProvider!=null && nme_sound_channel_needs_data(nmeHandle))
+{
+var request = new SampleDataEvent(SampleDataEvent.SAMPLE_DATA);
+request.position = nme_sound_channel_get_data_position(nmeHandle);
+nmeDataProvider.dispatchEvent(request);
+if (request.data.length > 0) {
+nme_sound_channel_add_data(nmeHandle,request.data);
+}
+}
 
- if (nme_sound_channel_is_complete(nmeHandle))
- {
- nmeHandle = null;
- if (nmeDataProvider!=null)
- nmeDynamicSoundCount--;
- var complete = new Event(Event.SOUND_COMPLETE);
- dispatchEvent(complete);
- return true;
- }
+if (nme_sound_channel_is_complete(nmeHandle))
+{
+nmeHandle = null;
+if (nmeDataProvider!=null) {
+nmeDynamicSoundCount--;
+}
+var complete = new Event(Event.SOUND_COMPLETE);
+dispatchEvent(complete);
+return true;
+}
 }
-
+
 return false;
 }
 
@@ -108,6 +110,7 @@ class SoundChannel extends EventDispatcher
 public function stop()
 { 
 nme_sound_channel_stop(nmeHandle);
+nmeHandle = null;
 }
 
 

project/android/AndroidSound.cpp

@@ -1,5 +1,6 @@
 #include <Sound.h>
 #include <Display.h>
+#include <Utils.h>
 #include <jni.h>
 
 #include <android/log.h>
@@ -23,15 +24,15 @@ namespace nme
 	JNIEnv *env = GetEnv();
 mStreamID = -1;
 mSound = inSound;
+mSoundHandle = inHandle;
+mLoop = (loops < 1) ? 1 : loops;
 inSound->IncRef();
-if (inHandle>=0)
+if (inHandle >= 0)
 {
 	jclass cls = env->FindClass("org/haxe/nme/Sound");
 	jmethodID mid = env->GetStaticMethodID(cls, "playSound", "(IDDI)I");
- if (mid > 0)
-	{
-// LOGV("Android Sound Channel found play method");
-mStreamID = env->CallStaticIntMethod(cls, mid, inHandle, inTransform.volume*((1-inTransform.pan)/2), inTransform.volume*((inTransform.pan+1)/2), loops );
+ if (mid > 0) {
+mStreamID = env->CallStaticIntMethod(cls, mid, inHandle, inTransform.volume*((1-inTransform.pan)/2), inTransform.volume*((inTransform.pan+1)/2), mLoop );
 	}
 }
  }
@@ -43,7 +44,12 @@ namespace nme
 
 bool isComplete()
 {
-return true;
+JNIEnv *env = GetEnv();
+	jclass cls = env->FindClass("org/haxe/nme/Sound");
+	jmethodID mid = env->GetStaticMethodID(cls, "getSoundComplete", "(III)Z");
+ if (mid > 0) {
+return env->CallStaticIntMethod(cls, mid, mSoundHandle, mStreamID, mLoop);
+	}
 }
 
 double getLeft()
@@ -58,6 +64,12 @@ namespace nme
 
 double getPosition()
 {
+JNIEnv *env = GetEnv();
+	jclass cls = env->FindClass("org/haxe/nme/Sound");
+	jmethodID mid = env->GetStaticMethodID(cls, "getSoundPosition", "(II)I");
+ if (mid > 0) {
+return env->CallStaticIntMethod(cls, mid, mSoundHandle, mStreamID, mLoop);
+	}
 }
 
 void stop()
@@ -79,6 +91,8 @@ namespace nme
 
 Object *mSound;
 int mStreamID;
+int mSoundHandle;
+int mLoop;
 };
 
 SoundChannel *SoundChannel::Create(const ByteArray &inBytes,const SoundTransform &inTransform)
@@ -207,7 +221,6 @@ namespace nme
 mMode = MODE_UNKNOWN;
 handleID = -1;
 mLength = 0;
-mManagerID = getSoundPoolID();
 mSoundPath = inPath;
 
 jclass cls = env->FindClass("org/haxe/nme/Sound");
@@ -282,29 +295,11 @@ namespace nme
 
  void close() { }
 
-int getSoundPoolID()
-{
-JNIEnv *env = GetEnv();
-jclass cls = env->FindClass("org/haxe/nme/Sound");
-jmethodID mid = env->GetStaticMethodID(cls, "getSoundPoolID", "()I");
-if (mid > 0) {
-return env->CallStaticIntMethod(cls, mid);
-}
-return 0;
-}
-
 SoundChannel *openChannel(double startTime, int loops, const SoundTransform &inTransform)
 {
 switch (mMode) {
 case MODE_SOUND_ID:
-{
-int mid = getSoundPoolID();
-if (mid != mManagerID) {
-mManagerID = mid;
-reloadSound();
-}
-return new AndroidSoundChannel(this, handleID, startTime, loops, inTransform);
-}
+return new AndroidSoundChannel(this, handleID, startTime, loops, inTransform);
 break;
 case MODE_MUSIC_PATH:
 default:
@@ -315,7 +310,7 @@ namespace nme
 
 int handleID;
 int mLength;
-int mManagerID;
+// int mManagerID;
 std::string mSoundPath;
 SoundMode mMode;
 };

samples/19-AndroidJNI/gen/org/haxe/nme/GameActivity.hx

@@ -43,14 +43,6 @@ class GameActivity extends android.app.Activity
  return nme.JNI.callStatic(_getMusicHandle_func,[arg0]);
  }
 
- static var _getSoundPoolID_func:Dynamic;
- public static function getSoundPoolID() : Dynamic
- {
- if (_getSoundPoolID_func==null)
- _getSoundPoolID_func=nme.JNI.createStaticMethod("org.haxe.nme.Sound","getSoundPoolID","()I");
- return nme.JNI.callStatic(_getSoundPoolID_func,[]);
- }
-
  static var _getContext_func:Dynamic;
  public static function getContext() : Dynamic
  {

templates/default/android/template/src/org/haxe/nme/MainView.java

@@ -356,6 +356,7 @@ private static class Renderer implements GLSurfaceView.Renderer {
  public void onDrawFrame(GL10 gl) {
  //Log.v("VIEW","onDrawFrame !");
  mMainView.HandleResult( NME.onRender() );
+ Sound.checkSoundCompletion();
  //Log.v("VIEW","onDrawFrame DONE!");
  }