Skip to content
体验新版
项目
组织
正在加载...
登录
切换导航
打开侧边栏
sxychenjing
engine
提交
0f0f43cd
E
engine
项目概览
sxychenjing
/
engine
与 Fork 源项目一致
从无法访问的项目Fork
通知
3
Star
0
Fork
0
代码
文件
提交
分支
Tags
贡献者
分支图
Diff
Issue
0
列表
看板
标记
里程碑
合并请求
0
Wiki
0
Wiki
分析
仓库
DevOps
项目成员
Pages
E
engine
项目概览
项目概览
详情
发布
仓库
仓库
文件
提交
分支
标签
贡献者
分支图
比较
Issue
0
Issue
0
列表
看板
标记
里程碑
合并请求
0
合并请求
0
Pages
分析
分析
仓库分析
DevOps
Wiki
0
Wiki
成员
成员
收起侧边栏
关闭侧边栏
动态
分支图
创建新Issue
提交
Issue看板
体验新版 GitCode,发现更多精彩内容 >>
提交
0f0f43cd
编写于
1月 28, 2016
作者:
C
Chinmay Garde
浏览文件
操作
浏览文件
下载
差异文件
Merge pull request #2311 from chinmaygarde/master
iOS: Fix sound pool stream selection
上级
a2738aff
45245b35
变更
1
显示空白变更内容
内联
并排
Showing
1 changed file
with
10 addition
and
3 deletion
+10
-3
sky/services/media/ios/sound_pool_impl.mm
sky/services/media/ios/sound_pool_impl.mm
+10
-3
未找到文件。
sky/services/media/ios/sound_pool_impl.mm
浏览文件 @
0f0f43cd
...
...
@@ -87,7 +87,9 @@
}
-
(
BOOL
)
play
:(
int32_t
)
stream
{
return
[[
self
playerForID
:
stream
]
playAtTime
:
0.0
];
AVAudioPlayer
*
player
=
[
self
playerForID
:
stream
];
player
.
currentTime
=
0.0
;
return
[
player
play
];
}
-
(
BOOL
)
play
:(
int32_t
)
stream
...
...
@@ -111,10 +113,12 @@
player
.
volume
=
volume
;
player
.
numberOfLoops
=
loop
?
-
1
:
0
;
player
.
rate
=
rate
;
return
[
player
playAtTime
:
0.0
];
player
.
currentTime
=
0.0
;
return
[
player
play
];
}
-
(
BOOL
)
resume
:(
int32_t
)
stream
{
// Unlike a play (from beginning), we don't set the current time to 0
return
[[
self
playerForID
:
stream
]
play
];
}
...
...
@@ -248,7 +252,10 @@ void SoundPoolImpl::Play(int32_t sound_id,
float
rate
,
const
::
media
::
SoundPool
::
PlayCallback
&
callback
)
{
base
::
mac
::
ScopedNSAutoreleasePool
pool
;
BOOL
playResult
=
[
sound_pool_
play
:
stream_id
// To match Android semantics, during the load operation, we return the
// ID used to key the audio player in the sound pool map as the stream ID.
// The caller is returning that ID to us as the sound ID.
BOOL
playResult
=
[
sound_pool_
play
:
sound_id
volume:
AverageVolume
(
channel_volumes
)
loop:
loop
rate:
rate
];
...
...
编辑
预览
Markdown
is supported
0%
请重试
或
添加新附件
.
添加附件
取消
You are about to add
0
people
to the discussion. Proceed with caution.
先完成此消息的编辑!
取消
想要评论请
注册
或
登录