Timeline: Symlink to drag'n'drop'd files from the sources/ directory rather than including the absolute path in the journal.

This commit is contained in:
Jonathan Moore Liles 2012-04-02 21:30:56 -07:00
parent 9896970ed0
commit eda11f56fe
1 changed files with 50 additions and 4 deletions

View File

@ -20,6 +20,8 @@
/* An Audio_Sequence is a sequence of Audio_Regions. Takes and 'track /* An Audio_Sequence is a sequence of Audio_Regions. Takes and 'track
* contents' consist of these objects */ * contents' consist of these objects */
#include "debug.h"
#include <sys/time.h> #include <sys/time.h>
#include <FL/fl_ask.H> #include <FL/fl_ask.H>
@ -34,6 +36,8 @@ using namespace std;
#include "Engine/Audio_File.H" // for ::from_file() #include "Engine/Audio_File.H" // for ::from_file()
#include "Transport.H" // for locate() #include "Transport.H" // for locate()
#include <errno.h>
Audio_Sequence::Audio_Sequence ( Track *track, const char *name ) : Sequence( track ) Audio_Sequence::Audio_Sequence ( Track *track, const char *name ) : Sequence( track )
@ -278,15 +282,56 @@ Audio_Sequence::handle ( int m )
fl_cursor( FL_CURSOR_WAIT ); fl_cursor( FL_CURSOR_WAIT );
Fl::check(); Fl::check();
Audio_File *c = Audio_File::from_file( file ); char *t = strdup( file );
char *filebase = strdup( basename( t ) );
free( t );
char *s = 0;
int i = 0;
for ( ; ; i++ )
{
if ( i )
{
free( s );
asprintf( &s, "sources/%s-%i", filebase, i );
}
else
asprintf( &s, "sources/%s", filebase );
DMESSAGE( "Symlink %s -> %s", file, s );
if ( symlink( file, s ) == 0 )
break;
if ( errno != EEXIST )
{
WARNING( "Failed to create symlink: %s", strerror( errno ) );
break;
}
}
Audio_File *c = Audio_File::from_file( basename( s ) );
free( s );
free( filebase );
fl_cursor( FL_CURSOR_DEFAULT ); fl_cursor( FL_CURSOR_DEFAULT );
Fl::check();
if ( ! c ) if ( ! c || c->dummy() )
{ {
fl_alert( "Could not import file \"%s\": Unsupported file type.", file ); fl_alert( "Could not import file \"%s\"", file );
printf( "could not open file\n" );
free( file ); free( file );
if ( c )
{
delete c;
c = NULL;
}
return 0; return 0;
} }
@ -296,6 +341,7 @@ Audio_Sequence::handle ( int m )
new Audio_Region( c, this, timeline->xoffset + timeline->x_to_ts( Fl::event_x() - x() ) ); new Audio_Region( c, this, timeline->xoffset + timeline->x_to_ts( Fl::event_x() - x() ) );
redraw(); redraw();
return 1; return 1;
} }
default: default: