projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
upgrade to ffmpeg-2.8
[goodguy/history.git]
/
cinelerra-5.0
/
cinelerra
/
mwindow.h
diff --git
a/cinelerra-5.0/cinelerra/mwindow.h
b/cinelerra-5.0/cinelerra/mwindow.h
index 73c5b1bc580ce3deb968f9f680134271da9d50fe..79ef49da3f3cfec8562042adc65a09809cdc93ad 100644
(file)
--- a/
cinelerra-5.0/cinelerra/mwindow.h
+++ b/
cinelerra-5.0/cinelerra/mwindow.h
@@
-31,6
+31,7
@@
#include "awindow.inc"
#include "batchrender.inc"
#include "bcwindowbase.inc"
#include "awindow.inc"
#include "batchrender.inc"
#include "bcwindowbase.inc"
+#include "bdcreate.inc"
#include "brender.inc"
#include "cache.inc"
#include "channel.inc"
#include "brender.inc"
#include "cache.inc"
#include "channel.inc"
@@
-40,6
+41,7
@@
#include "bchash.inc"
#include "devicedvbinput.inc"
#include "devicempeginput.inc"
#include "bchash.inc"
#include "devicedvbinput.inc"
#include "devicempeginput.inc"
+#include "dvdcreate.inc"
#include "edit.inc"
#include "edl.inc"
#include "fileserver.inc"
#include "edit.inc"
#include "edl.inc"
#include "fileserver.inc"
@@
-88,6
+90,7
@@
#include "transportque.inc"
#include "videowindow.inc"
#include "vwindow.inc"
#include "transportque.inc"
#include "videowindow.inc"
#include "vwindow.inc"
+#include "wwindow.inc"
#include "wavecache.inc"
// All entry points for commands except for window locking should be here.
#include "wavecache.inc"
// All entry points for commands except for window locking should be here.
@@
-536,6
+539,7
@@
public:
int64_t samples_in);
int64_t samples_in);
+ CreateBD_Thread *create_bd;
CreateDVD_Thread *create_dvd;
BatchRenderThread *batch_render;
Render *render;
CreateDVD_Thread *create_dvd;
BatchRenderThread *batch_render;
Render *render;
@@
-554,6
+558,9
@@
public:
GWindow *gwindow;
// Tip of the day
TipWindow *twindow;
GWindow *gwindow;
// Tip of the day
TipWindow *twindow;
+// Warning window
+ WWindow *wwindow;
+ void show_warning(int *do_warning, const char *text);
// Levels
LevelWindow *lwindow;
// Lock during creation and destruction of GUI
// Levels
LevelWindow *lwindow;
// Lock during creation and destruction of GUI