Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build updates for v1.1.0 release #51

Merged
merged 9 commits into from
Aug 14, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions deploy/clean-build-and-package
Original file line number Diff line number Diff line change
@@ -16,8 +16,8 @@ if [ -d /Applications ]; then

archs="x86_64 arm64"

qtdir_x86_64="/Users/cannam/Qt/6.6.1/macos"
qtdir_arm64="/Users/cannam/Qt/6.6.1/macos"
qtdir_x86_64="/Users/cannam/Qt/6.6.3/macos"
qtdir_arm64="/Users/cannam/Qt/6.6.3/macos"

echo "Proceed to rebuild, package, and sign version $version of $full_name using:"
for arch in $archs; do
4 changes: 4 additions & 0 deletions deploy/macos/deploy.sh
Original file line number Diff line number Diff line change
@@ -102,6 +102,10 @@ echo
echo "Copying in aligner plugin."
cp $builddir/score-aligner.dylib "$source"/Contents/Resources/

echo
echo "Copying in dummy aligner plugin."
cp $builddir/dummy-aligner.dylib "$source"/Contents/Resources/

echo
echo "Copying in lproj directories containing InfoPlist.strings translation files."
cp -r i18n/*.lproj "$source"/Contents/Resources/
4 changes: 2 additions & 2 deletions deploy/win64/build-64.bat
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@ echo on

set STARTPWD=%CD%

set QTDIR=C:\QtOpenSource\6.6.2\msvc2019_64
set QTDIR=C:\QtOpenSource\6.7.2\msvc2019_64
if not exist %QTDIR% (
@ echo Could not find 64-bit Qt in %QTDIR%
@ exit /b 2
@@ -55,7 +55,7 @@ copy %QTDIR%\plugins\platforms\qdirect2d.dll .\%BUILDDIR%\plugins\platforms
copy %QTDIR%\plugins\platforms\qminimal.dll .\%BUILDDIR%\plugins\platforms
copy %QTDIR%\plugins\platforms\qoffscreen.dll .\%BUILDDIR%\plugins\platforms
copy %QTDIR%\plugins\platforms\qwindows.dll .\%BUILDDIR%\plugins\platforms
copy %QTDIR%\plugins\styles\qwindowsvistastyle.dll .\%BUILDDIR%\plugins\styles
copy %QTDIR%\plugins\styles\qmodernwindowsstyle.dll .\%BUILDDIR%\plugins\styles

copy sv-dependency-builds\win64-msvc\lib\libsndfile-1.dll .\%BUILDDIR%

2 changes: 0 additions & 2 deletions deploy/win64/build-and-package.bat
Original file line number Diff line number Diff line change
@@ -13,8 +13,6 @@ if not exist "C:\Program Files (x86)\WiX Toolset v3.14\bin" (
)

set ORIGINALPATH=%PATH%
set PATH=C:\Program Files (x86)\Windows Kits\10\bin\x64;%PATH%
set NAME=Christopher Cannam

set ARG=%1
shift
8 changes: 7 additions & 1 deletion deploy/win64/package.ps1
Original file line number Diff line number Diff line change
@@ -14,13 +14,19 @@ if ($args[0] -eq "sign") {
. deploy\metadata.ps1

$kitdir = "C:\Program Files (x86)\Windows Kits\10\bin\10.0.22621.0\x64"
$wixdir = "C:\Program Files (x86)\WiX Toolset v3.14\bin"

if (! (Test-Path -Path $kitdir -PathType Container)) {
"NOTE: Windows Kit directory $kitdir not found, going for generic default"
$kitdir = "C:\Program Files (x86)\Windows Kits\10\bin\x64"
}

if (! (Test-Path -Path $kitdir -PathType Container)) {
"ERROR: Windows Kit directory $kitdir not found"
exit 2
}

$wixdir = "C:\Program Files (x86)\WiX Toolset v3.14\bin"

if (! (Test-Path -Path $wixdir -PathType Container)) {
"ERROR: WiX Toolset directory $wixdir not found"
exit 2
15 changes: 12 additions & 3 deletions deploy/win64/wxs.in
Original file line number Diff line number Diff line change
@@ -237,9 +237,9 @@
Id="Qt6StylePlugins"
Guid="f7c74e62-d0b6-4c47-a87f-6e3a0294ea4d">
<File
Id="qwindowsvistastyle"
Name="qwindowsvistastyle.dll"
Source="build_win64\plugins\styles\qwindowsvistastyle.dll"/>
Id="qmodernwindowsstyle"
Name="qmodernwindowsstyle.dll"
Source="build_win64\plugins\styles\qmodernwindowsstyle.dll"/>
</Component>
</Directory>

@@ -303,6 +303,14 @@
Name="score-aligner.dll"
Source="build_win64\score-aligner.dll"/>
</Component>
<Component Win64="yes"
Id="DummyAligner64"
Guid="c7a895ca-42c0-43c2-bfc8-282c2610ef7a">
<File
Id="dummyaligner64"
Name="dummy-aligner.dll"
Source="build_win64\dummy-aligner.dll"/>
</Component>
</Directory> <!-- plugins -->
</Directory> <!-- sv -->
</Directory> <!-- pfiles64 -->
@@ -343,6 +351,7 @@
<ComponentRef Id="Piper64"/>
<ComponentRef Id="Checker64"/>
<ComponentRef Id="Aligner64"/>
<ComponentRef Id="DummyAligner64"/>
<ComponentRef Id="ProgramMenuDir"/>
@COMPONENT_REFS@
</Feature>
15 changes: 11 additions & 4 deletions main/MainWindow.cpp
Original file line number Diff line number Diff line change
@@ -259,9 +259,12 @@ MainWindow::MainWindow(AudioMode audioMode, MIDIMode midiMode, bool withOSCSuppo
this, &MainWindow::scoreSelectionChanged);
connect(m_scoreWidget, &ScoreWidget::pageChanged,
this, &MainWindow::scorePageChanged);

m_alignButton = new QPushButton(tr("Align"));

int alignButtonWidth = 50 + QFontMetrics(font()).horizontalAdvance
(tr("Align Selection of Score with All of Audio"));
m_alignButton = new QPushButton();
m_alignButton->setIcon(IconLoader().load("align"));
m_alignButton->setMinimumWidth(alignButtonWidth);
connect(m_alignButton, SIGNAL(clicked()),
this, SLOT(alignButtonClicked()));
m_alignButton->setEnabled(false);
@@ -276,6 +279,7 @@ MainWindow::MainWindow(AudioMode audioMode, MIDIMode midiMode, bool withOSCSuppo
aclayout->addWidget(m_alignButton);
aclayout->addWidget(m_alignerChoice);
aclayout->setContentsMargins(0, 2, 0, 0);
aclayout->setSpacing(3);
m_alignCommands->setLayout(aclayout);

m_alignAcceptButton = new QPushButton
@@ -293,6 +297,7 @@ MainWindow::MainWindow(AudioMode audioMode, MIDIMode midiMode, bool withOSCSuppo
aalayout->addWidget(m_alignAcceptButton);
aalayout->addWidget(m_alignRejectButton);
aalayout->setContentsMargins(0, 0, 0, 0);
aalayout->setSpacing(3);
m_alignAcceptReject->setLayout(aalayout);

m_scorePageDownButton = new QPushButton("<<");
@@ -311,7 +316,7 @@ MainWindow::MainWindow(AudioMode audioMode, MIDIMode midiMode, bool withOSCSuppo
scoreWidgetLayout->addWidget(m_alignAcceptReject, 1, 0, 1, 3, Qt::AlignHCenter);
m_alignAcceptReject->hide();
scoreWidgetLayout->addWidget(m_scorePageDownButton, 2, 0);
scoreWidgetLayout->addWidget(m_scorePageLabel, 2, 1);
scoreWidgetLayout->addWidget(m_scorePageLabel, 2, 1, Qt::AlignCenter);
scoreWidgetLayout->addWidget(m_scorePageUpButton, 2, 2);

QGroupBox *selectionGroupBox = new QGroupBox(tr("Selection within Score"));
@@ -689,7 +694,7 @@ MainWindow::setupFileMenu()
// Added by YJ: Ocs 5, 2021
icon = il.load("chooseScore");
action = new QAction(icon, tr("&Choose Score..."), this);
// action->setShortcut(tr("Ctrl+N"));
action->setShortcut(tr("Ctrl+E"));
action->setStatusTip(tr("Choose a new score"));
connect(action, SIGNAL(triggered()), this, SLOT(openScoreFile()));
// m_keyReference->registerShortcut(action);
@@ -2965,6 +2970,8 @@ MainWindow::alignmentReadyForReview()

m_paneStack->setCurrentLayer(onsetsPane, onsetsLayer);

m_alignAcceptReject->setFixedSize(m_alignCommands->size());

m_alignCommands->hide();
m_alignAcceptReject->show();

8 changes: 7 additions & 1 deletion main/ScoreWidget.cpp
Original file line number Diff line number Diff line change
@@ -175,15 +175,21 @@ ScoreWidget::loadScoreFile(QString scoreName, QString scoreFile, QString &errorS
SVDEBUG << "ScoreWidget::loadScoreFile: Failed to set Verovio resource path" << endl;
return false;
}

string defaultOptions = "\"footer\": \"none\"";

if (m_scale != 100) {
toolkit.SetOptions("{\"scaleToPageSize\": true}");
toolkit.SetOptions("{\"scaleToPageSize\": true, " + defaultOptions + "}");
if (!toolkit.SetScale(m_scale)) {
SVDEBUG << "ScoreWidget::loadScoreFile: Failed to set rendering scale" << endl;
} else {
SVDEBUG << "ScoreWidget::loadScoreFile: Set scale to " << m_scale << endl;
}
SVDEBUG << "options: " << toolkit.GetOptions() << endl;
} else {
toolkit.SetOptions("{" + defaultOptions + "}");
}

if (!toolkit.LoadFile(scoreFile.toStdString())) {
SVDEBUG << "ScoreWidget::loadScoreFile: Load failed in Verovio toolkit" << endl;
return false;
32 changes: 31 additions & 1 deletion meson.build
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@
project(
'Piano Precision',
'c', 'cpp',
version: '1.0.0',
version: '1.1.0',
license: 'GPL-2.0-or-later',
default_options: [
'cpp_std=c++17',
@@ -1457,6 +1457,15 @@ ppa_files = [
'piano-precision-aligner/plugins.cpp',
]

dummy_files = [
'dummy-score-aligner/DummyAligner.cpp',
'dummy-score-aligner/DummyAudioToScoreAligner.cpp',
'dummy-score-aligner/Score.cpp',
'dummy-score-aligner/Templates.cpp',
'dummy-score-aligner/Paths.cpp',
'dummy-score-aligner/plugins.cpp',
]

ppa_plugin = shared_library(
'score-aligner',
ppa_files,
@@ -1478,6 +1487,27 @@ ppa_plugin = shared_library(
install: true,
)

dummy_plugin = shared_library(
'dummy-aligner',
dummy_files,
vampsdk_files,
include_directories: [
'vamp-plugin-sdk',
],
cpp_args: [
general_defines,
],
dependencies: [
vampsdk_dep,
],
link_args: [
general_link_args,
vamp_symbol_args,
],
name_prefix: '',
install: true,
)

qt_resource_files = qt.preprocess(
qresources: [
'piano-precision.qrc',
7 changes: 5 additions & 2 deletions repoint-lock.json
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
"pin": "63e0c3b37b6fb9ce6f074ea8222b4903e4f5568a"
},
"svcore": {
"pin": "a173a54cd5e7c61bf71332ebb6ab1417b4319e27"
"pin": "9a6763ad2867f9f72ed0a86a3458b3cb1bc10a87"
},
"svgui": {
"pin": "2796d24d9e1918d3ed12057f801ca07c9c1032a3"
@@ -16,7 +16,7 @@
"pin": "fae540cf4a79ac5ed5a4d4dc0df680b1acbe8628"
},
"sv-dependency-builds": {
"pin": "2d7667f145b5758eb277423e451bd5c2374dfb22"
"pin": "01bb14514cdbed5f7741ddad8d0a0e1021fbbcbc"
},
"icons/scalable": {
"pin": "fa47556361a34604e042c9a1820051424451a024"
@@ -53,6 +53,9 @@
},
"piano-precision-aligner": {
"pin": "ea967162dcc582a8354d4b8a6ae3b3a2a914589d"
},
"dummy-score-aligner": {
"pin": "0d39744a7a7e63471e0219e8287d5c1a564de7f5"
}
}
}
5 changes: 5 additions & 0 deletions repoint-project.json
Original file line number Diff line number Diff line change
@@ -102,6 +102,11 @@
"service": "github",
"owner": "yucongj",
"branch": "main"
},
"dummy-score-aligner": {
"vcs": "git",
"service": "github",
"owner": "yucongj"
}
}
}