Lothario
/
axmol
mirror of https://github.com/axmolengine/axmol.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
12,021 Commits 2 Branches 31 Tags 1.1 GiB
Commit Graph

87 Commits

Author SHA1 Message Date
folecr f40fe3b028 Fix signature of Java method used in JNI 2013-08-05 02:05:46 -07:00
folecr c4fe5de7a4 cddandroidOpenSLEngine.h with updated method declaration 2013-08-05 02:05:45 -07:00
folecr c308d37a4b cddandroidOpenSLEngine.cpp with updated method declaration 2013-08-05 02:05:45 -07:00
folecr b01e27abc0 cddandroidAndroidJavaEngine.cpp with updated method declaration 2013-08-05 02:05:45 -07:00
folecr b8db689e3a cddandroidAndroidJavaEngine.h with updated method declaration 2013-08-05 02:05:45 -07:00
folecr 74c928bafc Empty implementation updated to match method declarations and getInstance() instead of sharedEngine() 2013-08-05 02:05:45 -07:00
folecr 8e897d1902 Use getInstance() instead of deprecated sharedFileUtils() 2013-08-05 02:05:45 -07:00
folecr ca8bc2ca4a Use Java audio for all devices while compatibility is tested. 2013-08-05 02:05:44 -07:00
folecr 2d7d918fa5 Set pointer to singleton instance to NULL after delete-ing it. 2013-08-05 02:05:44 -07:00
folecr f3141826b2 Remove unnecessary DeleteLocalRef (?) and clean up checking code 2013-08-05 02:05:44 -07:00
folecr 210cf68cab Remove OpenSL code. Add empty implementation for OpenSL Audio Engine. 2013-08-05 02:05:44 -07:00
folecr 3a7c5628c5 Empty implementation of SimpleAudioEngine to satisfy compiler. 2013-08-05 02:05:44 -07:00
folecr 1709a15b79 SimpleAudioEngine using Java helper class via JNI. 2013-08-05 02:05:44 -07:00
folecr 6a2b8ae271 Remove duplicate copy of jni utils. Remove old code. 2013-08-05 02:05:44 -07:00
folecr 7ead0522ab ::end() is implemented by deleting the object 2013-08-05 02:05:43 -07:00
folecr 4215565492 makefile modification to match rename 2013-08-05 02:05:43 -07:00
folecr 8c047b7217 Subclasses for Java and OpenSL variants of SimpleAudioEngine. SimpleAudioEngine factory chooses between the two. 2013-08-05 02:05:43 -07:00
folecr 6750d9c51e Utility functions for Android CocosDenshion 2013-08-05 02:05:43 -07:00
folecr d0bacb8818 Clean up includes 2013-08-05 02:05:43 -07:00
folecr d70954d30f Remove copies of android system headers. 2013-08-05 02:05:42 -07:00
minggo 295a23e535 Fix build with -Werror=format-security (default in Android NDK r9) 2013-07-27 07:57:28 +08:00
Sergii Rudchenko 3ea77ec933 Fix build with -Werror=format-security (default in Android NDK r9) 2013-07-27 01:17:13 +03:00
James Chen 8078e8eff7 issue #2407: SimpleAudioEngine::sharedEngine --> SimpleAudioEngine::getInstance(). 2013-07-19 13:40:45 +08:00
minggo c6c50eb55a Merge pull request #3110 from sergey-shambir/opensl_fix 
CocosDenshion: fixed wrong assertion in android OpenSL engine
 2013-07-16 01:39:01 -07:00
James Chen a678d12615 issue #2397: FileUtils::sharedFileUtils --> FileUtils::getInstance() for all platforms 2013-07-12 12:03:39 +08:00
Sergey Shambir 3d3a628fb5 CocosDenshion: fixed wrong assertion in android OpenSL engine 
Playback rate interface cannot be initialized for some players in
android 4.x, it's not cocos2d bug.
 2013-07-09 08:49:02 +04:00
Sergey Shambir 1c52517770 CocosDenshion: added effects customization for 7 platforms. 
1. Pitch/pan/gain support on iOS, Mac, Linux+FMOD, Android+SoundPool;
2. Unified OpenAL code with pitch/pan/gain on Linux, Tizen, Blackberry,
Native Client;
3. Bug fixed: rewindBackgroundMusic() no longer stops music on unified
OpenAL engine.
4. Optional mp3 support for Linux+OpenAL (OPENAL_MP3 make option);
5. Pan/gain (not pitch) support for Android+OpenES.
6. Reorganized CocosDenshion tests in TestCpp.

