projects
/
goodguy
/
cinelerra.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
b78b166
)
version update, fix vaapi spelling, zoom fixes
2019-11
author
Good Guy
<good1.2guy@gmail.com>
Sat, 30 Nov 2019 20:33:36 +0000
(13:33 -0700)
committer
Good Guy
<good1.2guy@gmail.com>
Sat, 30 Nov 2019 20:33:36 +0000
(13:33 -0700)
13 files changed:
cinelerra-5.1/blds/PKGBUILD
patch
|
blob
|
history
cinelerra-5.1/blds/bld_prepare.sh
patch
|
blob
|
history
cinelerra-5.1/blds/cinelerra.spec
patch
|
blob
|
history
cinelerra-5.1/blds/debian/changelog
patch
|
blob
|
history
cinelerra-5.1/blds/debian/control
patch
|
blob
|
history
cinelerra-5.1/cinelerra/canvas.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/canvas.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/cpanel.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/cwindowgui.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/cwindowgui.h
patch
|
blob
|
history
cinelerra-5.1/cinelerra/vwindowgui.C
patch
|
blob
|
history
cinelerra-5.1/cinelerra/zwindowgui.C
patch
|
blob
|
history
cinelerra-5.1/configure.ac
patch
|
blob
|
history
diff --git
a/cinelerra-5.1/blds/PKGBUILD
b/cinelerra-5.1/blds/PKGBUILD
index b70f7a2bd233fecb3b9d45ad9876840ebe2798a3..ee437220638d2fae6dc3bf78aa074760cd555f29 100644
(file)
--- a/
cinelerra-5.1/blds/PKGBUILD
+++ b/
cinelerra-5.1/blds/PKGBUILD
@@
-1,7
+1,7
@@
# Maintainer: goodguy <lists.cinelerra-gg.org>
pkgname=cin
pkgver=5.1
# Maintainer: goodguy <lists.cinelerra-gg.org>
pkgname=cin
pkgver=5.1
-pkgrel=20191
031
+pkgrel=20191
130
pkgdesc="Cinelerra git://git.cinelerra-gg.org/goodguy/cinelerra.git ($pkgrel)"
arch=('x86_64')
url="https://www.cinelerra-gg.org"
pkgdesc="Cinelerra git://git.cinelerra-gg.org/goodguy/cinelerra.git ($pkgrel)"
arch=('x86_64')
url="https://www.cinelerra-gg.org"
diff --git
a/cinelerra-5.1/blds/bld_prepare.sh
b/cinelerra-5.1/blds/bld_prepare.sh
index 0064bdfb758268661c3600fe99afa780a973b807..61e0950068cca20b950624f52daec53ca37df4dc 100755
(executable)
--- a/
cinelerra-5.1/blds/bld_prepare.sh
+++ b/
cinelerra-5.1/blds/bld_prepare.sh
@@
-35,9
+35,9
@@
case "$dir" in
yum -y install /tmp/$yasm
rm -f /tmp/$yasm
;;
yum -y install /tmp/$yasm
rm -f /tmp/$yasm
;;
-#"fedora3
0
")
+#"fedora3
*
")
# dnf group install "Development Tools"
# dnf group install "Development Tools"
-# ... lzma-sdk-devel libtool ...
+# ...
rpm-build
lzma-sdk-devel libtool ...
"fedora")
dnf group install "Development Tools"
dnf -y --best --allowerasing \
"fedora")
dnf group install "Development Tools"
dnf -y --best --allowerasing \
diff --git
a/cinelerra-5.1/blds/cinelerra.spec
b/cinelerra-5.1/blds/cinelerra.spec
index cc2ce3795fdbfdf9e76b5fc2e766110168972ceb..6b36719525c0cacb456d679e818f2085dc4e2008 100644
(file)
--- a/
cinelerra-5.1/blds/cinelerra.spec
+++ b/
cinelerra-5.1/blds/cinelerra.spec
@@
-1,4
+1,4
@@
-%define ver 20191
031
+%define ver 20191
130
%define cin cinelerra
Summary: Multimedia Editing and construction
%define cin cinelerra
Summary: Multimedia Editing and construction
diff --git
a/cinelerra-5.1/blds/debian/changelog
b/cinelerra-5.1/blds/debian/changelog
index 586a0f69db9d67808232a880fc9ff15db433459d..7f6529e73a369b484a742a30ee9c05cba0a98598 100644
(file)
--- a/
cinelerra-5.1/blds/debian/changelog
+++ b/
cinelerra-5.1/blds/debian/changelog
@@
-1,4
+1,4
@@
-cin (1:5.1.20191
031
) unstable; urgency=low
+cin (1:5.1.20191
130
) unstable; urgency=low
[ guy goode ]
[ guy goode ]
diff --git
a/cinelerra-5.1/blds/debian/control
b/cinelerra-5.1/blds/debian/control
index fc7378357a4f1a8d67fcbc8c4fb1c53037579a02..5f08a0a5f5266d8b043f64bb564d7b78182dfd60 100644
(file)
--- a/
cinelerra-5.1/blds/debian/control
+++ b/
cinelerra-5.1/blds/debian/control
@@
-1,7
+1,7
@@
Source: cin
Section: video
Priority: optional
Source: cin
Section: video
Priority: optional
-Standards-Version: 5.1.20191
031
+Standards-Version: 5.1.20191
130
Maintainer: mailing list <cin@lists.cinelerra-gg.org>
Homepage: https://www.cinelerra-gg.org/
Build-Depends:
Maintainer: mailing list <cin@lists.cinelerra-gg.org>
Homepage: https://www.cinelerra-gg.org/
Build-Depends:
diff --git
a/cinelerra-5.1/cinelerra/canvas.C
b/cinelerra-5.1/cinelerra/canvas.C
index e3e1b0f3381d2d826fe1a16f7b3aa7ce0df1ce05..17d5a42b5e952de5b515ccdc1650bde8e76b2484 100644
(file)
--- a/
cinelerra-5.1/cinelerra/canvas.C
+++ b/
cinelerra-5.1/cinelerra/canvas.C
@@
-692,19
+692,17
@@
int Canvas::button_press_event_base(BC_WindowBase *caller)
int Canvas::keypress_event(BC_WindowBase *caller)
{
int key = caller->get_keypress();
int Canvas::keypress_event(BC_WindowBase *caller)
{
int key = caller->get_keypress();
- int on = -1;
switch( key ) {
switch( key ) {
- case 'f':
- on = get_fullscreen() ? 0 : 1;
- break;
+ case 'f': {
+ int on = get_fullscreen() ? 0 : 1;
+ set_fullscreen(on, 1);
+ break; }
case ESC:
case ESC:
-
on = 0
;
+
set_fullscreen(0, 1)
;
break;
default:
return 0;
}
break;
default:
return 0;
}
- if( on >= 0 )
- set_fullscreen(on);
return 1;
}
return 1;
}
@@
-931,7
+929,7
@@
int CanvasSubWindowItem::handle_event()
{
// It isn't a problem to delete the canvas from in here because the event
// dispatcher is the canvas subwindow.
{
// It isn't a problem to delete the canvas from in here because the event
// dispatcher is the canvas subwindow.
- canvas->set_fullscreen(0);
+ canvas->set_fullscreen(0
, 1
);
return 1;
}
return 1;
}
@@
-1115,7
+1113,7
@@
CanvasFullScreenItem::CanvasFullScreenItem(Canvas *canvas)
}
int CanvasFullScreenItem::handle_event()
{
}
int CanvasFullScreenItem::handle_event()
{
- canvas->set_fullscreen(1);
+ canvas->set_fullscreen(1
, 1
);
return 1;
}
return 1;
}
diff --git
a/cinelerra-5.1/cinelerra/canvas.h
b/cinelerra-5.1/cinelerra/canvas.h
index 1ea04448351575048d54faaa753a6b4c85a9db88..6b336052ae5c7b46613e85170c81e17f179bfb40 100644
(file)
--- a/
cinelerra-5.1/cinelerra/canvas.h
+++ b/
cinelerra-5.1/cinelerra/canvas.h
@@
-80,7
+80,7
@@
public:
virtual int get_cwindow_controls() { return 0; }
virtual int get_fullscreen();
virtual int get_clear_color();
virtual int get_cwindow_controls() { return 0; }
virtual int get_fullscreen();
virtual int get_clear_color();
- virtual int set_fullscreen(int on, int unlock
=1
);
+ virtual int set_fullscreen(int on, int unlock);
int cursor_leave_event_base(BC_WindowBase *caller);
int cursor_enter_event_base(BC_WindowBase *caller);
int cursor_leave_event_base(BC_WindowBase *caller);
int cursor_enter_event_base(BC_WindowBase *caller);
diff --git
a/cinelerra-5.1/cinelerra/cpanel.C
b/cinelerra-5.1/cinelerra/cpanel.C
index 4099397ed5361176bb10e622a69102fd69a46b49..5f8dd4d7c048ba179266cc81b2f30bc950219284 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cpanel.C
+++ b/
cinelerra-5.1/cinelerra/cpanel.C
@@
-132,6
+132,7
@@
void CPanel::set_operation(int value)
operation[CWINDOW_CAMERA]->get_value() ||
operation[CWINDOW_PROJECTOR]->get_value() ) {
cpanel_zoom->set_shown(1);
operation[CWINDOW_CAMERA]->get_value() ||
operation[CWINDOW_PROJECTOR]->get_value() ) {
cpanel_zoom->set_shown(1);
+ subwindow->update_canvas(0);
}
else
cpanel_zoom->set_shown(0);
}
else
cpanel_zoom->set_shown(0);
diff --git
a/cinelerra-5.1/cinelerra/cwindowgui.C
b/cinelerra-5.1/cinelerra/cwindowgui.C
index 567c9338c8f129dbd95995eae96831b6c70e88ef..22e977bdf3b3ef28e973f726f8bb748c386a5229 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/cwindowgui.C
@@
-442,12
+442,13
@@
int CWindowGUI::keypress_event()
keyboard_zoomout();
result = 1;
break;
keyboard_zoomout();
result = 1;
break;
- case 'f':
- canvas->set_fullscreen(canvas->get_fullscreen() ? 0 : 1);
+ case 'f': {
+ int on = canvas->get_fullscreen() ? 0 : 1;
+ canvas->set_fullscreen(on, 1);
result = 1;
result = 1;
- break;
+ break;
}
case ESC:
case ESC:
- canvas->set_fullscreen(0);
+ canvas->set_fullscreen(0
, 1
);
result = 1;
break;
case 'x':
result = 1;
break;
case 'x':
@@
-999,19
+1000,19
@@
void CWindowCanvas::update_zoom(int x, int y, float zoom)
mwindow->edl->session->cwindow_scrollbars = use_scrollbars;
}
mwindow->edl->session->cwindow_scrollbars = use_scrollbars;
}
-int CWindowCanvas::set_fullscreen(int on)
+int CWindowCanvas::set_fullscreen(int on
, int unlock
)
{
int ret = 0;
if( on && !get_fullscreen() ) {
last_xscroll = get_xscroll();
last_yscroll = get_yscroll();
last_zoom = get_zoom();
{
int ret = 0;
if( on && !get_fullscreen() ) {
last_xscroll = get_xscroll();
last_yscroll = get_yscroll();
last_zoom = get_zoom();
- Canvas::set_fullscreen(1);
+ Canvas::set_fullscreen(1
, unlock
);
zoom_auto();
ret = 1;
}
if( !on && get_fullscreen() ) {
zoom_auto();
ret = 1;
}
if( !on && get_fullscreen() ) {
- Canvas::set_fullscreen(0);
+ Canvas::set_fullscreen(0
, unlock
);
gui->zoom_panel->update(get_zoom());
update_zoom(last_xscroll, last_yscroll, last_zoom);
gui->update_canvas();
gui->zoom_panel->update(get_zoom());
update_zoom(last_xscroll, last_yscroll, last_zoom);
gui->update_canvas();
diff --git
a/cinelerra-5.1/cinelerra/cwindowgui.h
b/cinelerra-5.1/cinelerra/cwindowgui.h
index f58ac69afef076cd4e8de14a1755288ee48ca008..7dbfde86142c4d7e9157965069eade20b1fec116 100644
(file)
--- a/
cinelerra-5.1/cinelerra/cwindowgui.h
+++ b/
cinelerra-5.1/cinelerra/cwindowgui.h
@@
-319,7
+319,7
@@
public:
void reset_camera();
void reset_projector();
void draw_crophandle(int x, int y);
void reset_camera();
void reset_projector();
void draw_crophandle(int x, int y);
- int set_fullscreen(int on);
+ int set_fullscreen(int on
, int unlock
);
// Draw the camera/projector overlay in different colors.
void draw_outlines(int do_camera);
// Draw the camera/projector overlay in different colors.
void draw_outlines(int do_camera);
diff --git
a/cinelerra-5.1/cinelerra/vwindowgui.C
b/cinelerra-5.1/cinelerra/vwindowgui.C
index 7c1d51e0a0df80a702a4fd34d5cc526055f4eed1..9c29ec997890eb21bcdd92ec752cc1365a2ba26b 100644
(file)
--- a/
cinelerra-5.1/cinelerra/vwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/vwindowgui.C
@@
-363,11
+363,12
@@
int VWindowGUI::keypress_event()
case 'Z':
mwindow->redo_entry(this);
break;
case 'Z':
mwindow->redo_entry(this);
break;
- case 'f':
- canvas->set_fullscreen(canvas->get_fullscreen() ? 0 : 1);
- break;
+ case 'f': {
+ int on = canvas->get_fullscreen() ? 0 : 1;
+ canvas->set_fullscreen(on, 1);
+ break; }
case ESC:
case ESC:
- canvas->set_fullscreen(0);
+ canvas->set_fullscreen(0
, 1
);
break;
case KEY_F1:
case KEY_F2:
break;
case KEY_F1:
case KEY_F2:
diff --git
a/cinelerra-5.1/cinelerra/zwindowgui.C
b/cinelerra-5.1/cinelerra/zwindowgui.C
index 62bcb93e17e58d76747ced7436a3b137089feb7f..b6cccd03f82352ce4f285a98ccc267bf754f644e 100644
(file)
--- a/
cinelerra-5.1/cinelerra/zwindowgui.C
+++ b/
cinelerra-5.1/cinelerra/zwindowgui.C
@@
-98,11
+98,12
@@
int ZWindowGUI::keypress_event()
}
int result = 1;
switch( key ) {
}
int result = 1;
switch( key ) {
- case 'f':
- canvas->set_fullscreen(canvas->get_fullscreen() ? 0 : 1);
- break;
+ case 'f': {
+ int on = canvas->get_fullscreen() ? 0 : 1;
+ canvas->set_fullscreen(on, 1);
+ break; }
case ESC:
case ESC:
- canvas->set_fullscreen(0);
+ canvas->set_fullscreen(0
, 1
);
break;
default:
unlock_window();
break;
default:
unlock_window();
diff --git
a/cinelerra-5.1/configure.ac
b/cinelerra-5.1/configure.ac
index 4906c23794dfc509237bf073ee68fcf4e0c6219c..4c1b8f074cae3cd6199f00493946a1ca0a867fa1 100644
(file)
--- a/
cinelerra-5.1/configure.ac
+++ b/
cinelerra-5.1/configure.ac
@@
-611,7
+611,7
@@
if test "x$HAVE_VAAPI" = "xyes" -a "x$WANT_VAAPI" != "xno"; then
CHECK_LIB([vaapi_drm], [va-drm], [vaGetDisplayDRM])
fi
if test "x$HAVE_VAAPI" != "xyes" -a "x$WANT_VAAPI" = "xyes"; then
CHECK_LIB([vaapi_drm], [va-drm], [vaGetDisplayDRM])
fi
if test "x$HAVE_VAAPI" != "xyes" -a "x$WANT_VAAPI" = "xyes"; then
- AC_MSG_ERROR([requires va
p
pi support.])
+ AC_MSG_ERROR([requires va
a
pi support.])
fi
#CHECK_LIB([NVENC], [nvidia-encode], [NvEncodeAPICreateInstance])
fi
#CHECK_LIB([NVENC], [nvidia-encode], [NvEncodeAPICreateInstance])
@@
-915,7
+915,7
@@
FFMPEG_EXTRA_LDFLAGS=""
if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva'
EXTRA_LIBS+=' -lva'
if test "x$WANT_VAAPI" != "xno" -a "x$HAVE_VAAPI" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva'
EXTRA_LIBS+=' -lva'
- WANT_VA
P
PI="yes"
+ WANT_VA
A
PI="yes"
if test "x$HAVE_vaapi_x11" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva-x11'
EXTRA_LIBS+=' -lva-x11'
if test "x$HAVE_vaapi_x11" = "xyes"; then
FFMPEG_EXTRA_LDFLAGS+=' -lva-x11'
EXTRA_LIBS+=' -lva-x11'