|
@@ -1959,14 +1959,7 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
// }
|
|
|
|
|
|
//add by ak 使用的音频数据
|
|
|
- var useVoiceStickers = [PQVoiceModel]()
|
|
|
- if(itemModels[currItemModelIndex].voiceChangeStickers.count > 0){
|
|
|
- useVoiceStickers = itemModels[currItemModelIndex].voiceChangeStickers
|
|
|
- }else{
|
|
|
- useVoiceStickers = itemModels[currItemModelIndex].voiceStickers
|
|
|
- }
|
|
|
-
|
|
|
-
|
|
|
+ let useVoiceStickers = itemModels[currItemModelIndex].getUsedVoices()
|
|
|
if useVoiceStickers.first(where: { m in
|
|
|
CMTimeCompare(m.startCMTime, currentT) <= 0 && CMTimeCompare(currentT, m.endCMTime) <= 0
|
|
|
}) != nil {
|
|
@@ -2159,6 +2152,12 @@ public class BFRecordScreenController: BFBaseViewController {
|
|
|
m1.startCMTime.seconds < m2.endCMTime.seconds
|
|
|
})
|
|
|
|
|
|
+ //add by ak 变音排序
|
|
|
+ itemModels[currItemModelIndex].voiceChangeStickers.sort(by: { m1, m2 in
|
|
|
+ m1.startCMTime.seconds < m2.endCMTime.seconds
|
|
|
+ })
|
|
|
+
|
|
|
+
|
|
|
isNormalPlaying = true
|
|
|
if isEndPlay || (currMediaType == .Image && CMTimeCompare(currentAssetProgress, itemModels[currItemModelIndex].materialDuraion) >= 0) {
|
|
|
isEndPlay = false
|