mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanups.

This commit is contained in:
Jonathan Moore Liles 2008-04-20 19:28:59 -05:00
parent 212dc3e3ea
commit 8a927c8876
5 changed files with 41 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Timeline/Loggable.H
View File

@ -39,6 +39,8 @@ class Loggable;
typedef Loggable *(create_func)(Log_Entry &); typedef Loggable *(create_func)(Log_Entry &);
#define LOG_REGISTER_CREATE( class ) \
Loggable::register_create( #class, & class ::create );
#define LOG_CREATE_FUNC( class ) \ #define LOG_CREATE_FUNC( class ) \
static Loggable * \ static Loggable * \

1
Timeline/Region.H
View File

@ -99,6 +99,7 @@ private:
Fade _fade_out; Fade _fade_out;
friend class Track; /* for _clip */ friend class Track; /* for _clip */
protected: protected:
const char *class_name ( void ) { return "Region"; } const char *class_name ( void ) { return "Region"; }

28
Timeline/Track.C
View File

@ -284,6 +284,34 @@ Track::size ( int v )
resize(); resize();
} }
void
Track::add ( Sequence * t )
{
takes->insert( *t, 0 );
if ( ! t->name() )
{
char pat[20];
snprintf( pat, sizeof( pat ), "%d", takes->children() );
t->name( strdup( pat ) );
take_menu->add( t->name() );
}
}
void
Track::remove ( Sequence *t )
{
takes->remove( t );
// take_menu->remove( t->name() );
}
void
Track::remove ( Control_Sequence *t )
{
control->remove( t );
}
void void
Track::track ( Sequence * t ) Track::track ( Sequence * t )
{ {

23
Timeline/Track.H
View File

@ -162,6 +162,9 @@ public:
LOG_CREATE_FUNC( Track ); LOG_CREATE_FUNC( Track );
void add ( Control_Sequence *t ); void add ( Control_Sequence *t );
void add ( Sequence *t );
void remove ( Sequence *t );
void remove ( Control_Sequence *t );
int size ( void ) const { return _size; } int size ( void ) const { return _size; }
@ -205,26 +208,6 @@ public:
void track( Sequence * t ); void track( Sequence * t );
Sequence * track ( void ) { return _track; } Sequence * track ( void ) { return _track; }
void add ( Sequence * t )
{
takes->insert( *t, 0 );
if ( ! t->name() )
{
char pat[20];
snprintf( pat, sizeof( pat ), "%d", takes->children() );
t->name( strdup( pat ) );
take_menu->add( t->name() );
}
}
void remote ( Sequence *t )
{
takes->remove( t );
// take_menu->remove( t->name() );
}
void draw ( void ); void draw ( void );
int handle ( int m ); int handle ( int m );

14
Timeline/main.C
View File

@ -73,13 +73,13 @@ main ( int argc, char **argv )
// Fl::scheme( "gtk+" ); // Fl::scheme( "gtk+" );
/* welcome to C++ */ /* welcome to C++ */
Loggable::register_create( "Region", &Region::create ); LOG_REGISTER_CREATE( Region );
Loggable::register_create( "Tempo_Point", &Tempo_Point::create ); LOG_REGISTER_CREATE( Time_Point );
Loggable::register_create( "Time_Point", &Time_Point::create ); LOG_REGISTER_CREATE( Tempo_Point );
Loggable::register_create( "Control_Point", &Control_Point::create ); LOG_REGISTER_CREATE( Control_Point );
Loggable::register_create( "Track", &Track::create ); LOG_REGISTER_CREATE( Track );
Loggable::register_create( "Audio_Sequence", &Audio_Sequence::create ); LOG_REGISTER_CREATE( Audio_Sequence );
Loggable::register_create( "Control_Sequence", &Control_Sequence::create ); LOG_REGISTER_CREATE( Control_Sequence );
/* TODO: change to seesion dir */ /* TODO: change to seesion dir */