From f6a2cea7162b0254cea250a072804eb7a21dfab7 Mon Sep 17 00:00:00 2001
From: zhengfl <zhengfl_1989@126.com>
Date: Thu, 9 Jul 2015 10:08:17 +0800
Subject: [PATCH] =?UTF-8?q?refine=20code:=20=E5=88=A0=E9=99=A4srs=5Fapp=5F?=
 =?UTF-8?q?edge=E4=B8=AD=E7=9A=84user=5Fstat=E7=9B=B8=E5=85=B3=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E3=80=82=E5=9B=A0=E4=B8=BA=E6=B2=A1=E6=9C=89=E4=BB=BB?=
 =?UTF-8?q?=E4=BD=95=E4=BD=9C=E7=94=A8=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 trunk/src/app/srs_app_edge.cpp | 20 +-------------------
 trunk/src/app/srs_app_edge.hpp |  2 --
 2 files changed, 1 insertion(+), 21 deletions(-)
 mode change 100644 => 100755 trunk/src/app/srs_app_edge.cpp
 mode change 100644 => 100755 trunk/src/app/srs_app_edge.hpp

diff --git a/trunk/src/app/srs_app_edge.cpp b/trunk/src/app/srs_app_edge.cpp
old mode 100644
new mode 100755
index a1d52011d..cd4a2fdcb
--- a/trunk/src/app/srs_app_edge.cpp
+++ b/trunk/src/app/srs_app_edge.cpp
@@ -705,7 +705,6 @@ int SrsEdgeForwarder::connect_app(string ep_server, string ep_port)
 SrsPlayEdge::SrsPlayEdge()
 {
     state = SrsEdgeStateInit;
-    user_state = SrsEdgeUserStateInit;
     ingester = new SrsEdgeIngester();
 }
 
@@ -729,14 +728,6 @@ int SrsPlayEdge::on_client_play()
 {
     int ret = ERROR_SUCCESS;
     
-    // error state.
-    if (user_state != SrsEdgeUserStateInit) {
-        ret = ERROR_RTMP_EDGE_PLAY_STATE;
-        srs_error("invalid state for client to pull stream on edge. "
-            "state=%d, user_state=%d, ret=%d", state, user_state, ret);
-        return ret;
-    }
-    
     // start ingest when init state.
     if (state == SrsEdgeStateInit) {
         state = SrsEdgeStatePlay;
@@ -782,7 +773,6 @@ int SrsPlayEdge::on_ingest_play()
 SrsPublishEdge::SrsPublishEdge()
 {
     state = SrsEdgeStateInit;
-    user_state = SrsEdgeUserStateInit;
     forwarder = new SrsEdgeForwarder();
 }
 
@@ -816,19 +806,11 @@ int SrsPublishEdge::on_client_publish()
 {
     int ret = ERROR_SUCCESS;
     
-    // error state.
-    if (user_state != SrsEdgeUserStateInit) {
-        ret = ERROR_RTMP_EDGE_PUBLISH_STATE;
-        srs_error("invalid state for client to publish stream on edge. "
-            "state=%d, user_state=%d, ret=%d", state, user_state, ret);
-        return ret;
-    }
-    
     // error when not init state.
     if (state != SrsEdgeStateInit) {
         ret = ERROR_RTMP_EDGE_PUBLISH_STATE;
         srs_error("invalid state for client to publish stream on edge. "
-            "state=%d, user_state=%d, ret=%d", state, user_state, ret);
+            "state=%d, ret=%d", state, ret);
         return ret;
     }
     
diff --git a/trunk/src/app/srs_app_edge.hpp b/trunk/src/app/srs_app_edge.hpp
old mode 100644
new mode 100755
index ef3046512..949c387f3
--- a/trunk/src/app/srs_app_edge.hpp
+++ b/trunk/src/app/srs_app_edge.hpp
@@ -163,7 +163,6 @@ class SrsPlayEdge
 {
 private:
     SrsEdgeState state;
-    SrsEdgeUserState user_state;
     SrsEdgeIngester* ingester;
 public:
     SrsPlayEdge();
@@ -198,7 +197,6 @@ class SrsPublishEdge
 {
 private:
     SrsEdgeState state;
-    SrsEdgeUserState user_state;
     SrsEdgeForwarder* forwarder;
 public:
     SrsPublishEdge();