added a prefernces screen to handle media card selection on Android devices. Contains actual fix for 4297.
Added a place marker to allow volume change during app. Right now it's either loud or off. There isn't a way to allow the volume to gradually go up and odwn based on the values set in settings.
This commit is contained in:
@@ -126,6 +126,7 @@ class JGE
|
||||
#endif
|
||||
|
||||
#if defined (ANDROID)
|
||||
JavaVM * mJavaVM;
|
||||
JNIEnv * mJNIEnv;
|
||||
jclass mJNIClass;
|
||||
jmethodID midSendCommand;
|
||||
@@ -164,6 +165,10 @@ class JGE
|
||||
static JGE* GetInstance();
|
||||
static void Destroy();
|
||||
|
||||
#ifdef ANDROID
|
||||
JNIEnv * getJNIEnv();
|
||||
void setJVM (JavaVM * vm);
|
||||
#endif
|
||||
void Init();
|
||||
void End();
|
||||
|
||||
@@ -377,6 +382,7 @@ class JGE
|
||||
/// Access to JNI Environment
|
||||
void SetJNIEnv(JNIEnv * env, jclass cls);
|
||||
void sendJNICommand(std::string command);
|
||||
std::string getFileSystemLocation();
|
||||
#endif
|
||||
|
||||
protected:
|
||||
|
||||
@@ -82,6 +82,7 @@ public:
|
||||
SLObjectItf playerObject;
|
||||
SLPlayItf playInterface;
|
||||
SLSeekItf seekInterface;
|
||||
SLVolumeItf musicVolumeInterface;
|
||||
#else
|
||||
void* mTrack;
|
||||
#endif //WITH_FMOD
|
||||
@@ -115,6 +116,7 @@ class JSample
|
||||
#elif defined ANDROID
|
||||
SLObjectItf playerObject;
|
||||
SLPlayItf playInterface;
|
||||
SLVolumeItf sampleVolumeInterface;
|
||||
void* mSample;
|
||||
#else
|
||||
void* mSample;
|
||||
@@ -242,9 +244,8 @@ protected:
|
||||
|
||||
private:
|
||||
|
||||
#ifdef WIN32
|
||||
JMusic *mCurrentMusic;
|
||||
#endif
|
||||
JSample *mCurrentSample;
|
||||
|
||||
int mVolume;
|
||||
int mMusicVolume;
|
||||
|
||||
Reference in New Issue
Block a user