Known issues:
1. No support for windows, emscrippten, marmalade.
2. No pitch effect on Android+OpenES. It requires backend redesign:
http://code.google.com/p/android/issues/detail?id=24592
 2013-06-29 13:44:16 +04:00
Sergey Shambir ab1038a540 pitch/pan/gain: added iOS/OSX impl, fixed compilation for all platforms. 2013-06-29 13:44:03 +04:00
James Chen 0a0bada9c2 issue #2129: Removing CC prefix for CocosDenshion module. 2013-06-20 14:12:43 +08:00
minggo e89652e280 Merge pull request #2902 from waiter/master 
update "fix a bug that SimpleAudioEngine may cause crash on i9100"
 2013-06-17 03:27:20 -07:00
James Chen 4432caca1a Fix a bug (https://github.com/cocos2d/cocos2d-x/pull/2902) 2013-06-17 15:54:50 +08:00
waiter 3921512739 update "fix a bug that SimpleAudioEngine may cause crash on i9100" 2013-06-17 09:50:39 +08:00
James Chen c0d44cb2e4 fixed #2129: Rename m_iVar to _var, remove CC prefixes. 2013-06-15 14:03:30 +08:00
James Chen 3cfa1a9873 [Android] Don't use c++11 feature in OpenSLEngine.cpp. 2013-06-09 15:33:31 +08:00
James Chen 49b4ec42f3 [Android] Don't use c++11 feature in OpenSLEngine.cpp. 2013-06-09 15:18:17 +08:00
Darragh Coy 7b67794826 Fix a potential crash SimpleAudioEngineOpenSL::playEffect 
Fix a crash in SimpleAudioEngineOpenSL::playEffect which would occur when OpenSLEngine::preloadEffect returned FILE_NOT_FOUND. In the case where the sound fails to preload, we should not attempt to call OpenSLEngine::setEffectLooping on that sound.
 2013-05-14 17:48:50 +01:00
waiter 814feca53b fix OpenSLEngine can't load resources from SD card 2013-03-04 14:54:43 +08:00
James Chen 4d900c2d15 Removing `assets/` in the full path since it isn't needed for the API of playing sound. 2013-01-25 20:51:00 +08:00
James Chen 0a42829428 issue #1667: Adding file name lookup support for iOS and Android, TBD: Other platform supports. 2013-01-18 18:05:32 +08:00
Denis Mingulov 6d895e634c Compilation fix for Android clang 3.1 2012-12-22 07:58:30 +02:00
dualface 98ea80329e fix android compile warning 2012-12-14 18:01:54 +08:00
wenbin1989 5cfff102ad fix bug in android CocosDenshion 
the method called by JNI is moved from Cocos2dxActivity.java to
Cocos2dxHelper.java.
 2012-10-16 16:20:41 +08:00
wenbin1989 bb6a2c58de fix getDeviceModel bug in android CocosDenshion 
deviceModel must be used before release, otherwise it will cause
garbled character when getDeviceModel sometimes.
 2012-10-16 16:10:14 +08:00
minggo 0a1f0369e6 fixed #1481: merge Nicolas's pull request and do some bug fixes 2012-09-21 17:01:19 +08:00
folecr d4948939b6 Remove spidermonkey bindings from the CocosDenshion and cocos2dx module makefiles 
* ... they should only be included by cocos+JavaScript applications
 2012-08-28 17:43:57 -07:00
folecr a033959b81 Dynamic typing for cocosdenshion's JS bindings 2012-08-27 08:43:39 -07:00
mustime cd6241655b issue #1284: fix a compile error for missing android.so 2012-08-20 12:49:59 +08:00
mustime 6f615ce085 issue #1284: add auto-detection of I9100 model for OpenSLES 2012-08-17 09:58:04 +08:00
mustime 4eee341407 issue #1284: add auto-detection of I9100 model for OpenSLES 2012-08-17 09:51:49 +08:00
mustime 81f9e68351 issue #1284: using dlopen instead of specifing android-9 platform 2012-08-15 15:57:23 +08:00