Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-07-05 15:09:08 +02:00
Code Issues Releases Wiki Activity

JSONify the JSON (Thanks Robert)

Browse Source 
Added quotes around the keys in JSON key value pairs.
Before this fix, we had Javascript, not JSON.
This commit is contained in:
James Crook 2018-03-26 09:56:51 +01:00
parent 0bc96c3831
commit 460ff4644e
1 changed files with 17 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/commands/CommandTargets.cpp
View File

@ -59,20 +59,33 @@ void CommandMessageTarget::AddItem(const wxString &value, const wxString &name){
wxString Padding; wxString Padding;
Padding.Pad( mCounts.GetCount() *2 -2); Padding.Pad( mCounts.GetCount() *2 -2);
Padding = (( value.length() < 15 ) || (mCounts.Last()<=0)) ? "" : wxString("\n") + Padding; Padding = (( value.length() < 15 ) || (mCounts.Last()<=0)) ? "" : wxString("\n") + Padding;
Update( wxString::Format( "%s%s%s%s\"%s\"", (mCounts.Last()>0)?", ":"", Padding, name, !name.IsEmpty()?":":"",Escaped(value))); if( name.IsEmpty() )
Update( wxString::Format( "%s%s\"%s\"", (mCounts.Last()>0)?", ":"", Padding, Escaped(value)));
else
Update( wxString::Format( "%s%s\"%s\":\"%s\"", (mCounts.Last()>0)?", ":"", Padding, name, Escaped(value)));
mCounts.Last() += 1; mCounts.Last() += 1;
} }
void CommandMessageTarget::AddBool(const bool value, const wxString &name){ void CommandMessageTarget::AddBool(const bool value, const wxString &name){
Update( wxString::Format( "%s%s%s\"%s\"", (mCounts.Last()>0)?", ":"", name, !name.IsEmpty()?":":"",value?"true":"false")); if( name.IsEmpty() )
Update( wxString::Format( "%s\"%s\"", (mCounts.Last()>0)?", ":"", value?"true":"false"));
else
Update( wxString::Format( "%s\"%s\":\"%s\"", (mCounts.Last()>0)?", ":"", name,value?"true":"false"));
mCounts.Last() += 1; mCounts.Last() += 1;
} }
void CommandMessageTarget::AddItem(const double value, const wxString &name){ void CommandMessageTarget::AddItem(const double value, const wxString &name){
Update( wxString::Format( "%s%s%s%g", (mCounts.Last()>0)?", ":"", name, !name.IsEmpty()?":":"",value)); if( name.IsEmpty() )
Update( wxString::Format( "%s%g", (mCounts.Last()>0)?", ":"", value));
else
Update( wxString::Format( "%s\"%s\":%g", (mCounts.Last()>0)?", ":"", name,value));
mCounts.Last() += 1; mCounts.Last() += 1;
} }
void CommandMessageTarget::StartField(const wxString &name){ void CommandMessageTarget::StartField(const wxString &name){
Update( wxString::Format( "%s%s%s", (mCounts.Last()>0)?", ":"", name, !name.IsEmpty()?":":"")); if( name.IsEmpty() )
Update( wxString::Format( "%s", (mCounts.Last()>0)? ", " : ""));
else
Update( wxString::Format( "%s\"%s\":", (mCounts.Last()>0) ?", ":"", name));
mCounts.Last() += 1; mCounts.Last() += 1;
mCounts.push_back( 0 ); mCounts.push_back( 0 );
} }