projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add clip folders, icon margins, fix safe regions, update neophyte, fix folder edl...
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
edl.C
diff --git
a/cinelerra-5.1/cinelerra/edl.C
b/cinelerra-5.1/cinelerra/edl.C
index 4411bf4bd0c652d0a065bb72f85e32ffbb7648f8..ebab4cd7ed3ea496273f600420b2f9995bf4f22b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/edl.C
+++ b/
cinelerra-5.1/cinelerra/edl.C
@@
-1226,7
+1226,7
@@
const char *EDL::get_folder_name(int no)
return !fp ? "" : fp->title;
}
return !fp ? "" : fp->title;
}
-int EDL::new_folder(const char *title)
+int EDL::new_folder(const char *title
, int is_clips
)
{
if( !title[0] ) return 1;
int ret = get_folder_number(title);
{
if( !title[0] ) return 1;
int ret = get_folder_number(title);
@@
-1237,7
+1237,7
@@
int EDL::new_folder(const char *title)
int no = fp->awindow_folder;
if( no >= idx ) idx = no+1;
}
int no = fp->awindow_folder;
if( no >= idx ) idx = no+1;
}
- folders.append(new BinFolder(idx, title));
+ folders.append(new BinFolder(idx,
is_clips,
title));
return 0;
}
return 0;
}
@@
-1402,7
+1402,6
@@
int64_t EDL::get_video_frames()
session->frame_rate);
}
session->frame_rate);
}
-
void EDL::remove_vwindow_edls()
{
for( int i=0; i<total_vwindow_edls(); ++i ) {
void EDL::remove_vwindow_edls()
{
for( int i=0; i<total_vwindow_edls(); ++i ) {