From 4584ac9807024c496d10867808c353fdf73bfad6 Mon Sep 17 00:00:00 2001 From: Good Guy Date: Sat, 26 Aug 2017 12:31:15 -0600 Subject: [PATCH] clear cache for undo/redo, alt-# range chk, shortcuts docs, plugin_set segv --- cinelerra-5.1/cinelerra/mainundo.C | 2 + cinelerra-5.1/cinelerra/mwindow.C | 5 +- cinelerra-5.1/cinelerra/preferences.C | 1 + cinelerra-5.1/cinelerra/tracksedit.C | 1 + cinelerra-5.1/doc/Makefile | 1 + cinelerra-5.1/doc/shortcuts.html | 1801 +++++++++++++++++++++++++ 6 files changed, 1809 insertions(+), 2 deletions(-) create mode 100644 cinelerra-5.1/doc/shortcuts.html diff --git a/cinelerra-5.1/cinelerra/mainundo.C b/cinelerra-5.1/cinelerra/mainundo.C index 98b864c8..4e7a6fca 100644 --- a/cinelerra-5.1/cinelerra/mainundo.C +++ b/cinelerra-5.1/cinelerra/mainundo.C @@ -228,6 +228,7 @@ int MainUndo::undo() //dump(); reset_creators(); + mwindow->reset_caches(); return 0; } @@ -283,6 +284,7 @@ int MainUndo::redo() } } reset_creators(); + mwindow->reset_caches(); //dump(); return 0; } diff --git a/cinelerra-5.1/cinelerra/mwindow.C b/cinelerra-5.1/cinelerra/mwindow.C index 2c0ddff4..0334fd02 100644 --- a/cinelerra-5.1/cinelerra/mwindow.C +++ b/cinelerra-5.1/cinelerra/mwindow.C @@ -3615,7 +3615,8 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra int result = file->open_file(preferences, asset, 1, 0); if( !result && delete_tracks > 0 ) undo->update_undo_before(); - if( !result && asset->video_data && asset->get_video_layers() > 0 ) { + int video_layers = asset->get_video_layers(); + if( !result && asset->video_data && vstream < video_layers ) { // try to get asset up to date, may fail file->select_video_stream(asset, vstream); // either way use what was/is there. @@ -3671,7 +3672,7 @@ int MWindow::select_asset(Asset *asset, int vstream, int astream, int delete_tra if( !result && asset->audio_data && asset->channels > 0 ) { session->sample_rate = asset->get_sample_rate(); int64_t channel_mask = 0; - int astrm = !asset->video_data ? -1 : + int astrm = !asset->video_data || vstream >= video_layers ? -1 : file->get_audio_for_video(vstream, astream, channel_mask); if( astrm >= 0 ) file->select_audio_stream(asset, astrm); if( astrm < 0 || !channel_mask ) channel_mask = (1<channels)-1; diff --git a/cinelerra-5.1/cinelerra/preferences.C b/cinelerra-5.1/cinelerra/preferences.C index 4e1f204f..1341277a 100644 --- a/cinelerra-5.1/cinelerra/preferences.C +++ b/cinelerra-5.1/cinelerra/preferences.C @@ -400,6 +400,7 @@ int Preferences::load_defaults(BC_Hash *defaults) shbtn_prefs.append(new ShBtnPref(_("Online Help"), "$CIN_BROWSER https://cinelerra-cv.org/docs.php", 0)); shbtn_prefs.append(new ShBtnPref(_("Original Manual"), "$CIN_BROWSER file://$CIN_DAT/doc/cinelerra.html", 0)); shbtn_prefs.append(new ShBtnPref(_("Setting Shell Commands"), "$CIN_BROWSER file://$CIN_DAT/doc/ShellCmds.html", 0)); + shbtn_prefs.append(new ShBtnPref(_("Shortcuts"), "$CIN_BROWSER file://$CIN_DAT/doc/shortcuts.html", 0)); shbtns_total = 0; } for( int i=0; istartproject = position; plugin->plugin_set = plugin_set; + plugin->edits = plugin_set; src_plugin_set->track->optimize(); } diff --git a/cinelerra-5.1/doc/Makefile b/cinelerra-5.1/doc/Makefile index 29617eca..6cf33f40 100644 --- a/cinelerra-5.1/doc/Makefile +++ b/cinelerra-5.1/doc/Makefile @@ -56,6 +56,7 @@ install: all cp -a ShellCmds.* $(TARGET_DIR)/. cp -a cinelerra.html $(TARGET_DIR)/. cp -a Features5.pdf $(TARGET_DIR)/. + cp -a shortcuts.html $(TARGET_DIR)/. clean: rm -f $(OUTPUT) $(IMAGES) diff --git a/cinelerra-5.1/doc/shortcuts.html b/cinelerra-5.1/doc/shortcuts.html new file mode 100644 index 00000000..3bcd3c71 --- /dev/null +++ b/cinelerra-5.1/doc/shortcuts.html @@ -0,0 +1,1801 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
Main Menu(- is a checkbox)08/25/2017 update
PULLDOWNSMenu ItemsShortcutsDescription




