merge 76382b914ad3876b9ac36aa3d3bffbaf80a34e2b

diff --git a/parts/Editing.tex b/parts/Editing.tex
index aa2e21346767e852679ea47b14545276d8d23392..3cacfbfb0ede1e2909368baae83a5dbf94ac14e4 100644 (file)
--- a/parts/Editing.tex
+++ b/parts/Editing.tex
@@ -202,7 +202,7 @@ pasted one after the other, keeping the same order they have on the stack.
     \includegraphics[width=0.9\linewidth]{images/cut.png}
     \caption{Blade cut}
     \label{fig:cut}
-\end{wrapfigure}
+\end{wrapfloat}
 
  A \textit{cut} uses a non-empty selection region, where the \textit{blade cut} or \textit{split} has no duration in the selection, just a hairline.  As usual the use of cut when a selection is set, deletes/cuts the highlighted area.  In the case where an In point or an Out point exists on the timeline, the clip is split at the location of the In/Out point since it has priority over the cursor location.  A blade cut simply splits the edit into two edits.  In order to have the video and audio aligned, it works best to have Settings $\rightarrow$ Align cursor on frames.  When a blade cut occurs, the edges are created as \textit{hard edges}.  These are edges that cannot be deleted by track optimizations.
 Cinelerra has built-in optimization on the timeline.  So that whenever two parts on the timeline are sequential frames, it automatically optimizes by making them into 1 item.  So if you are cutting, dragging, editing, or whatever and somehow frame \# 40 ends up right next to frame \# 41, it optimizes them together.  This optimization affects many areas throughout the program code.
@@ -363,11 +363,9 @@ Explanation of how to use Inter-View mode will be described here next.
 
 \begin{itemize}
     \item Do your editing as usual on the timeline until you are ready to see what is used or unused.
-    \item Make sure you are in Preview mode in the Resources window; you enable this mode using the menu
-        \textit{Full play} to the left of the word Search \quad
-        \includegraphics[height=\baselineskip]{images/fullplay.png}.
-    \item Middle mouse click on a thumbnail in the Resources window and a popup occurs of that media with a
-        white colored bar at the top and a red colored bar at the bottom with black sections.
+    \item Make sure you are in any of the Preview modes in the Resources window; you enable the mode using the pulldown to the left of the word Search.  The option looks like this
+    \quad \includegraphics[height=\baselineskip]{images/fullplay.png}.   \item Middle mouse click on a thumbnail in the Resources window and a popup occurs of that media with a
+    white colored bar at the top and a red colored bar at the bottom with black sections.
 \end{itemize}
 
 The red/white bars represent the presence and the black sections represent the absence of where that media is used on the timeline.  To get to a bigger representation, use the “f” key for a full screen.  Now
@@ -905,20 +903,19 @@ event: (0, 0, 0x0)
 
 \noindent When done, you will have to Ctrl-C to get out of the program.
 
-\paragraph{Note 4} For developers, it is also possible to do the following for further in depth testing:
-    \begin{lstlisting}[language=Bash]
-# to locate numerical value of the shuttle, e.g. 0003:0B33.0030.0006
-$ ls /sys/kernel/debug/hid   
-$ cat “/sys/kernel/debug/hid/0003:0B33.0030.0006/rdesc” # substitute your own numerical value
-$ cat “/sys/kernel/debug/hid/0003:0B33.0030.0006/events” # press keys to see the results
-    \end{lstlisting}
+\paragraph{Note 4} For developers, if you have a pre-UEFI Secure Boot kernel it is also possible to do the following for further in depth testing:
+
+\begin{enumerate}
+    \item \texttt{ls /sys/kernel/debug/hid   \# to locate numerical value of the shuttle, e.g. 0003:0B33.0030.0006}
+    \item \texttt{cat “/sys/kernel/debug/hid/0003:0B33.0030.0006/rdesc”    \# substitute your own numerical value}
+    \item \texttt{cat “/sys/kernel/debug/hid/0003:0B33.0030.0006/events”  \# press keys to see the results}
+\end{enumerate}
 
 \subsection{Shuttle key default arrangement for Cinelerra / Composer / Viewer:}%
 \label{sub:shuttle_key_default_cinelerra}
 
-The following is the default setting for the ShuttlePROv2 and ShuttleXpress (table~\ref{tab:shuttleprov2} and table 2):
+The following is the default setting for the ShuttlePROv2 and ShuttleXpress (table~\ref{tab:shuttleprov2} and table~\ref{tab:xpress}):
 
-\vspace{1ex} \textbf{ShuttlePROv2:}
 
 \begin{table}
     \caption{ShuttlePROv2 key default arrangement for Cinelerra / Composer / Viewer}