Merge pull request #15 from cannam/main

Further fix to solo playback behaviour, and resize panes equally after loading a new recording
yucongj · Dec 16, 2024 · 9337fb7 · 9337fb7
2 parents 7eb900e + b884c64
commit 9337fb7
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 1 deletion.
diff --git a/deploy/macos/deploy-and-package.sh b/deploy/macos/deploy-and-package.sh
@@ -36,7 +36,7 @@ echo "Version: $version"
 
 source="$full_name.app"
 volume="$full_versioned"
-volname="$full_name - $version"
+volname="$full_name $version"
 target="$volume"/"$full_name".app
 dmg="$volume".dmg
 

diff --git a/main/MainWindow.cpp b/main/MainWindow.cpp
@@ -3927,6 +3927,7 @@ MainWindow::importMoreAudio()
     }
 
     m_session.addFurtherAudioPane(pane);
+    m_paneStack->sizePanesEqually();
 
     updateWindowTitle();
     updateMenuStates();
@@ -5993,11 +5994,17 @@ MainWindow::currentPaneChanged(Pane *pane)
         for (int i = pane->getLayerCount(); i > 0; ) {
             --i;
             Layer *layer = pane->getLayer(i);
+            if (layer->isLayerDormant(pane)) {
+                continue;
+            }
             ModelId modelId = layer->getModel();
             if (modelId == activeModel) {
                 break;
             }
             soloModels.insert(modelId);
+            if (ModelById::isa<RangeSummarisableTimeValueModel>(modelId)) {
+                break;
+            }
         }
 
         m_viewManager->setPlaybackModel(activeModel);