From ab74d1cff90cc563e0eca8deb8f154d84eb51908 Mon Sep 17 00:00:00 2001
From: 648540858 <648540858@qq.com>
Date: 星期三, 14 九月 2022 20:51:21 +0800
Subject: [PATCH] Merge branch 'wvp-28181-2.0'
---
src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java
index a722ae8..64bc243 100644
--- a/src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java
+++ b/src/main/java/com/genersoft/iot/vmp/vmanager/bean/AudioBroadcastResult.java
@@ -1,5 +1,6 @@
package com.genersoft.iot.vmp.vmanager.bean;
+import com.genersoft.iot.vmp.common.StreamInfo;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItem;
import com.genersoft.iot.vmp.media.zlm.dto.MediaServerItemLite;
@@ -8,9 +9,9 @@
*/
public class AudioBroadcastResult {
/**
- * 鎺ㄦ祦鐨勫獟浣撹妭鐐逛俊鎭�
+ * 鎺ㄦ祦鐨勫悇涓柟寮忔祦鍦板潃
*/
- private MediaServerItemLite mediaServerItem;
+ private StreamInfo streamInfo;
/**
* 缂栫爜鏍煎紡
@@ -28,12 +29,12 @@
private String stream;
- public MediaServerItemLite getMediaServerItem() {
- return mediaServerItem;
+ public StreamInfo getStreamInfo() {
+ return streamInfo;
}
- public void setMediaServerItem(MediaServerItemLite mediaServerItem) {
- this.mediaServerItem = mediaServerItem;
+ public void setStreamInfo(StreamInfo streamInfo) {
+ this.streamInfo = streamInfo;
}
public String getCodec() {
--
Gitblit v1.8.0