Skip to content

Commit 0eb42ce

Browse files
alatdnegalatdneg
authored
Update 0.11 (#43)
Update for version 0.11
1 parent d07a8c1 commit 0eb42ce

File tree

544 files changed

+40669
-11312
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

544 files changed

+40669
-11312
lines changed

‎CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
cmake_minimum_required(VERSION 3.12 FATAL_ERROR)
22

3-
set(XSTUDIO_GLOBAL_VERSION "0.10.0" CACHE STRING "Version string")
3+
set(XSTUDIO_GLOBAL_VERSION "0.11.0" CACHE STRING "Version string")
44
set(XSTUDIO_GLOBAL_NAME xStudio)
55

66
project(${XSTUDIO_GLOBAL_NAME} VERSION ${XSTUDIO_GLOBAL_VERSION} LANGUAGES CXX)
@@ -13,6 +13,7 @@ option(ENABLE_CLANG_TIDY "Enable clang-tidy, ninja clang-tidy." OFF)
1313
option(ENABLE_CLANG_FORMAT "Enable clang format, ninja clangformat." OFF)
1414
option(FORCE_COLORED_OUTPUT "Always produce ANSI-colored output (GNU/Clang only)." TRUE)
1515
option(OPTIMIZE_FOR_NATIVE "Build with -march=native" OFF)
16+
option(BUILD_RESKIN "Build xstudio reskin binary" ON)
1617

1718
list(APPEND CMAKE_MODULE_PATH "${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules")
1819

@@ -154,7 +155,6 @@ if(INSTALL_XSTUDIO)
154155
add_subdirectory(docs)
155156
else()
156157
install(DIRECTORY share/docs/ DESTINATION share/xstudio/docs)
157-
add_subdirectory(share/docs)
158158
endif ()
159159

160160
endif ()

‎docs/build_guides/centos_7.md‎

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
sudo yum install -y alsa-lib-devel pulseaudio-libs-devel freeglut-devel
1010
sudo yum install -y python3-devel bzip2-devel freetype-devel zlib-devel
1111
sudo yum install -y libuuid-devel
12-
pip3 install --user pytest opentimelineio
1312

1413
#### Qt 5.15
1514
Install 5.15 dev tools, using Qt5 online installer, requires login account (free).
@@ -44,15 +43,14 @@ Install 5.15 dev tools, using Qt5 online installer, requires login account (free
4443
cd -
4544

4645
#### NLOHMANN JSON
47-
wget https://github.com/nlohmann/json/archive/refs/tags/v3.7.3.tar.gz
48-
tar -xf v3.7.3.tar.gz
49-
cd json-3.7.3
50-
mkdir build
51-
cd build
46+
wget https://github.com/nlohmann/json/archive/refs/tags/v3.11.2.tar.gz
47+
tar -xf v3.11.2.tar.gz
48+
mkdir json-3.11.2/build
49+
cd json-3.7.3/build
5250
cmake .. -DJSON_BuildTests=Off
5351
make -j $JOBS
54-
sudo make install
55-
cd ../..
52+
sudo make install
53+
cd -
5654

5755

5856
#### PYBIND11
@@ -131,6 +129,17 @@ Install 5.15 dev tools, using Qt5 online installer, requires login account (free
131129
cd -
132130

133131

132+
#### OpenTimelineIO
133+
git clone https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git
134+
cd OpenTimelineIO
135+
git checkout cxx17
136+
mkdir build
137+
cd build
138+
cmake -DOTIO_PYTHON_INSTALL=ON -DOTIO_DEPENDENCIES_INSTALL=OFF -DOTIO_FIND_IMATH=ON ..
139+
make -j $JOBS
140+
sudo make install
141+
cd ../..
142+
134143

135144
#### FFMPEG AND DEPS
136145

‎docs/build_guides/rocky_linux_9_1.md‎

Lines changed: 17 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111
sudo dnf install doxygen python3-sphinx
1212
sudo dnf install opus-devel libvpx-devel openjpeg2-devel lame-devel
1313
sudo dnf install qt5 qt5-devel
14-
pip install --user sphinx_rtd_theme breathe opentimelineio
14+
pip install --user sphinx_rtd_theme breathe
1515

1616

1717
### Local installs
@@ -25,9 +25,9 @@
2525

2626

2727
#### NLOHMANN JSON
28-
wget https://github.com/nlohmann/json/archive/refs/tags/v3.7.3.tar.gz
29-
tar -xf v3.7.3.tar.gz
30-
mkdir json-3.7.3/build
28+
wget https://github.com/nlohmann/json/archive/refs/tags/v3.11.2.tar.gz
29+
tar -xf v3.11.2.tar.gz
30+
mkdir json-3.11.2/build
3131
cd json-3.7.3/build
3232
cmake .. -DJSON_BuildTests=Off
3333
make -j $JOBS
@@ -92,6 +92,19 @@
9292
sudo make install
9393
cd ../..
9494

95+
96+
#### OpenTimelineIO
97+
git clone https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git
98+
cd OpenTimelineIO
99+
git checkout cxx17
100+
mkdir build
101+
cd build
102+
cmake -DOTIO_PYTHON_INSTALL=ON -DOTIO_DEPENDENCIES_INSTALL=OFF -DOTIO_FIND_IMATH=ON ..
103+
make -j $JOBS
104+
sudo make install
105+
cd ../..
106+
107+
95108
#### FFMPEG AND DEPS
96109

97110
##### NASM

‎docs/build_guides/ubuntu_22_04.md‎

Lines changed: 14 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,12 @@
77
sudo apt install python-is-python3 pybind11-dev libpython3-dev
88
sudo apt install libspdlog-dev libfmt-dev libssl-dev zlib1g-dev libasound2-dev nlohmann-json3-dev uuid-dev
99
sudo apt install libglu1-mesa-dev freeglut3-dev mesa-common-dev libglew-dev libfreetype-dev
10-
sudo apt install libjpeg-dev libpulse-dev
10+
sudo apt install libjpeg-dev libpulse-dev nlohmann-json3-dev
1111
sudo apt install yasm nasm libfdk-aac-dev libfdk-aac2 libmp3lame-dev libopus-dev libvpx-dev libx265-dev libx264-dev
1212
sudo apt install qttools5-dev qtbase5-dev qt5-qmake qtdeclarative5-dev qtquickcontrols2-5-dev
1313
sudo apt install qml-module-qtquick* qml-module-qt-labs-*
1414

1515
pip install sphinx_rtd_theme
16-
pip install opentimelineio
1716

1817

1918
### Local installs
@@ -40,28 +39,30 @@
4039
cd ../..
4140

4241

43-
#### OCIO2
44-
wget https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.2.0.tar.gz
45-
tar -xf v2.2.0.tar.gz
46-
cd OpenColorIO-2.2.0/
42+
#### OpenTimelineIO
43+
git clone https://github.com/AcademySoftwareFoundation/OpenTimelineIO.git
44+
cd OpenTimelineIO
45+
git checkout cxx17
4746
mkdir build
4847
cd build
49-
cmake -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_GPU_TESTS=OFF ../
48+
cmake -DOTIO_PYTHON_INSTALL=ON -DOTIO_DEPENDENCIES_INSTALL=OFF -DOTIO_FIND_IMATH=ON ..
5049
make -j $JOBS
5150
sudo make install
5251
cd ../..
5352

54-
#### NLOHMANN JSON
55-
wget https://github.com/nlohmann/json/archive/refs/tags/v3.7.3.tar.gz
56-
tar -xf v3.7.3.tar.gz
57-
cd json-3.7.3
53+
54+
#### OCIO2
55+
wget https://github.com/AcademySoftwareFoundation/OpenColorIO/archive/refs/tags/v2.2.0.tar.gz
56+
tar -xf v2.2.0.tar.gz
57+
cd OpenColorIO-2.2.0/
5858
mkdir build
5959
cd build
60-
cmake .. -DJSON_BuildTests=Off
60+
cmake -DOCIO_BUILD_APPS=OFF -DOCIO_BUILD_TESTS=OFF -DOCIO_BUILD_GPU_TESTS=OFF ../
6161
make -j $JOBS
6262
sudo make install
6363
cd ../..
6464

65+
6566
#### FFMPEG
6667
wget https://ffmpeg.org/releases/ffmpeg-5.1.tar.bz2
6768
tar -xf ffmpeg-5.1.tar.bz2
@@ -72,6 +73,7 @@
7273
sudo make install
7374
cd -
7475

76+
7577
### xStudio
7678
export PKG_CONFIG_PATH=/usr/local/lib64/pkgconfig:/usr/local/lib64/pkgconfig
7779
cd xstudio

‎docs/user_docs/getting_started/hotkeys.rst‎

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
.. _hotkeys
2+
3+
Hotkeys
4+
=======
5+
6+
.. note:: Hotkeys will be fully user-configurable in future releases.
7+
8+
+------------------------------------+----------------------------------------------------------------------------+
9+
| **Playback** |
10+
+------------------------------------+----------------------------------------------------------------------------+
11+
| ``j,k,l`` | | Play backwards, Pause, Play forwards |
12+
| | | Press ``j`` or ``l`` multiple times to increase the playback rate |
13+
+------------------------------------+----------------------------------------------------------------------------+
14+
| ``Spacebar`` | Play/Pause toggle |
15+
+------------------------------------+----------------------------------------------------------------------------+
16+
| ``Arrow left``, ``Arrow right`` | Previous Frame, Next Frame |
17+
+------------------------------------+----------------------------------------------------------------------------+
18+
| ``,``, ``.`` | Previous / Next Note or Annotation |
19+
+------------------------------------+----------------------------------------------------------------------------+
20+
| ``Arrow up``, ``Arrow down`` | Previous / Next Media Item |
21+
+------------------------------------+----------------------------------------------------------------------------+
22+
| ``i``, ``o`` | Set Loop In & Point |
23+
+------------------------------------+----------------------------------------------------------------------------+
24+
| ``p`` | Enable / Disable loop range |
25+
+------------------------------------+----------------------------------------------------------------------------+
26+
| ``Home`` | Jump to start of range. |
27+
+------------------------------------+----------------------------------------------------------------------------+
28+
| ``End`` | Jump to end of range. |
29+
+------------------------------------+----------------------------------------------------------------------------+
30+
| ``Shift + P`` | Set Loop In/Out Points to match 'cut range' for shot. |
31+
+------------------------------------+----------------------------------------------------------------------------+
32+
| ``Ctrl + P`` | Set Loop In/Out Points to match 'comp range' for shot. |
33+
+------------------------------------+----------------------------------------------------------------------------+
34+
| **Viewer Controls** |
35+
+------------------------------------+----------------------------------------------------------------------------+
36+
| ``Hold z`` | | Zoom mode. Click and drag image to zoom around the cursor |
37+
+------------------------------------+----------------------------------------------------------------------------+
38+
| ``Hold x`` | | Pan mode. Click and drag image to pan around the image |
39+
+------------------------------------+----------------------------------------------------------------------------+
40+
| ``Hold e`` | | Exposure mode. Click and drag image to adjust the exposure |
41+
| | | Double click while holding ``e`` to toggle Exposure Adjustment on or off |
42+
+------------------------------------+----------------------------------------------------------------------------+
43+
| ``f`` | Toggle Fit mode |
44+
| | Toggles between the last 2 Fit modes |
45+
+------------------------------------+----------------------------------------------------------------------------+
46+
| ``Ctrl + r`` | | Reset Viewer |
47+
| | | Resets the Fit Mode, Channel Selection and Exposure to default values |
48+
+------------------------------------+----------------------------------------------------------------------------+
49+
|| ``r`` || Toggle Red Channel/RGB |
50+
|| ``g`` || Toggle Green Channel/RGB |
51+
|| ``b`` || Toggle Blue Channel/RGB |
52+
|| ``a`` || Toggle Alpha Channel/RGB |
53+
|| ``Ctrl + l`` || Toggle Luminence Channel/RGB |
54+
|| ``c`` || Display RGB Channels |
55+
+------------------------------------+----------------------------------------------------------------------------+
56+
| ``1, 2, 3,...,9`` | Change which media item to view in A/B compare mode |
57+
+------------------------------------+----------------------------------------------------------------------------+
58+
| **User Interface** |
59+
+------------------------------------+----------------------------------------------------------------------------+
60+
| ``Tab`` | Toggle Presentation Mode |
61+
+------------------------------------+----------------------------------------------------------------------------+
62+
| ``Ctrl + f`` | Toggle Full-Screen Mode |
63+
+------------------------------------+----------------------------------------------------------------------------+
64+
| ``Ctrl + h`` | Toggle Viewer UI Visibility |
65+
+------------------------------------+----------------------------------------------------------------------------+
66+
| ``Ctrl + p`` | Launch the pop-out (2nd) viewer window |
67+
+------------------------------------+----------------------------------------------------------------------------+
68+
| ``f`` | Toggle Fit Mode |
69+
+------------------------------------+----------------------------------------------------------------------------+
70+
| ``d`` | Open Drawing Tools Window |
71+
+------------------------------------+----------------------------------------------------------------------------+
72+
| ``n`` | Open Notes Window |
73+
+------------------------------------+----------------------------------------------------------------------------+
74+
| ``Escape`` | Show UI -> exit presentation mode -> exit full screen |
75+
+------------------------------------+----------------------------------------------------------------------------+
76+
| **Session Controls** |
77+
+------------------------------------+----------------------------------------------------------------------------+
78+
| ``Ctrl + s`` | Save session |
79+
+------------------------------------+----------------------------------------------------------------------------+
80+
| ``Ctrl + Shift + s`` | Save session as... |
81+
+------------------------------------+----------------------------------------------------------------------------+
82+
| ``Ctrl + q`` | Close session |
83+
+------------------------------------+----------------------------------------------------------------------------+
84+
| ``Ctrl + \`` | Open about dialogue |
85+
+------------------------------------+----------------------------------------------------------------------------+
86+
| ``F1`` | Open user docs |
87+
+------------------------------------+----------------------------------------------------------------------------+
88+
| **Playlist Controls** |
89+
+------------------------------------+----------------------------------------------------------------------------+
90+
| ``Shift + p`` | Make a new playlist |
91+
+------------------------------------+----------------------------------------------------------------------------+
92+
| ``Shift + d`` | Make a new divider in the Session Pane |
93+
+------------------------------------+----------------------------------------------------------------------------+
94+
| ``Ctrl + a`` | Selected all media items in the current playlist |
95+
+------------------------------------+----------------------------------------------------------------------------+
96+
| ``Ctrl + d`` | Clear current selection |
97+
+------------------------------------+----------------------------------------------------------------------------+
98+
| **Media List** |
99+
+------------------------------------+----------------------------------------------------------------------------+
100+
| ``Ctrl 1, 2, 3,...0`` | Set selected media flag |
101+
+------------------------------------+----------------------------------------------------------------------------+
102+
| ``Ctrl + D`` | Clear selected media |
103+
+------------------------------------+----------------------------------------------------------------------------+
104+
| ``Ctrl + A`` | Select all media |
105+
+------------------------------------+----------------------------------------------------------------------------+
106+
| ``Del BSpace`` | Remove selected media |
107+
+------------------------------------+----------------------------------------------------------------------------+
108+
| **Notes** |
109+
+------------------------------------+----------------------------------------------------------------------------+
110+
| ``n`` | Show/Hide Notes Window |
111+
+------------------------------------+----------------------------------------------------------------------------+
112+
| ``;`` | Add Note |
113+
+------------------------------------+----------------------------------------------------------------------------+
114+
| ``:`` | Add Note And Open Notes Window |
115+
+------------------------------------+----------------------------------------------------------------------------+
116+
| ``'`` | Set Note Out-Point |
117+
+------------------------------------+----------------------------------------------------------------------------+
118+
| ``Shift + L`` | Set Loop In/Out Points From Note Duration |
119+
+------------------------------------+----------------------------------------------------------------------------+
120+

0 commit comments

Comments
 (0)