external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

refine json to_str to dumps.

Browse source
This commit is contained in:
winlin 2015-09-19 13:37:56 +08:00
parent b59d9ba6a1
commit 3042115385
5 changed files with 40 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

14
trunk/src/protocol/srs_protocol_json.cpp
View file

@ -318,7 +318,7 @@ SrsJsonArray* SrsJsonAny::to_array()
return p;
}
string SrsJsonAny::to_json()
string SrsJsonAny::dumps()
{
switch (marker) {
case SRS_JSON_String: {
@ -344,11 +344,11 @@ string SrsJsonAny::to_json()
}
case SRS_JSON_Object: {
SrsJsonObject* obj = to_object();
return obj->to_json();
return obj->dumps();
}
case SRS_JSON_Array: {
SrsJsonArray* arr = to_array();
return arr->to_json();
return arr->dumps();
}
default: {
break;
@ -527,7 +527,7 @@ SrsJsonAny* SrsJsonObject::value_at(int index)
return elem.second;
}
string SrsJsonObject::to_json()
string SrsJsonObject::dumps()
{
stringstream ss;
@ -537,7 +537,7 @@ string SrsJsonObject::to_json()
std::string name = this->key_at(i);
SrsJsonAny* any = this->value_at(i);
ss << SRS_JFIELD_NAME(name) << any->to_json();
ss << SRS_JFIELD_NAME(name) << any->dumps();
if (i < (int)properties.size() - 1) {
ss << SRS_JFIELD_CONT;
}
@ -714,7 +714,7 @@ void SrsJsonArray::append(SrsJsonAny* value)
add(value);
}
string SrsJsonArray::to_json()
string SrsJsonArray::dumps()
{
stringstream ss;
@ -723,7 +723,7 @@ string SrsJsonArray::to_json()
for (int i = 0; i < (int)properties.size(); i++) {
SrsJsonAny* any = properties[i];
ss << any->to_json();
ss << any->dumps();
if (i < (int)properties.size() - 1) {
ss << SRS_JFIELD_CONT;

8
trunk/src/protocol/srs_protocol_json.hpp
View file

@ -114,7 +114,7 @@ public:
*/
virtual SrsJsonArray* to_array();
public:
virtual std::string to_json();
virtual std::string dumps();
virtual SrsAmf0Any* to_amf0();
public:
static SrsJsonAny* str(const char* value = NULL);
@ -150,7 +150,7 @@ public:
// @remark: max index is count().
virtual SrsJsonAny* value_at(int index);
public:
virtual std::string to_json();
virtual std::string dumps();
virtual SrsAmf0Any* to_amf0();
public:
virtual void set(std::string key, SrsJsonAny* value);
@ -181,13 +181,13 @@ public:
// alias to add.
virtual void append(SrsJsonAny* value);
public:
virtual std::string to_json();
virtual std::string dumps();
virtual SrsAmf0Any* to_amf0();
};
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
////////////////////////////////////////////////////////////////////////
// json encode, please use AMF0.to_json() to encode json object.
// json encode, please use JSON.dumps() to encode json object.
#endif