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

256 Commits

Author SHA1 Message Date
fnz 8c691430c1 conflicts resolved 2015-11-27 13:19:10 +03:00
fnz c4b995fe59 updates to JniHelper, refactoring of existing JNI calls 2015-11-27 12:00:33 +03:00
cesarpachon 40f6f76030 AudioEngine:Linux: implementation using FMOD, refactor to SimpleAudioEngine now as wrapper of AUdioEngine, upgrade FMOD binaries 2015-11-26 22:22:05 -05:00
WenhaiLin 42fa33dc6e AudioEngine[WIN32]:Fixed `FinishCallback` may not been invoked when the sound play completes. 2015-11-17 23:44:52 +08:00
cpascal 13c1258f9d Fixed AudioPlayer crash in Win32 2015-10-09 15:03:05 +09:00
Dale Stammen 32eeb560c3 clean up include files for WINRT platforms 2015-10-02 18:49:41 -07:00
Martin Taylor 62e36e8006 fix typos and syntax error. A thorough check by tool VSSpellChecker. 2015-09-22 16:08:23 +08:00
WenhaiLin e500b960f3 AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call. 2015-09-07 16:29:57 +08:00
WenhaiLin 42b24a9c5b Rename AVAudioPlayer to CCAudioPlayer for avoid conflicting with system framework 2015-09-07 11:12:13 +08:00
Vladimir Perminov 104013aebe commit v3.8 overwrite this unused code 
From commit #13397
 2015-08-27 23:19:30 +03:00
pandamicro d6045fdbea Merge branch 'v3.8' of github.com:cocos2d/cocos2d-x into v3 
Conflicts:
	cocos/audio/winrt/Audio.cpp
	cocos/platform/winrt/CCCommon.cpp
	cocos/platform/winrt/CCWinRTUtils.cpp
	cocos/platform/winrt/CCWinRTUtils.h
 2015-08-27 10:40:04 +08:00
Dale Stammen fc1a2b2f99 fixed for winrt audio issue 13254 2015-08-21 09:59:46 -07:00
Vladimir Perminov d70a21aa25 Correct use and convert unicode from utf8 
Move StringUtf8ToWideChar and StringWideCharToUtf8 to CCWinRTUtils(
Replace CCUtf8ToUnicode)
Use StringUtf8ToWideChar for convert utf8 to unicode
Use StringWideCharToUtf8 for convert unicode to utf8
 2015-08-16 12:51:41 +03:00
James Windiate fa02751e45 fixed whitespace 2015-08-13 19:24:41 -04:00
James Windiate 61a2e0d2ad Added _playing flag switching on pause and resume 
Issue # 13254
 2015-08-13 18:52:32 -04:00
Wenhai Lin b46000287e AudioEngine:Fixed crash cause by multiple threads access into a shared unsynchronized data.[iOS/Mac] 2015-08-11 18:11:59 +08:00
子龙山人 f3f67a10f9 Merge pull request #13232 from perminovVS/v3-dev-get-file-extension 
Add getFileExtension to FileUtils
 2015-08-11 15:54:55 +08:00
WenhaiLin 2deeee70d2 CppTests-->Extension-->CocosBuilderTest:Fixed crash on Android 5.0.x. 2015-08-10 22:41:18 +08:00
Vladimir Perminov 7cacdaeaf1 Add getFileExtension to FileUtils 
Gets filename extension is a suffix (separated from the base filename by
a dot) in lower case.

More code need get filename extension, everyone does it differently.
use check UPPER and lower case, use . and no(example ".csb", ".CSB",
"csb" )

And bag in AudioEngineImpl: find point from left( ext =
strchr(filePath.c_str(), '.'); )
If file path contains point. always unsupported media type
 2015-08-05 22:21:16 +03:00
WenhaiLin 102020d831 1.AudioEngine:support callback for preload feature. 
2.AudioEngineThreadPool:Make the number of thread be a fixed number.
 2015-07-28 15:27:07 +08:00
