From 9978d30aa1533c50bfaa48e44a1b0de4c157d10b Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期四, 11 四月 2024 09:36:48 +0800
Subject: [PATCH] Merge branch '2.7.0'
---
src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
index 2252a25..193c95d 100755
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/StreamContent.java
@@ -1,7 +1,7 @@
package com.genersoft.iot.vmp.vmanager.bean;
import com.genersoft.iot.vmp.common.StreamInfo;
-import com.genersoft.iot.vmp.media.bean.Track;
+import com.genersoft.iot.vmp.media.bean.MediaInfo;
import com.genersoft.iot.vmp.service.bean.DownloadFileInfo;
import io.swagger.v3.oas.annotations.media.Schema;
@@ -87,7 +87,7 @@
private String mediaServerId;
@Schema(description = "娴佺紪鐮佷俊鎭�")
- private Track track;
+ private MediaInfo mediaInfo;
@Schema(description = "寮�濮嬫椂闂�")
private String startTime;
@@ -171,7 +171,7 @@
}
this.mediaServerId = streamInfo.getMediaServerId();
- this.track = streamInfo.getTracks();
+ this.mediaInfo = streamInfo.getMediaInfo();
this.startTime = streamInfo.getStartTime();
this.endTime = streamInfo.getEndTime();
this.progress = streamInfo.getProgress();
@@ -389,12 +389,12 @@
this.mediaServerId = mediaServerId;
}
- public Object getTracks() {
- return tracks;
+ public MediaInfo getMediaInfo() {
+ return mediaInfo;
}
- public void setTracks(Object tracks) {
- this.tracks = tracks;
+ public void setMediaInfo(MediaInfo mediaInfo) {
+ this.mediaInfo = mediaInfo;
}
public String getStartTime() {
--
Gitblit v1.8.0