FileNew'n'Create new project
PulldownLoad files…'o'Load file(s)

Save's'Save project

Save As…
Save and name project

Record…'r'Open record window
Scan…'Shift-S'Open dvb scan window
SubTitle…'Alt-y'Open subtitle script window

Render…'Shift-R'Open render window

Export EDL…'Shift-E'Open export EDL window

Batch Render..'Shift-B'Open batch render window
BD Render…'Ctrl-d'Open create bluray disk window
DVD Render…'Shift-D'Open create dvd disk window

Quit'q'Quit the program

Dump EDL
Write current EDL to stdout

Dump Plugins
Write defined Plugins to stdout

Load Backup
Load auto-backup file “backup.xml”

Save Backup
Save auto-backup file “backup.xml”




EditUndo clear'z'Undo from history previous operation
PulldownRedo'Shift-Z'Redo from history next opration

Cut'x'Copy selection to cut buffer and delete

Copy'c'Copy selection to cut buffer

Paste'v’Insert selection from cut buffer

Clear'Del'Delete selection

Paste Silence'Shift-Space'Paste empty edit

Mute Selection'm'Replace selection with empty edit

Trim Selection
Replace track with selection

Select All'a'Toggle select all/none
Shuffle Edits
Randomly reorder track edits
Reverse Edits
Reverse track edits
Edit Length…
Change selected track given duration
Align Edits
Change selected corresp. track edits to start/end same
Trans. Length…
Change selected track transitions to given duration
Detach trans.
Remove selected track transitions

Clear labels
Delete selected timeline label markers
Cut ads
Remove selected region, add to commercial trking db
paste subttl'y'Replace selected subtitle edit text w/ subtitle script text




KeyframesCut Keyframes'Shift-X'Copy selected keframes to cut buffer and delete
PulldownCopy Keyframes'Shift-C'Copy selected keyframes to cut buffer

Paste Keyframes'Shift-V'Paste keyframes in cut buffer

Clear Keyframes'Shift-Del'Delete selected keyframes
Change to linear
Change keyframe auto curves to piecewise linear
Change 2 smooth
Change selected keyframes auto curves to bezier
Create curve type
Set new keyframe type: smooth,linear,tangent,disjoint

Copy default key'Alt-c'Copy default keyframe to clipboard

Paste default key'Alt-v'Paste clipboard keyframe into default keyframe




AudioAdd track't'Append new empty audio track
PulldownDefault Trans.'u'Insert default audio track at selected edit boundary

Map 1:1
Setup audio mixing output = input

Map 5.1:2
Setup audio mixing stereo = 5.1
Attach Trans.
Open audio transition select for insert at edit boundary
Attach Effect…
Open audio selection menu for insert at edit boundary