WenhaiLin eca192f7a6 Fixed compile error 2015-07-10 14:43:28 +08:00
WenhaiLin 86a68f5a09 AudioEngine:refine thread pool 2015-07-09 14:31:03 +08:00
Wenhai Lin 5d50663c35 AudioEngine:support preload for audio[MAC/iOS] 2015-07-08 18:04:43 +08:00
WenhaiLin b395ef06d8 AudioEngine:support preload for audio[WIN32/WINRT 8.1/WP8.1] 2015-07-08 10:48:20 +08:00
Wenhai Lin c06b5c5570 AudioEngine:Fixed play audio may fail when switch to new scene on iOS. 2015-07-01 17:19:28 +08:00
Wenhai Lin e124593a5c AudioEngine:Fixed play audio may fail(error code:-1) on iOS 2015-06-30 15:38:24 +08:00
子龙山人 260d5035bb Merge pull request #12555 from WenhaiLin/v3-simpleaudio-AndroidL-Fix 
Fixed SimpleAudioEngine may cause application to crash on Android L(5.0.x)
 2015-06-26 11:05:40 +08:00
Wenhai Lin 1875829ab4 [CppTests:ExtensionsTest-->CocoStudioComponentsTest]Fixed crash on Android 5.0.x 2015-06-26 10:16:52 +08:00
Dale Stammen 61f4e280b4 Merge branch 'v3.7-release' into v3.7-winrt-audio 2015-06-25 12:46:20 -07:00
andyque 2bb7b96839 add guard to audio engine pointer 2015-06-25 10:17:31 +08:00
anniruddh e89a6c1651 fixed issue #160 2015-06-24 17:50:11 -07:00
pandamicro 29840df88e Fix indent of Audio.cpp 2015-06-23 20:08:00 +08:00
Anniruddh 4a15d57093 Fixed issue #168 2015-06-20 00:20:15 -07:00
pandamicro d0db40c4a6 Merge pull request #12080 from linshun/v3 
issue #12078 added audio, network, physics, platform and storage group.
 2015-06-15 12:45:11 +08:00
anniruddh.koppal 84fad34daf Added ogg support to audio engine. Fixed issues #150 and #151 2015-06-03 20:57:14 -07:00
子龙山人 d7534c26a3 Merge pull request #12106 from WenhaiLin/v3-audio-ios-phonecall 
AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call.
 2015-06-01 11:19:01 +08:00
子龙山人 4e914a01da Merge pull request #12098 from WenhaiLin/v3-simpleaudio-lagged 
Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x
 2015-06-01 11:17:26 +08:00
WenhaiLin 59435f8749 AudioEngine:Fixed audio can not resume if it is interrupted cause by an incoming phone call. 2015-05-29 21:41:54 +08:00
WenhaiLin 9c31aafba0 Fixed SimpleAudioEngine::playEffect() lagged on Android 5.0.x 2015-05-29 14:52:25 +08:00
子龙山人 035420893e Merge pull request #12076 from andyque/update-changelog-v3 
Fix a memory issue in AudioEngine
 2015-05-29 11:44:45 +08:00
linshun 77639bc88e issue #12078: Added audio group. 2015-05-28 15:46:02 +08:00
子龙山人 f6f8796dfa Merge pull request #11762 from WenhaiLin/v3-audioengine-i11697 
AudioEngine:Fixed program may freeze if `AudioEngine::stop` or `AudioEngine::stopAll()` is invoked frequently on Android.
 2015-05-28 14:52:20 +08:00
andyque 578fda54ba fix a memory issue in AudioEngine. 
This PR also update AUTHORS and CHANGELOG files.
 2015-05-28 11:49:27 +08:00
anniruddh.koppal 4501a53cfa Added MP3 support to simple audio engine 2015-05-27 10:57:26 -07:00
anniruddh.koppal b2eb946c14 Added MP3 support 2015-05-23 19:13:12 -07:00
Dale Stammen 6c02e46865 fix deprecated method 2015-05-21 13:30:51 -07:00
minggo 22f0e2fbbf Merge pull request #11918 from WenhaiLin/v3-37 
AudioEngine: Fixed play with a large audio file may fail on Win32
 2015-05-21 10:36:08 +08:00
