Autres/audacity
1
0
Fork 0
mirror of https://github.com/cookiengineer/audacity synced 2025-10-21 22:12:58 +02:00
Code Issues Releases Wiki Activity

Less verbose LISPy output of GetInfo: Type=Labels

Browse Source
This commit is contained in:
James Crook
2018-02-15 16:33:56 +00:00
committed by Paul Licameli
parent a2eb8cdae3
commit b4f7f485a8
3 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/commands/CommandTargets.cpp
View File

@@ -56,12 +56,10 @@ void CommandMessageTarget::EndStruct(){
Update( " }" ); Update( " }" );
} }
void CommandMessageTarget::AddItem(const wxString &value, const wxString &name){ void CommandMessageTarget::AddItem(const wxString &value, const wxString &name){
wxString Temp = value;
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;
Temp.Replace("\"", "\\\"");// escape spaces. Update( wxString::Format( "%s%s%s%s\"%s\"", (mCounts.Last()>0)?", ":"", Padding, name, !name.IsEmpty()?":":"",Escaped(value)));
Update( wxString::Format( "%s%s%s%s\"%s\"", (mCounts.Last()>0)?", ":"", Padding, name, !name.IsEmpty()?":":"",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){
@@ -88,13 +86,19 @@ void CommandMessageTarget::EndField(){
void CommandMessageTarget::Flush(){ void CommandMessageTarget::Flush(){
} }
wxString CommandMessageTarget::Escaped( const wxString & str){
wxString Temp = str;
Temp.Replace( "\"", "\\\"");
return Temp;
}
void LispyCommandMessageTarget::StartArray() void LispyCommandMessageTarget::StartArray()
{ {
wxString Padding; wxString Padding;
Padding.Pad( mCounts.GetCount() *2 -2); Padding.Pad( mCounts.GetCount() *2 -2);
Update( wxString::Format( "\n%s(", Padding )); Update( wxString::Format( "\n%s(list ", Padding ));
mCounts.Last() += 1; mCounts.Last() += 1;
mCounts.push_back( 0 ); mCounts.push_back( 0 );
} }
@@ -121,9 +125,9 @@ void LispyCommandMessageTarget::EndStruct(){
void LispyCommandMessageTarget::AddItem(const wxString &value, const wxString &name){ void LispyCommandMessageTarget::AddItem(const wxString &value, const wxString &name){
wxString Padding = ""; wxString Padding = "";
if( name.IsEmpty() ) if( name.IsEmpty() )
Update( wxString::Format( "%s%s\"%s\"", (mCounts.Last()>0)?" ":"", Padding, value)); Update( wxString::Format( "%s%s\"%s\"", (mCounts.Last()>0)?" ":"", Padding, Escaped(value)));
else else
Update( wxString::Format( "%s%s(%s \"%s\")", (mCounts.Last()>0)?" ":"", Padding, name, value)); Update( wxString::Format( "%s%s(%s \"%s\")", (mCounts.Last()>0)?" ":"", Padding, name, Escaped(value)));
mCounts.Last() += 1; mCounts.Last() += 1;
} }
void LispyCommandMessageTarget::AddBool(const bool value, const wxString &name){ void LispyCommandMessageTarget::AddBool(const bool value, const wxString &name){
@@ -193,7 +197,7 @@ void BriefCommandMessageTarget::EndStruct(){
} }
void BriefCommandMessageTarget::AddItem(const wxString &value, const wxString &name){ void BriefCommandMessageTarget::AddItem(const wxString &value, const wxString &name){
if( mCounts.GetCount() <= 3 ) if( mCounts.GetCount() <= 3 )
Update( wxString::Format( "%s\"%s\"", (mCounts.Last()>0)?" ":"",value)); Update( wxString::Format( "%s\"%s\"", (mCounts.Last()>0)?" ":"",Escaped(value)));
mCounts.Last() += 1; mCounts.Last() += 1;
} }
void BriefCommandMessageTarget::AddBool(const bool value, const wxString &name){ void BriefCommandMessageTarget::AddBool(const bool value, const wxString &name){

1
src/commands/CommandTargets.h
View File

@@ -88,6 +88,7 @@ public:
virtual void StartField( const wxString &name="" ); virtual void StartField( const wxString &name="" );
virtual void EndField( ); virtual void EndField( );
virtual void Flush(); virtual void Flush();
wxString Escaped( const wxString & str);
wxArrayInt mCounts; wxArrayInt mCounts;
}; };

15
src/commands/GetInfoCommand.cpp
View File

@@ -336,6 +336,8 @@ bool GetInfoCommand::SendLabels(const CommandContext &context)
LabelTrack *labelTrack = static_cast<LabelTrack*>(t); LabelTrack *labelTrack = static_cast<LabelTrack*>(t);
if( labelTrack ) if( labelTrack )
{ {
#ifdef VERBOSE_LABELS_FORMATTING
for (int nn = 0; nn< (int)labelTrack->mLabels.size(); nn++) { for (int nn = 0; nn< (int)labelTrack->mLabels.size(); nn++) {
const auto &label = labelTrack->mLabels[nn]; const auto &label = labelTrack->mLabels[nn];
context.StartStruct(); context.StartStruct();
@@ -345,6 +347,19 @@ bool GetInfoCommand::SendLabels(const CommandContext &context)
context.AddItem( label.title, "text" ); context.AddItem( label.title, "text" );
context.EndStruct(); context.EndStruct();
} }
#else
context.AddItem( (double)i ); // Track number.
context.StartArray();
for (int nn = 0; nn< (int)labelTrack->mLabels.size(); nn++) {
const auto &label = labelTrack->mLabels[nn];
context.StartArray();
context.AddItem( label.getT0() ); // start
context.AddItem( label.getT1() ); // end
context.AddItem( label.title ); //text.
context.EndArray();
}
context.EndArray();
#endif
} }
} }
t = iter.Next(); t = iter.Next();