From 9d498d7eca0a2ca96318df6ba41c9e25fbff703d Mon Sep 17 00:00:00 2001 From: Jonathan Moore Liles Date: Wed, 7 May 2008 10:28:57 -0500 Subject: [PATCH] Go back to using long names for properties. --- Timeline/Annotation_Sequence.H | 4 ++-- Timeline/Audio_Sequence.C | 8 ++++---- Timeline/Control_Sequence.C | 8 ++++---- Timeline/Sequence_Widget.H | 8 ++++---- Timeline/Track.H | 28 ++++++++++++++-------------- 5 files changed, 28 insertions(+), 28 deletions(-) diff --git a/Timeline/Annotation_Sequence.H b/Timeline/Annotation_Sequence.H index 01fe23c..4ff7219 100644 --- a/Timeline/Annotation_Sequence.H +++ b/Timeline/Annotation_Sequence.H @@ -33,7 +33,7 @@ protected: virtual void get ( Log_Entry &e ) const { - e.add( ":t", _track ); + e.add( ":track", _track ); } void @@ -45,7 +45,7 @@ protected: e.get( i, &s, &v ); - if ( ! strcmp( ":t", s ) ) + if ( ! strcmp( ":track", s ) ) { int i; sscanf( v, "%X", &i ); diff --git a/Timeline/Audio_Sequence.C b/Timeline/Audio_Sequence.C index 5041a92..f1adc05 100644 --- a/Timeline/Audio_Sequence.C +++ b/Timeline/Audio_Sequence.C @@ -57,8 +57,8 @@ Audio_Sequence::capture ( void ) const void Audio_Sequence::get ( Log_Entry &e ) const { - e.add( ":t", _track ); - e.add( ":n", name() ); + e.add( ":track", _track ); + e.add( ":name", name() ); } void @@ -70,7 +70,7 @@ Audio_Sequence::set ( Log_Entry &e ) e.get( i, &s, &v ); - if ( ! strcmp( ":t", s ) ) + if ( ! strcmp( ":track", s ) ) { int i; sscanf( v, "%X", &i ); @@ -80,7 +80,7 @@ Audio_Sequence::set ( Log_Entry &e ) t->track( this ); } - else if ( ! strcmp( ":n", s ) ) + else if ( ! strcmp( ":name", s ) ) name( v ); } } diff --git a/Timeline/Control_Sequence.C b/Timeline/Control_Sequence.C index 4e274cc..5396dd8 100644 --- a/Timeline/Control_Sequence.C +++ b/Timeline/Control_Sequence.C @@ -62,8 +62,8 @@ Control_Sequence::init ( void ) void Control_Sequence::get ( Log_Entry &e ) const { - e.add( ":t", _track ); - e.add( ":n", name() ); + e.add( ":track", _track ); + e.add( ":name", name() ); } void @@ -75,7 +75,7 @@ Control_Sequence::set ( Log_Entry &e ) e.get( i, &s, &v ); - if ( ! strcmp( ":t", s ) ) + if ( ! strcmp( ":track", s ) ) { int i; sscanf( v, "%X", &i ); @@ -85,7 +85,7 @@ Control_Sequence::set ( Log_Entry &e ) t->add( this ); } - else if ( ! strcmp( ":n", s ) ) + else if ( ! strcmp( ":name", s ) ) name( v ); } diff --git a/Timeline/Sequence_Widget.H b/Timeline/Sequence_Widget.H index 7df0da7..26d956d 100644 --- a/Timeline/Sequence_Widget.H +++ b/Timeline/Sequence_Widget.H @@ -85,8 +85,8 @@ protected: e.add( ":x", _r->offset ); e.add( ":l", _r->start ); e.add( ":r", _r->end ); - e.add( ":t", _track ); - e.add( ":s", selected() ); + e.add( ":sequence", _track ); + e.add( ":selected", selected() ); } virtual void @@ -104,14 +104,14 @@ protected: _r->start = atoll( v ); else if ( ! strcmp( s, ":r" ) ) _r->end = atoll( v ); - else if ( ! strcmp( s, ":s" ) ) + else if ( ! strcmp( s, ":selected" ) ) { if ( atoi( v ) ) select(); else deselect(); } - else if ( ! strcmp( s, ":t" ) ) + else if ( ! strcmp( s, ":sequence" ) ) { int i; sscanf( v, "%X", &i ); diff --git a/Timeline/Track.H b/Timeline/Track.H index fb04920..040f48a 100644 --- a/Timeline/Track.H +++ b/Timeline/Track.H @@ -134,28 +134,28 @@ public: e.get( i, &s, &v ); - if ( ! strcmp( s, ":h" ) ) + if ( ! strcmp( s, ":height" ) ) { size( atoi( v ) ); // Fl_Widget::size( w(), height() ); resize(); } - else if ( ! strcmp( s, ":s" ) ) + else if ( ! strcmp( s, ":selected" ) ) _selected = atoi( v ); // else if ( ! strcmp( s, ":armed" - else if ( ! strcmp( s, ":n" ) ) + else if ( ! strcmp( s, ":name" ) ) name( v ); - else if ( ! strcmp( s, ":i" ) ) + else if ( ! strcmp( s, ":inputs" ) ) configure_inputs( atoi( v ) ); - else if ( ! strcmp( s, ":o" ) ) + else if ( ! strcmp( s, ":outputs" ) ) configure_outputs( atoi( v ) ); - else if ( ! strcmp( s, ":c" ) ) + else if ( ! strcmp( s, ":color" ) ) { color( (Fl_Color)atoll( v ) ); redraw(); } - else if ( ! strcmp( s, ":t" ) ) + else if ( ! strcmp( s, ":sequence" ) ) { int i; sscanf( v, "%X", &i ); @@ -184,13 +184,13 @@ public: virtual void get ( Log_Entry &e ) const { - e.add( ":n", _name ); - e.add( ":t", track() ); - e.add( ":s", _selected ); - e.add( ":h", size() ); - e.add( ":i", input.size() ); - e.add( ":o", output.size() ); - e.add( ":c", (unsigned long)color()); + e.add( ":name", _name ); + e.add( ":sequence", track() ); + e.add( ":selected", _selected ); + e.add( ":height", size() ); + e.add( ":inputs", input.size() ); + e.add( ":outputs", output.size() ); + e.add( ":color", (unsigned long)color()); } /* for loggable */