Render Effect…
Open audio render select to render from select as pcm




VideoAdd track'Shift-T'Append new empty video track
PulldownDefault Trans.'Shift-U'Insert default video transition at selected edit boundary
Attach Trans.
Open video transition select for insert at edit boundary
Attach Effect…
Open video effect selection for insert at edit boundary

Render Effect…
Open video render select to render from select as pcm




TracksMove tracks up'Shift-Up'Circulate tracks up
PulldownMove trks down'Shift-Down'Circulate tracks down

Delete tracks
Delete all tracks

Delete last track'd'Delete last track

Concatenate trks
Concatenate tracks together
add Subttl'Shift-Y'Add subtitle track




SettingsFormat…'Shift-F'Open render format setup menu
PulldownPreferences…'Shift-P'Open preferences setup menu

- Edit labels
Toggle labels follow edits

- Edit effects
Toggle plugins follow edits
- Keyfrs fol. edits
Toggle keyframes follow edits

- Align on frames
Toggle align cursor
- Typeless keyfrs
Toggle typeless keyframes mode

Save settings
Save Cinelerra_rc

Loop Playback'Shift-L'Set loop playback region to selection/all

Set bkg render'Shift-G’Toggle background rendering




View- Show assets'0'Toggle show asset data
Pulldown- Show titles'1'Toggle show asset title

- Show trans.'2'Toggle show transition effects

- Fade'3'Toggle show fade auto curves

- Mute'4'Toggle show mute auto curves

- Overlay Mode'5'Toggle show mode auto curves

- Pan'6'Toggle show pan auto curves

- Plugin Autos'7'Toggle show plugin keyframes

- Mask'8'Toggle show mask auto keyframes
- Speed'9'Toggle show speed auto curves

- Camera X
Toggle show camera X auto curves

- Camera Y
Toggle show camera Y auto curves

- Camera Z
Toggle show camera Z auto curves

- Projector X
Toggle show projector X auto curves

- Projector Y
Toggle show projector Y auto curves

- Projector Z
Toggle show projector Z auto curves




Window- Show Viewer
Toggle show view window
Pulldown- Show Resrs.
Toggle show resources window

- Show Compos.
Toggle show compositor window

- Show Overlays
Toggle show auto overlay window

- Show Levels
Toggle show audio levels window
- Split X pane'Ctrl-1'Toggle ½ horiz track timeline window panes
- Split Y pane'Ctrl-2'Toggle ½ horiz track timeline window panes

Default Positions'Ctrl-p'Reset window positions/size to defaults
Tile Left
Set window positions/sizes to tile left screen
Tile Right
Set window positions/size to tile right screen




>_._ shell cmdsTop rt. CornerRun scripts (setup in interface preferences)




Main Menu


BUTTONSMenu ItemsShortcutsDescription




TransportRewind'home'Jump to beginning
ButtonsFast reverse'KP +'Double speed reverse play

Normal reverse'KP 6'Normal speed reverse play

Frame reverse'KP 4'Render previous frame

Stop'KP 0'Stop playback

Frame forward'KP 1'Render next frame

Normal forward'KP 3'Normal speed forward play

Fast forward'KP Enter'Double speed forward play

Jump to end'end'Jump to end

(No button)'KP 5'Slow speed reverse play

(No button)'KP 2' Slow speed forward play

(No button)'Shift-KP1’Render next frame and audio

(No button)'Shift-KP2’Slow speed forward play without audio

(No button)'Shift-KP3’Normal speed forward play without audio

(No button)'Shift-KP4’Render previous frame and audio

(No button)'Shift-KP5’Slow speed reverse play without audio

(No button)'Shift-KP6’Normal speed reverse play without audio


'Ctrl-KP#’If [ ] set, “KP2,3,5,6,+,enter” play between ptrs.




Edit ModesAuto Gen. Keys
Generate keyframes while tweeking

Lock Labels
Lock labels from moving




