projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
collect_proxy nested_clip/edl fixes
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
awindowgui.h
diff --git
a/cinelerra-5.1/cinelerra/awindowgui.h
b/cinelerra-5.1/cinelerra/awindowgui.h
index 6ba8d504cab7fa8e473e227dbfd0947be5791a54..8584049de27b3e37d829809fffef8c9c599f6aa4 100644
(file)
--- a/
cinelerra-5.1/cinelerra/awindowgui.h
+++ b/
cinelerra-5.1/cinelerra/awindowgui.h
@@
-165,6
+165,7
@@
public:
AssetPicon *picon;
VFrame *temp;
int64_t length;
AssetPicon *picon;
VFrame *temp;
int64_t length;
+ int broken;
VFrame *frame();
int64_t set_seq_no(int64_t no);
VFrame *frame();
int64_t set_seq_no(int64_t no);
@@
-270,7
+271,7
@@
public:
int drag_stop();
// Collect items into the drag vectors of MainSession
void collect_assets(int proxy=0);
int drag_stop();
// Collect items into the drag vectors of MainSession
void collect_assets(int proxy=0);
- EDL *collect_proxy(
Indexable *indexable
);
+ EDL *collect_proxy(
Asset *asset
);
void create_persistent_folder(ArrayList<BC_ListBoxItem*> *output,
int do_audio,
int do_video,
void create_persistent_folder(ArrayList<BC_ListBoxItem*> *output,
int do_audio,
int do_video,