Dale Stammen d70a9bf369 resolve full path for audio file 2015-05-20 11:18:54 -07:00
WenhaiLin 02946a55a1 Fixed crash. 2015-05-20 17:13:04 +08:00
WenhaiLin 81dc551fe9 AudioEngine: Fixed play with a large audio file may fail on Win32. 2015-05-20 15:13:31 +08:00
Wenhai Lin 17f2fcd201 Add more comment. 2015-05-19 11:01:23 +08:00
anniruddh.koppal 2db5a89b87 Added new audio engine with wav support 2015-05-15 18:17:52 -07:00
WenhaiLin 07f5ec755a AudioEngine:Fixed program may freeze if `AudioEngine::stop(int audioID)` or `AudioEngine::stopAll()` is invoked frequently on Android. 2015-05-08 18:29:45 +08:00
andyque db95034798 fix android compile error 2015-05-07 10:37:19 +08:00
Vladimir Perminov 694b9adc1e Add FileUtils::getSuitableFOpen 
win32 fopen only ansi encoding.
if filePath contains utf8 characters fopen fail.
AudioCache FileFormat::OGG bag, can't open file, if filePath contains
utf8.

Need make all filename for fopen correct encoding.
Only Win32 FileUtils::getSuitableFOpen return
StringUtf8ToAnsi(filename),
other platform return filename

all fopen use FileUtils::getSuitableFOpen
 2015-04-19 14:00:27 +03:00
Dale Stammen b700798287 removed WP8 project files 2015-04-15 07:13:54 -07:00
minggo 09c50c44dc Merge pull request #11224 from hawkwood/patch-7 
Remove use of autorelease NSString and NSURL
 2015-04-09 18:36:07 +08:00
Justin Hawkwood 84fd73630a Fix iOS 5.1.1 crash caused by interruptionHandler 
checks OS version and sets handling based on what is available.
 2015-04-03 15:57:47 -07:00
Justin Hawkwood 237e809f23 Remove use of autorelease NSString and NSURL 
Since there is no autorelease pool, these were leaking.
 2015-03-30 16:27:05 -07:00
Justin Hawkwood 3641ef266c Remove use of autorelease NSString and NSURL 
Since there is no autorelease pool, these were leaking.
 2015-03-30 16:24:48 -07:00
samuele3hu c3ad458a26 Update comment for Lua 2015-03-30 15:47:47 +08:00
Wenhai Lin fdffad3956 [ci skip]Fixed warnings when generating docs by doxygen. 2015-03-27 10:52:59 +08:00
WenhaiLin 2caff4e64d [ci skip]Update comments 2015-03-24 14:12:58 +08:00
dingpinglv 67169443df Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into Iss_Annotate 
Conflicts:
	cocos/audio/include/SimpleAudioEngine.h
 2015-03-19 20:28:29 +08:00
dingpinglv 1b179c2b02 Issue : added js annotates to SimpleAudioEngine, CCVertexIndexBuffer.h, CCVertexIndexData.h 2015-03-19 20:20:16 +08:00
VisualSJ f87b06a1c8 Add javascript notes... 
cocos/2d/CCAction.h
  cocos/2d/CCActionCamera.h
  cocos/2d/CCActionCatmullRom.h
  cocos/2d/CCActionInstant.h
  cocos/2d/CCActionInterval.h
  cocos/2d/CCActionManager.h
  cocos/audio/include/AudioEngine.h
  cocos/audio/include/SimpleAudioEngine.h
 2015-03-19 18:41:11 +08:00
WenhaiLin e528531b4b [ci skip]Update document 2015-03-19 10:38:12 +08:00
Krishna 35403439f3 Fixed compilation issue. Introduced missing CLASS_NAME 2015-03-04 10:48:30 +01:00
Krishna ec3a8d49f9 Fixed compilation error. 2015-03-04 10:43:31 +01:00
Krishna 58df860b4e Made the loadeffect utility method into a static method. Removed declaration of old method from header file 2015-02-26 06:53:20 +01:00
Krishna 3b54af1763 Introduced missing function declarators 2015-02-25 10:26:59 +01:00
Krishna Narasimhan 80ea81884b Source refactor. Corrected compile issue 2015-02-23 13:01:19 +01:00
Krishna Narasimhan 239a5f307f Sourcr Refactor. Abstracted common functionality from two jni methods and saved space/resources 2015-02-23 10:20:12 +01:00
Wenhai Lin eb7a7a9fb7 Fixed audio can't resume after the interruption of audio session has ended on iOS. 2015-02-12 15:38:44 +08:00
kompjoefriek ca48c5e5dd Fixed lots of compiler warnings 
- signed / unsigned mismatches
- using int as bool
- Removed throw() from CCFrame.h, why is explained here:
http://www.gotw.ca/publications/mill22.htm
 2015-01-23 02:02:33 +01:00
