projects
/
goodguy
/
history.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
add olaf's neophyte update, add binfolder apply btn
[goodguy/history.git]
/
cinelerra-5.1
/
cinelerra
/
zwindowgui.C
diff --git
a/cinelerra-5.1/cinelerra/zwindowgui.C
b/cinelerra-5.1/cinelerra/zwindowgui.C
index 46208af42ca085f91643661534cd4315e9aff7ef..bada1625e68e7fff709ccd62edaa0ead71857325 100644
(file)
--- a/
cinelerra-5.1/cinelerra/zwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/zwindowgui.C
@@
-32,17
+32,14
@@
#include "mwindow.h"
#include "mwindowgui.h"
#include "playbackengine.h"
#include "mwindow.h"
#include "mwindowgui.h"
#include "playbackengine.h"
-#include "playtransport.h"
-#include "renderengine.h"
#include "theme.h"
#include "tracks.h"
#include "theme.h"
#include "tracks.h"
-#include "transportque.h"
#include "zwindow.h"
#include "zwindowgui.h"
ZWindowGUI::ZWindowGUI(MWindow *mwindow, ZWindow *zwindow, Mixer *mixer)
#include "zwindow.h"
#include "zwindowgui.h"
ZWindowGUI::ZWindowGUI(MWindow *mwindow, ZWindow *zwindow, Mixer *mixer)
- : BC_Window(
mixer
->title, mixer->x, mixer->y, mixer->w, mixer->h,
- 100,
100
, 1, 1, 0)
+ : BC_Window(
zwindow
->title, mixer->x, mixer->y, mixer->w, mixer->h,
+ 100,
75
, 1, 1, 0)
{
this->mwindow = mwindow;
this->zwindow = zwindow;
{
this->mwindow = mwindow;
this->zwindow = zwindow;
@@
-79,16
+76,13
@@
int ZWindowGUI::resize_event(int w, int h)
BC_WindowBase::resize_event(w, h);
return 1;
}
BC_WindowBase::resize_event(w, h);
return 1;
}
-
int ZWindowGUI::translation_event()
{
int ZWindowGUI::translation_event()
{
- zwindow->reposition(get_x(), get_y(), get_w(), get_h());
- return 0;
+ return resize_event(get_w(),get_h());
}
int ZWindowGUI::close_event()
{
}
int ZWindowGUI::close_event()
{
- mwindow->del_mixer(zwindow);
set_done(0);
return 1;
}
set_done(0);
return 1;
}
@@
-148,7
+142,7
@@
int ZWindowGUI::button_press_event()
local_session->set_selectionend(end);
local_session->set_inpoint(start);
local_session->set_outpoint(end);
local_session->set_selectionend(end);
local_session->set_inpoint(start);
local_session->set_outpoint(end);
- mwindow->overwrite(zwindow->edl);
+ mwindow->overwrite(zwindow->edl
, 0
);
local_session->set_inpoint(orig_inpoint);
local_session->set_outpoint(orig_outpoint);
mwindow->gui->update_timebar(1);
local_session->set_inpoint(orig_inpoint);
local_session->set_outpoint(orig_outpoint);
mwindow->gui->update_timebar(1);