子龙山人
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
Dhilan007
ed9c8b2693
fix audio issues(log output:Too Many Objects) after play audio many times.
2014-09-30 15:00:52 +08:00
Dhilan007
02fcb6488a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/2d/libcocos2d.vcxproj.filters
tests/cpp-tests/proj.win32/cpp-tests.vcxproj
2014-09-30 14:19:27 +08:00
minggo
804b26344e
fix warnings
2014-09-30 11:58:38 +08:00
Dhilan007
db45794625
fix macro
2014-09-30 09:57:28 +08:00
Dhilan007
18307d52da
fix macro
2014-09-30 09:48:24 +08:00
Dhilan007
7ebe4a5548
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio-win32
...
Conflicts:
cocos/audio/AudioEngine.cpp
cocos/audio/apple/AudioPlayer.h
cocos/audio/include/AudioEngine.h
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.cpp
tests/cpp-tests/Classes/NewAudioEngineTest/NewAudioEngineTest.h
2014-09-30 09:45:47 +08:00
Ricardo Quesada
7a1dac5aa6
Fixes audio issues when using CMake on Mac
2014-09-29 14:07:11 -03:00
Dhilan007
65a14a6d3f
Improved thread safety
2014-09-29 14:17:51 +08:00
Dhilan007
f2f1331026
New Audio Engine[Win32]
2014-09-29 10:15:41 +08:00
Dhilan007
c37371a543
fix noise on mac
2014-09-22 16:59:24 +08:00
Dhilan007
936c3b3f79
New Audio Engine -MAC
2014-09-22 15:38:12 +08:00
Dhilan007
369c14ed49
fix compile error
2014-09-16 14:57:58 +08:00
Dhilan007
9942206c53
move AudioEngine in cocos2d:experimental namespace
2014-09-16 10:22:25 +08:00
Dhilan007
39a8b8d5ea
Fix a potential crash in AudioEngine on Android.
2014-09-15 17:36:00 +08:00
minggo
68ab3082b4
fix warnings
2014-09-15 16:23:57 +08:00
minggo
7bb391ce55
Merge pull request #8033 from Dhilan007/v3-audio903
...
Lua bindings of AudioEngine.
2014-09-15 13:43:27 +08:00
minggo
6bcab3b05d
Merge pull request #7920 from rny/audio_win32
...
win32 can not stop looping sound effect
2014-09-15 09:37:11 +08:00
Dhilan007
f6992b94de
fix crash in AudioEngine
2014-09-14 22:48:41 +08:00
Dhilan007
518fd7ab6f
Optimized seek for large file and log output on IOS.
2014-09-11 10:53:01 +08:00
Dhilan007
1d43c6ec82
Fix name of variables and coding style.
2014-09-10 17:12:46 +08:00
Dhilan007
fc27c5e32a
Merge branch 'v3' of https://github.com/cocos2d/cocos2d-x into v3-audio909
...
Conflicts:
build/cocos2d_libs.xcodeproj/project.pbxproj
2014-09-10 14:35:33 +08:00
Dhilan007
e588b371bd
Replace with 'struct' for AudioInfo/ProfileHelper.
2014-09-10 14:09:42 +08:00
Dhilan007
e45a4ff1bd
1.Fix name of variables.
...
2.Fix control of volume on android.
2014-09-10 13:47:17 +08:00
Ricardo Quesada
4d57e991ea
Compiles in Win32
2014-09-09 18:07:24 -07:00
Ricardo Quesada
0ead7b6307
Squashed commit of the following:
...
commit b9181ae92541d11119bedd766773ddb01f0bb486
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:34:40 2014 -0700
Compiles luasocket on Mac
commit 91fc79aa2101867fedfbcd7d846e9508009894e6
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 09:12:30 2014 -0700
disables luasockets
commit 31f2ee462708ab7b604b9399eaabd275e2da9e02
Merge: 19099fd 0abe4cb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Tue Sep 9 08:10:48 2014 -0700
Merge remote-tracking branch 'cocos2d/v3' into cmakefile_mac_osx
Conflicts:
cocos/3d/cocos3d.h
commit 19099fd021b4ecf1f2eebd73ea14e84572d1ee33
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:21:03 2014 -0700
compiles on Linux
commit eec7b92817ac9208123468bb882612aad89f94bf
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 23:16:46 2014 -0700
all projecs compiles with CMake
commit 40fcc8325b409a580fdbf26d2ee27aa2d1db0109
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:47:27 2014 -0700
CCUserDefualt.mm better includes
commit 30709ec8243562858498cb118240bb45bf9b33b0
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 21:26:36 2014 -0700
cpp-tests compiles and works on Mac using CMake
commit 67f0fc8df887d08d3d7a27c5fdadd335d6841676
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 20:12:09 2014 -0700
Adds missing files to CMakeLists.txt
commit 36f939ea7f157ca851aee138300c13d9888c0078
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:52:34 2014 -0700
Adds more box2d missing files
commit 00f81e3b5ec97150974cc6022e86c394ff488ccb
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 19:39:54 2014 -0700
Adds missing box2d files
commit 9673227b4d7d0e6d9eced49bdd69b98cb519968a
Author: Ricardo Quesada <ricardoquesada@gmail.com>
Date: Mon Sep 8 18:44:15 2014 -0700
Initial CMake support for Mac
2014-09-09 12:18:31 -07:00
Dhilan007
f2b7bd62d5
update Xcode project for audio engine
2014-09-09 11:41:17 +08:00