Edit operationsIn point'['Toggle In point timeline marker

Out point']'Toggle Out point timeline marker

To clip'i’Copy selection and create clip

Cut'x'Copy selection to cut buffer and delete

Copy'c'Copy selection to cut buffer

Paste'v'Insert selection from cut buffer

Toggle label'l'Toggle label at current position

Previous label'Ctrl ←'Move to label before cursor

Next label'Ctrl →'Move to label after cursor
Previous edit'Alt ←'Move to previous edit
Next edit'Alt →'Move to next edit

Fit'f'Fit time displayed to selection

Auto Fit'Alt-f'’Fit the max/min range of all automation types

Auto Fit'Ctrl-alt-f’Fit the max/min range of current automation types

Undo'z'Undo from history previous operation

Redo'Shift-Z'Redo from history next operation

Manual Goto'g'Jump to time selected by popup




FFMpeg probes early- FFMPEG earlyTop rt. CornerRun ffmpeg open probes first / last




Main Window KeyKeyQualifierDescription

'e'
Toggle editing mode: from cut&paste or drag&drop

'1 through 9'
Toggle auto mode settings as in main menu shortcuts

'1 through 8'AltSelect asset pgm 1-8; reset format (remove other trks)

← (left arrow)
Scroll window timeline display left (not insertion pt)

← (left arrow)CtrlMove cursor to label left of cursor (main shortcuts)

← (left arrow)AltMove cursor to edit boundary left of cursor position

→ (right arrow)
Scroll window timeline display right (not insertion pt)

→ (right arrow)CtrlMove cursor to label right of cursor (main shortcuts)

→ (right arrow)AltMove cursor to edit boundary right of cursor position

→ (right arrow)Shift-ctrlMove cursor to label right of cursor, expand selection

UP (up arrow)
Increase timeline duration (zoom out timeline)

UP (up arrow)CtrlIncrease audio sample scale (zoom in audio data)

UP (up arrow)AltIncrease selected curve limits (zoombar selected curve)

UP (up arrow)Ctrl-altIncrease all auto curve limits

DOWN arrow
Decrease timeline duration (zoom in timeline)

DOWN arrowCtrlDecrease audio sample scale (zoom in audio data)

DOWN arrowAltDecrease auto curve limits (zoombar selected curve)

DOWN arrowCtrl-altDecrease all auto curve limits

PGUP (page up)
Scroll current track horiz window pane up

PGUP (page up)CtrlIncrease track scale geometry (zoom in track data)

Pgdn page down
Scroll current track horiz window pane down

Pgdn page downCtrlDecrease track scale geometry (zoom out track data)

Home
Move insertion point to beginning of timeline

End
Move insertion point to end of timeline


'Shift+click’Over edit causes highlight section to extend to cursor


'Shift+click’Over boundary of effect, trims only that effect

Toggle single trk'Tab’Toggle single track arming status

Toggle other trks'Shift-tab’Toggle all of the other tracks arming status




Compositor


BUTTONSMenu ItemsShortcutsDescription

Protect video
Disable changes to the compositor output

Zoom view
Zoom in view without resizing the window

Edit mask
Brings up the mask editing tool

Ruler
Brings up the ruler for usage

Adjust camera
Brings up the camera editing tool

Adjust projector
Brings up the projector editing tool

Crop layer/outpt
Crop a layer or output

Get color
Detects color at current spot & stores temporary

Show tool info
Works with editing/cropping buttons

Show safe regs.
Draws safe regions in the video output




KeypressesKeyQualifierDescription

Mid. click+drag
If zoom in, pans the view

Right click
Brings up zoom%/auto;reset cam/proj;hide ctrls

Lt clk Zoom
Zooms in

Lt clk ZoomCtrlZooms out

Lt clk ZoomShift-altZooms out

'+'
Zooms in video output

'-'
Zooms out video output

f
Toggle on/off fullscreen

'-’
Camera zoom

