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

warn about EDL files not beeing loaded from sample

Browse Source
This commit is contained in:
niels
2015-10-23 00:02:56 +02:00
parent 51c0f0f0de
commit 6c2d91de1f
1 changed files with 10 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2996,18 +2996,21 @@ xmlNodePtr ParseSample(xmlDocPtr doc, xmlNodePtr cur, sample_info * skel,void *e
char *chTemp = NULL; char *chTemp = NULL;
xmlNodePtr subs = NULL; xmlNodePtr subs = NULL;
if(!sample_read_edl( skel )) { if(!sample_read_edl( skel ))
skel->edit_list = NULL; {
skel->edit_list = NULL;
} }
if(!skel->edit_list) if(!skel->edit_list)
{ {
veejay_msg(VEEJAY_MSG_DEBUG, "Sample %d has inherited EDL from plain mode", skel->sample_id ); veejay_msg(VEEJAY_MSG_INFO, "Sample %d is using EDL from plain mode", skel->sample_id );
skel->edit_list = el; skel->edit_list = el;
skel->soft_edl = 1; skel->soft_edl = 1;
} else { }
else
{
skel->soft_edl = 0; skel->soft_edl = 0;
veejay_msg(VEEJAY_MSG_DEBUG, "Sample %d has own EDL (%p)", skel->sample_id, el ); veejay_msg(VEEJAY_MSG_INFO, "Sample %d has its own EDL", skel->sample_id, el );
} }
int marker_start = 0, marker_end = 0; int marker_start = 0, marker_end = 0;
@@ -3305,7 +3308,7 @@ int sample_read_edl( sample_info *sample )
//EDL is stored in CWD, samplelist file can be anywhere. Cannot always load samplelists due to //EDL is stored in CWD, samplelist file can be anywhere. Cannot always load samplelists due to
// missing EDL files in CWD. // missing EDL files in CWD.
veejay_msg(VEEJAY_MSG_DEBUG, "Loading '%s' from video sample from current working directory" , files[0] ); 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,
@@ -3328,6 +3331,7 @@ int sample_read_edl( sample_info *sample )
else else
{ {
sample->edit_list = old; sample->edit_list = old;
veejay_msg(VEEJAY_MSG_ERROR, "Error loading '%s' from current working directory", files[0] );
} }
return res; return res;