winlin

merge srs2.

@@ -798,9 +798,14 @@ void SrsSource::dispose_all() @@ -798,9 +798,14 @@ void SrsSource::dispose_all()
798 798
799 int SrsSource::cycle_all() 799 int SrsSource::cycle_all()
800 { 800 {
  801 + int ret = ERROR_SUCCESS;
  802 +
  803 + // TODO: FIXME: support source cleanup.
  804 + // @see https://github.com/ossrs/srs/issues/714
801 int cid = _srs_context->get_id(); 805 int cid = _srs_context->get_id();
802 - int ret = do_cycle_all(); 806 + ret = do_cycle_all();
803 _srs_context->set_id(cid); 807 _srs_context->set_id(cid);
  808 +
804 return ret; 809 return ret;
805 } 810 }
806 811