Merge branch 'master' of https://github.com/olive-editor/olive

.github/workflows/ci.yml

@@ -20,10 +20,8 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        build: [1, 2]
         include:
-          - build: 1
-            build-type: RelWithDebInfo
+          - build-type: RelWithDebInfo
             cc-compiler: gcc
             cxx-compiler: g++
             compiler-name: GCC 9.3.1
@@ -31,8 +29,7 @@ jobs:
             os-name: Linux (CentOS 7)
             vfx-cy: 2021
             ci-common-version: 2
-          - build: 2
-            build-type: RelWithDebInfo
+          - build-type: RelWithDebInfo
             cc-compiler: clang
             cxx-compiler: clang++
             compiler-name: Clang 10.0.0
@@ -50,6 +47,8 @@ jobs:
     runs-on: ubuntu-latest
     container:
       image: olivevideoeditor/ci-olive:${{ matrix.vfx-cy }}.${{ matrix.ci-common-version }}
+    if: >-
+      !contains(github.event.head_commit.message, '[skip ci]')
 
     steps:
       - name: Checkout Source Code
@@ -117,10 +116,8 @@ jobs:
   windows:
     strategy:
       matrix:
-        build: [1]
         include:
-          - build: 1
-            build-type: RelWithDebInfo
+          - build-type: RelWithDebInfo
             compiler-name: MSVC 16.x
             os-name: Windows
             os-arch: x86_64
@@ -134,6 +131,8 @@ jobs:
        ${{ matrix.build-type }},
        ${{ matrix.cmake-gen }}>
     runs-on: ${{ matrix.os }}
+    if: >-
+      !contains(github.event.head_commit.message, '[skip ci]')
 
     steps:
       - name: Checkout Source Code
@@ -152,10 +151,10 @@ jobs:
           cmake -E make_directory ${{ runner.workspace }}/build
 
       - name: Enable Developer Command Prompt (Windows)
-        uses: ilammy/msvc-dev-cmd@v1.3.0
+        uses: ilammy/msvc-dev-cmd@v1
 
       - name: Acquire Qt
-        uses: jurplel/install-qt-action@v2.8.0
+        uses: jurplel/install-qt-action@v2
         with:
           version: 5.15.1
 
@@ -288,10 +287,8 @@ jobs:
   macos:
     strategy:
       matrix:
-        build: [1]
         include:
-          - build: 1
-            build-type: RelWithDebInfo
+          - build-type: RelWithDebInfo
             compiler-name: Clang LLVM
             os-name: macOS
             os-arch: x86_64
@@ -305,6 +302,8 @@ jobs:
        ${{ matrix.build-type }},
        ${{ matrix.cmake-gen }}>
     runs-on: ${{ matrix.os }}
+    if: >-
+      !contains(github.event.head_commit.message, '[skip ci]')
 
     steps:
       - name: Checkout Source Code
@@ -323,7 +322,7 @@ jobs:
           cmake -E make_directory ${{ runner.workspace }}/build
 
       - name: Acquire Qt
-        uses: jurplel/install-qt-action@v2.8.0
+        uses: jurplel/install-qt-action@v2
         with:
           version: 5.15.1
 

app/render/audioplaybackcache.cpp

@@ -75,8 +75,11 @@ void AudioPlaybackCache::WritePCM(const TimeRange &range, SampleBufferPtr sample
     segment_length_ += seg_sz;
   }
 
-  // Convert to packed data, which is what we store on disk
-  QByteArray a = samples->toPackedData();
+  QByteArray a;
+  if (samples) {
+    // Convert to packed data, which is what we store on disk
+    a = samples->toPackedData();
+  }
 
   // Keep track of validated ranges so we can signal them all at once at the end
   TimeRangeList ranges_we_validated;