WenhaiLin 5fd9ccfecb Fixed AudioEngine causes game 'freeze' on Android 2015-01-21 16:18:47 +08:00
Wenhai Lin 58c45ca144 Integrate CocosPlayClient 2015-01-13 17:30:07 +08:00
raydelto e20c347767 Fixing typo in the constant INVAILD_AUDIO_ID of the new AudioEngine, changing it to INVALID_AUDIO_ID 2014-12-31 20:51:45 -04:00
Nick Barrios 0c2e64b8b9 AudioEngine-win32.ccp: Switch OpenAL include paths based on OPENAL_PLAINS_INCLUDES. 2014-12-19 16:50:47 -05:00
Ricardo Quesada 33a2d0451c Code conforms with the cocos2d-x c++ guidelines 2014-11-25 17:53:52 -08:00
Vladimir Timofeev ba2f74e76c Fix OpenAL include paths, cmake search include paths for case, when openal includes as "#include <al.h>" 2014-11-18 17:27:43 +03:00
Vladimir Timofeev 28d7279cb0 remove unnneded includes and declarations 2014-11-18 10:06:45 +03:00
Vladimir Timofeev b5266e95bf mingw fixes, now project builds with mingw64 and -DUSE_PREBUILT_LIBS=NO (some additional libs hardcoded still) 2014-11-17 01:42:04 +03:00
Ricardo Quesada 50dcae4bef fixes compiler warnings 2014-11-14 13:07:34 -08:00
Ricardo Quesada 1b44f4b605 Merge pull request #9115 from vovkasm/win32-audioengine-mingw-fix 
Fix compile errors with recent mingw.
 2014-11-14 11:22:35 -08:00
minggo 6d08b33a68 Merge pull request #9107 from Dhilan007/v3-audio-includefix 
Remove unneeded include in AudioEngine.h
 2014-11-14 20:09:33 +08:00
Vladimir Timofeev 48108e548a Fix compile errors with recent mingw. 
Constify arguments to copy constuctors. Without this gcc fail to compile if classes used inside containers.
Error message is rather cryptic: " error: 'constexpr std::pair<_T1, _T2>::pair(const std::pair<_T1, _T2>&) [with _T1 = const int; _T2 = cocos2d::experimental::AudioPlayer]' declared to take const reference, but implicit declaration would take non-const"
 2014-11-14 10:52:17 +03:00
Ricardo Quesada 2e3b2d9f28 Merge pull request #9080 from vovkasm/cmake-refactoring 
Cmake refactorings and fixes
 2014-11-13 15:42:47 -08:00
Dhilan007 f52c3e5a83 Remove unneeded include in AudioEngine.h 2014-11-13 22:02:28 +08:00
Dhilan007 249d34b707 fix AudioEngine can't looping audio on Android 2.3.x 2014-11-13 11:28:08 +08:00
Vladimir Timofeev 8910b962a0 cmake: 
- fix Audio engine build on Mac
- remove duplicated defintions of _EXPORT_DLL_
 2014-11-11 10:30:48 +03:00
Dhilan007 c66348435c Fixed incorrect file path of audio resource in AudioEngine on Android. 2014-10-21 18:34:05 +08:00
Dale Stammen 52fc6d618b updated for Windows 8.1 2014-10-14 14:13:14 -07:00
Dale Stammen fd638f00b7 removed old WP8 project files 2014-10-14 14:09:52 -07:00
martell 73980195c0 wp8: use CC_STATIC because libs are static 2014-10-09 06:33:46 +01:00
martell c3172bef50 Finalise Windows cmake support for mingw-w64 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:22:09 +01:00
martell 30240a8a37 Multi platform cmake support 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:21:45 +01:00
martell fe32bcb952 added support for static and shared builds with audio and studio 
Signed-off-by: martell <martellmalone@gmail.com>
 2014-10-03 23:20:52 +01:00
Ricardo Quesada 342d934a0e scheduler and macro fixes 
* kRepeatForever -> CC_REPEAT_FOREVER
* schedule_selector -> CC_SCHEDULE_SELECTOR
* [new] Node::schedule(const std::function<>& callback, const std::string &key)

Updates all smaples
 2014-10-03 09:38:36 -07:00
minggo 2ecfcee2a6 Merge pull request #8216 from Dhilan007/v3-audio-fix 
fix audio issues(log output:Too Many Objects) after play audio many times on Android
 2014-09-30 15:19:46 +08:00