|
@@ -6,11 +6,11 @@
|
|
|
|
|
|
|
|
|
|
|
|
-
|
|
|
-enum createStickersModel {
|
|
|
- case createStickersModelPoint
|
|
|
- case createStickersModelSpeed
|
|
|
- case createStickersModelOnlyMusic
|
|
|
+
|
|
|
+public enum createStickersModel: Int{
|
|
|
+ case createStickersModelPoint = 1
|
|
|
+ case createStickersModelSpeed = 2
|
|
|
+ case createStickersModelOnlyMusic = 3
|
|
|
}
|
|
|
|
|
|
import Foundation
|
|
@@ -684,6 +684,7 @@ class PQStuckPointEditerController: PQBaseViewController {
|
|
|
BFLog(message: "去发布")
|
|
|
playerView.pause()
|
|
|
let videoExporter = PQStuckPointPublicController()
|
|
|
+ videoExporter.rhythmMode = currentCreateStickersModel
|
|
|
videoExporter.isReCreate = isReCreate
|
|
|
videoExporter.selectedTotalDuration = selectedTotalDuration
|
|
|
videoExporter.selectedDataCount = selectedDataCount
|
|
@@ -1154,8 +1155,8 @@ extension PQStuckPointEditerController {
|
|
|
if section.sectionType == "normal" {
|
|
|
|
|
|
BFLog(message: "stuckPoints count is \(stuckPoints.count)")
|
|
|
-
|
|
|
- var totalStickerTimer:Float64 = 0
|
|
|
+
|
|
|
+ var totalStickerTimer:Float64 = CMTimeGetSeconds(playeTimeRange.start)
|
|
|
for sticker in section.sectionTimeline!.visionTrack!.getEnableVisionTrackMaterials() {
|
|
|
if sticker.type == StickerType.VIDEO.rawValue {
|
|
|
let asset: AVURLAsset = AVURLAsset(url: URL(fileURLWithPath: documensDirectory + sticker.locationPath), options: nil)
|