'=’
Projector zoom
Viewer


BUTTONSMenu ItemsShortcutsDescription

Rewind'home'Jump to beginning

Fast reverse'KP +'Toggle double speed reverse play

Normal reverse'KP 6'Toggle normal speed reverse play

Frame reverse'KP 4'Render previous frame

Stop'KP 0'Stop playback

Frame forward'KP 1'Render next frame

Normal forward'KP 3'Toggle normal speed forward play

Fast forward'KP Enter'Toggle double speed forward play

Jump to end'end'Jump to end

(No button)'KP 5'Toggle slow speed reverse play

(No button)'KP 2' Toggle slow speed forward play


'KP#-Shift’ Shift added to KP #, adds or subtracts audio


'Ctrl-KP#’If [ ] set, “KP2,3,5,6,+,enter” play between ptrs.

In point'['Toggle In point timeline marker

Out point']'Toggle Out point timeline marker

Splice'v'Create splice

Overwrite'b'Overwrite

To clip'I'Copy selection and create clip

Copy'c'Copy selection to cut buffer

Show meters
Toggle show meters

Toggle label'l'Toggle label at current position

Previous label'Ctrl ←'Move to label before cursor

Next label'Ctrl →'Move to label after cursor

Manual Goto'g'Jump to time selected by popup




TextboxesKeyQualifierDescription

Tab
Move cursor to the next textbox

Tab'Shift’Move cursor to the previous textbox

Esc
Deselects a selected area

Left arrowwith ibeam Backs up 1 character

Left arrow'Ctrl’Backs up to beginning of word/next word

Left arrow'Shift’Selects/Deselects previous character highlight

Left arrow'Ctrl-Shift’Selects/Deselects previous word highlight

Right arrowwith ibeam Moves forward 1 character

Right arrow'Ctrl’Moves to beginning of next word

Right arrow'Shift’Adds selection highlight to the next character

Right arrow'Ctrl-Shift’Expands highlight to the next word

Up arrow
Move up to next line, same position

Down arrow
Move down to next line, same position

Up arrow'Shift’Selects/Deselects up to the previous line X-coord

Down arrow'Shift’Select/Deselect down 1 line from the X-coord

PGUP (page up)
Goes to the beginning of the page

Pgdn page down
Goes to the end of the page

PGUP (page up)'Shift’Highlights selection above Ibeam to page start

Pgdn page down'Shift’Highlights selection below Ibeam to page end

End
Cancels selection and goes to end of line

End'Shift’Selects to end of line

Home
Goes to the beginning of the line

Home'Shift’Highlights from ibeam to beginning of line

Backspace
Deletes the character in back of the ibeam

Delete
Deletes the next character

Ctrl-c(also+’Shift’)Copies selection to the 2nd cut buffer

Ctrl-v(also+'Shift’)Pastes selection from the 2nd cut buffer

Ctrl-x(also+'Shift’)Copies selection to 2nd cut buffer and delete




UnicodeCtrl-U'Shift’Go into Unicode enter mode

Enter
Fires the Unicode

Esc
Cancels Unicode state

Backspace
Deletes previous character

A-F, 0-9
Enters the hex code




Record WindowMenu ItemsShortcutsDescription

Start/pause'space bar’Start and pause recording of current batch

Label'l’Toggle label at current position




Channels


BUTTONSMenu ItemsShortcutsDescription
Select
Select a channel

Add…
Add another channel

Edit…
Edit the wording associated with the channel

Move up
Move the channel up in the selection

Move down
Move the channel down in the selection

Sort
Sort all of the channels numerically

Scan
Scan the available channels

Delete
Delete the selected channel

Picture…
Select the device picture




Android RemoteMENU
Toggle Android remote state (grabs/ungrabs keys)

KPTV
Start/stop record window

KPBOOK
Start/stop dvb channel scan

KPHAND
Quit cinelerra program
+ + + + -- 2.26.2