eessppeelllloo/veejay
1
0
Fork 0
mirror of https://github.com/game-stop/veejay.git synced 2025-12-13 19:30:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

fallback to old sample edl if loading samplelist edl fails (which happens when veejay is not started in same dir as samplelist)

Browse Source
This commit is contained in:
niels
2015-06-02 23:05:36 +02:00
parent 79715b053c
commit 59d7dbc72f
1 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
veejay-current/veejay-server/libsample/sampleadm.c
View File

@@ -3253,29 +3253,33 @@ int sample_read_edl( sample_info *sample )
{ {
char *files[1]; char *files[1];
int res = 0; int res = 0;
files[0] = strdup(sample->edit_list_file); files[0] = sample->edit_list_file;
if(sample->edit_list)
{ void *old = sample->edit_list;
veejay_msg(VEEJAY_MSG_ERROR, "Cleanup old editlist");
vj_el_free(sample->edit_list); //EDL is stored in CWD, samplelist file can be anywhere. Cannot always load samplelists due to
} // missing EDL files in CWD.
veejay_msg(VEEJAY_MSG_DEBUG, "Loading '%s' from current working directory" , files[0] );
sample->edit_list = vj_el_init_with_args( files,1, sample->edit_list = vj_el_init_with_args( files,1,
__sample_project_settings.flags, __sample_project_settings.flags,
__sample_project_settings.deinterlace, __sample_project_settings.deinterlace,
__sample_project_settings.force, __sample_project_settings.force,
__sample_project_settings.norm, __sample_project_settings.norm,
__sample_project_settings.fmt, __sample_project_settings.fmt,
__sample_project_settings.width, __sample_project_settings.width,
__sample_project_settings.height); __sample_project_settings.height);
if(sample->edit_list) if(sample->edit_list)
{ {
res = 1; res = 1;
sample->soft_edl = 0; sample->soft_edl = 0;
vj_el_free( old );
}
else
{
sample->edit_list = old;
} }
if(files[0])
free(files[0]);
return res; return res;
} }