Commit Graph

28 Commits

Author SHA1 Message Date
qiuguohua
eeb9d5c689 Merge the code of v3.3.1 platform adaptation layer into the development branch (#3958)
* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Merge platform adaptation layer code into the development branch
2、It passed the test in windows and ohos system

* 1、Fix github compile windows error

* 1、Fix github compile windows error

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* 1. Adjust the code format;
2. Fix js automatic generation binding
3. Adjust github CI compilation

* Solve mac and ios compilation failure

* Fix the problem of compilation of Windows-side simulator

* 1. Adapt the simulator to a new adaptation layer;
2. Fix the compilation warning of ios, and the implicit conversion failed;
3. Fix the mac compilation error, due to the problem of adding the link identification -all_load;

* 1.Add the isDisplayStats and setDisplayStats method to the screen interface

* Fix clang-tidy compilation warning

* Fix clang-tidy compilation warning

* Repair the emulator, compatible with mac and win

* 1、Repair detailed errors, including name modification and calling method modification
2、Delete redundant files in the template directory
3、Change the vibrate interface to vibrator
4、Fix word spelling errors

* Rename interfaces to modules

* Replace CC_ASSERT with CCASSERT

* Replace CC_ASSERT with CCASSERT

Co-authored-by: qiuguohua <>
2021-10-27 10:51:02 +08:00
江战
a652715f5a Harmony OS support - dont merge (#3528) 2021-05-21 10:43:22 +08:00
minggo
d8824f8a11 fix coding style (#3371) 2021-04-02 09:55:12 +08:00
minggo
0386bed212 fix audio code format (#3212)
* fix audio code format

* format base files
2021-01-13 13:38:07 +08:00
吴智明
4dc6a9f67c change android package name (#3006) 2020-11-11 10:55:10 +08:00
kenshin
2ad036ba09 3d gfx 2 4 3 patch (#2984)
* free AudioMix partial wake locks, and android device can enter power save

* fix audio engine crash, avoid update function reentrancy.

* fix hot update issue.

* avoid a NULL point crash when ScriptEngine::cleanup
2020-11-06 18:03:49 +08:00
minggo
9d9c79012b change file path (#2733) 2020-09-10 09:51:24 +08:00
minggo
b08407c501 remove CC/cc prefix for file names (#2728) 2020-08-28 15:23:29 +08:00
minggo
7efee066fd Remove duplicate (#2597) 2020-06-19 11:07:21 +08:00
minggo
d381a16142 change namespace from cocos2d to cc (#2572) 2020-06-16 14:34:46 +08:00
minggo
e693d0a237 get audio output sample rate and output frame count in C++ (#2175) 2020-02-24 18:14:00 +08:00
minggo
1bb0c717d0 fix macro redefine warning of platform defination (#2099) 2020-01-20 15:12:49 +08:00
PP
0ab1197c27 refine pause playing audio when enter background (#1875)
* Revert "Pause music when app enter background (#1849)"

This reverts commit 7a24ee3377.

* refine pause playing audio when enter background
2019-10-12 17:02:50 +08:00
Javier O
4e79585fd0 Improved audio engine interface to get the audio duration directly from the filename
because with the current implementation the audio needs to be preload and at least be played one time to get
the audio id which is needed to get the audio duration with the current getDuration API.
I've describes the problem in detail here:
https://discuss.cocos2d-x.org/t/audioengine-interface-improvement/34034
2019-02-28 09:18:14 -03:00
jimmy
16a5082bd9 修正音乐文件不在OBB时无法加载的bug (#1611) 2019-01-28 10:05:07 +08:00
leda
dada2eb244 move "cocos2d::experimental::" to "cocos2d::" on Audio (#1549)
* remove “experimental” in audio dir

* update audio bindings

* fix "{" match error

* no need "experimental" for thread pool

* remove both out-of-date js api files
2018-10-18 13:34:12 +08:00
leda
3873d01bdd fix depend error on application.h (#1458)
* correct event type

* move isDisplayStats Impl from header to source file

* correct header file depend for application-ios

* same header changes on win32
2018-08-16 13:34:36 +08:00
James Chen
2e174ff1c2 Supports dispatching custom event for EventDispatcher. (#1240)
* Adds __jsbInvocationCount for SpiderMonkey.

* Supports dispatching custom event for EventDispatcher.
2018-05-14 17:19:03 +08:00
James Chen
bf1b4f7124 [runtime] Audio works. (#1151) 2018-03-17 11:22:56 +08:00
Jare Guo
d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
James Chen
e98823839c Sync audio module from cocos2d-x. 2017-09-08 09:56:29 +08:00
James Chen
8906d53f04 Sync cocos2d-x #17923 2017-06-13 17:47:36 +08:00
James Chen
fc98b4bdc0 Sync with cocos2d-x v3 branch ddb4dc8 commit. 2017-04-24 10:49:02 +08:00
James Chen
725aa66556 Updates lite audio engine sources from upstream (cocos2d-x). 2016-10-28 11:30:29 +08:00
pandamicro
8bd0b63d83 Upgrade cocos/audio to v3.13 2016-08-04 12:01:26 +08:00
Wenhai Lin
4d7038bdb6 Fixed the software keyboard gets opened by call EditBox::setVisible(true) on Android. (#47) 2016-04-27 20:04:20 +08:00
Wenhai Lin
94c95d5838 Withespaces does matter. 2016-03-31 23:50:02 +08:00
Wenhai Lin
a6dbf31dcf cocos 2d lite version 2016-03-29 17:55:48 +08:00