From 98e035865979cda9805a58a85d52f8d70a7ec54e Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sat, 30 Nov 2019 13:33:36 -0700 Subject: [PATCH] version update, fix vaapi spelling, zoom fixes --- cinelerra-5.1/blds/PKGBUILD | 2 +- cinelerra-5.1/blds/bld_prepare.sh | 4 ++-- cinelerra-5.1/blds/cinelerra.spec | 2 +- cinelerra-5.1/blds/debian/changelog | 2 +- cinelerra-5.1/blds/debian/control | 2 +- cinelerra-5.1/cinelerra/canvas.C | 16 +++++++--------- cinelerra-5.1/cinelerra/canvas.h | 2 +- cinelerra-5.1/cinelerra/cpanel.C | 1 + cinelerra-5.1/cinelerra/cwindowgui.C | 15 ++++++++------- cinelerra-5.1/cinelerra/cwindowgui.h | 2 +- cinelerra-5.1/cinelerra/vwindowgui.C | 9 +++++---- cinelerra-5.1/cinelerra/zwindowgui.C | 9 +++++---- cinelerra-5.1/configure.ac | 4 ++-- 13 files changed, 36 insertions(+), 34 deletions(-) diff --git a/cinelerra-5.1/blds/PKGBUILD b/cinelerra-5.1/blds/PKGBUILD index b70f7a2b..ee437220 100644 --- a/cinelerra-5.1/blds/PKGBUILD +++ b/cinelerra-5.1/blds/PKGBUILD @@ -1,7 +1,7 @@ # Maintainer: goodguy pkgname=cin pkgver=5.1 -pkgrel=20191031 +pkgrel=20191130 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 0064bdfb..61e09500 100755 --- 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 ;; -#"fedora30") +#"fedora3*") # 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 \ diff --git a/cinelerra-5.1/blds/cinelerra.spec b/cinelerra-5.1/blds/cinelerra.spec index cc2ce379..6b367195 100644 --- a/cinelerra-5.1/blds/cinelerra.spec +++ b/cinelerra-5.1/blds/cinelerra.spec @@ -1,4 +1,4 @@ -%define ver 20191031 +%define ver 20191130 %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 586a0f69..7f6529e7 100644 --- a/cinelerra-5.1/blds/debian/changelog +++ b/cinelerra-5.1/blds/debian/changelog @@ -1,4 +1,4 @@ -cin (1:5.1.20191031) unstable; urgency=low +cin (1:5.1.20191130) unstable; urgency=low [ guy goode ] diff --git a/cinelerra-5.1/blds/debian/control b/cinelerra-5.1/blds/debian/control index fc737835..5f08a0a5 100644 --- a/cinelerra-5.1/blds/debian/control +++ b/cinelerra-5.1/blds/debian/control @@ -1,7 +1,7 @@ Source: cin Section: video Priority: optional -Standards-Version: 5.1.20191031 +Standards-Version: 5.1.20191130 Maintainer: mailing list 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 e3e1b0f3..17d5a42b 100644 --- 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 on = -1; 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: - on = 0; + set_fullscreen(0, 1); break; default: return 0; } - if( on >= 0 ) - set_fullscreen(on); 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. - canvas->set_fullscreen(0); + canvas->set_fullscreen(0, 1); return 1; } @@ -1115,7 +1113,7 @@ CanvasFullScreenItem::CanvasFullScreenItem(Canvas *canvas) } int CanvasFullScreenItem::handle_event() { - canvas->set_fullscreen(1); + canvas->set_fullscreen(1, 1); return 1; } diff --git a/cinelerra-5.1/cinelerra/canvas.h b/cinelerra-5.1/cinelerra/canvas.h index 1ea04448..6b336052 100644 --- 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 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); diff --git a/cinelerra-5.1/cinelerra/cpanel.C b/cinelerra-5.1/cinelerra/cpanel.C index 4099397e..5f8dd4d7 100644 --- 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); + subwindow->update_canvas(0); } else cpanel_zoom->set_shown(0); diff --git a/cinelerra-5.1/cinelerra/cwindowgui.C b/cinelerra-5.1/cinelerra/cwindowgui.C index 567c9338..22e977bd 100644 --- 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; - 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; - break; + break; } case ESC: - canvas->set_fullscreen(0); + canvas->set_fullscreen(0, 1); 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; } -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(); - Canvas::set_fullscreen(1); + Canvas::set_fullscreen(1, unlock); 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(); diff --git a/cinelerra-5.1/cinelerra/cwindowgui.h b/cinelerra-5.1/cinelerra/cwindowgui.h index f58ac69a..7dbfde86 100644 --- 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); - 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); diff --git a/cinelerra-5.1/cinelerra/vwindowgui.C b/cinelerra-5.1/cinelerra/vwindowgui.C index 7c1d51e0..9c29ec99 100644 --- 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 '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: - canvas->set_fullscreen(0); + canvas->set_fullscreen(0, 1); break; case KEY_F1: case KEY_F2: diff --git a/cinelerra-5.1/cinelerra/zwindowgui.C b/cinelerra-5.1/cinelerra/zwindowgui.C index 62bcb93e..b6cccd03 100644 --- 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 ) { - 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: - canvas->set_fullscreen(0); + canvas->set_fullscreen(0, 1); break; default: unlock_window(); diff --git a/cinelerra-5.1/configure.ac b/cinelerra-5.1/configure.ac index 4906c237..4c1b8f07 100644 --- 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 - AC_MSG_ERROR([requires vappi support.]) + AC_MSG_ERROR([requires vaapi support.]) 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' - WANT_VAPPI="yes" + WANT_VAAPI="yes" if test "x$HAVE_vaapi_x11" = "xyes"; then FFMPEG_EXTRA_LDFLAGS+=' -lva-x11' EXTRA_LIBS+=' -lva-x11' -- 2.26.2