Browse Source

Go back to using long names for properties.

tags/non-daw-v1.1.0
Jonathan Moore Liles 17 years ago
parent
commit
9d498d7eca
5 changed files with 28 additions and 28 deletions
  1. +2
    -2
      Timeline/Annotation_Sequence.H
  2. +4
    -4
      Timeline/Audio_Sequence.C
  3. +4
    -4
      Timeline/Control_Sequence.C
  4. +4
    -4
      Timeline/Sequence_Widget.H
  5. +14
    -14
      Timeline/Track.H

+ 2
- 2
Timeline/Annotation_Sequence.H View File

@@ -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 );


+ 4
- 4
Timeline/Audio_Sequence.C View File

@@ -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 );
}
}


+ 4
- 4
Timeline/Control_Sequence.C View File

@@ -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 );

}


+ 4
- 4
Timeline/Sequence_Widget.H View File

@@ -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 );


+ 14
- 14
Timeline/Track.H View File

@@ -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 */


Loading…
Cancel
Save