projects
/
goodguy
/
cinelerra.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework proxy scaler, fix crop-gui coord, video_data tweak for proxy_format
[goodguy/cinelerra.git]
/
cinelerra-5.1
/
cinelerra
/
mwindow.h
diff --git
a/cinelerra-5.1/cinelerra/mwindow.h
b/cinelerra-5.1/cinelerra/mwindow.h
index 24d757902c67307322892b7cced2e7be68aefc21..6eb384cec586e71c38afed90a7e20c0767f1f515 100644
(file)
--- a/
cinelerra-5.1/cinelerra/mwindow.h
+++ b/
cinelerra-5.1/cinelerra/mwindow.h
@@
-88,7
+88,6
@@
#include "thread.h"
#include "threadloader.inc"
#include "timebar.inc"
#include "thread.h"
#include "threadloader.inc"
#include "timebar.inc"
-#include "timebomb.h"
#include "tipwindow.inc"
#include "track.inc"
#include "tracking.inc"
#include "tipwindow.inc"
#include "track.inc"
#include "tracking.inc"
@@
-286,7
+285,7
@@
public:
int zoom_in_t();
void split_x();
void split_y();
int zoom_in_t();
void split_x();
void split_y();
- void crop_video();
+ void crop_video(
int mode
);
void update_plugins();
// Call after every edit operation
void save_backup();
void update_plugins();
// Call after every edit operation
void save_backup();
@@
-523,9
+522,8
@@
public:
int modify_pluginhandles();
void finish_modify_handles();
void rescale_proxy(EDL *clip, int orig_scale, int new_scale);
int modify_pluginhandles();
void finish_modify_handles();
void rescale_proxy(EDL *clip, int orig_scale, int new_scale);
- void add_proxy(int use_scaler,
- ArrayList<Indexable*> *orig_assets,
- ArrayList<Indexable*> *proxy_assets);
+ void add_proxy(ArrayList<Indexable*> *orig_assets,
+ ArrayList<Indexable*> *proxy_assets);
int render_proxy(ArrayList<Indexable *> &new_idxbls);
void beep(double freq, double secs, double gain);
int enable_proxy();
int render_proxy(ArrayList<Indexable *> &new_idxbls);
void beep(double freq, double secs, double gain);
int enable_proxy();