Mercurial > hg > sonic-visualiser
changeset 2008:55d9bbf1fe45 zoom
Merge from default branch
| author | Chris Cannam |
|---|---|
| date | Mon, 17 Sep 2018 14:05:41 +0100 |
| parents | 246bdf94ef7b (diff) c67285907319 (current diff) |
| children | 0ec19725b20b |
| files | .hgsub .hgsubstate README deploy/src/archive-tip.sh deploy/src/archive.sh deploy/win32/build.cmd main/main.cpp repoint-lock.json repoint-project.json |
| diffstat | 3 files changed, 8 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/main/main.cpp Mon Sep 17 13:23:06 2018 +0100 +++ b/main/main.cpp Mon Sep 17 14:05:41 2018 +0100 @@ -349,8 +349,9 @@ // splash screen. PluginScan::getInstance()->scan(); - // Permit size_t and PropertyName to be used as args in queued signal calls + // Permit these types to be used as args in queued signal calls qRegisterMetaType<PropertyContainer::PropertyName>("PropertyContainer::PropertyName"); + qRegisterMetaType<ZoomLevel>("ZoomLevel"); MainWindow::SoundOptions options = MainWindow::WithEverything; if (!audioOutput) options = 0;
--- a/repoint-lock.json Mon Sep 17 13:23:06 2018 +0100 +++ b/repoint-lock.json Mon Sep 17 14:05:41 2018 +0100 @@ -4,10 +4,10 @@ "pin": "da86fb0bccb3" }, "svcore": { - "pin": "8988b27ebf38" + "pin": "710e6250a401" }, "svgui": { - "pin": "8068a0bee550" + "pin": "13d9b422f7fe" }, "svapp": { "pin": "9e15607531b2"
--- a/repoint-project.json Mon Sep 17 13:23:06 2018 +0100 +++ b/repoint-project.json Mon Sep 17 14:05:41 2018 +0100 @@ -16,11 +16,13 @@ }, "svcore": { "vcs": "hg", - "service": "soundsoftware" + "service": "soundsoftware", + "branch": "zoom" }, "svgui": { "vcs": "hg", - "service": "soundsoftware" + "service": "soundsoftware", + "branch": "zoom" }, "svapp": { "vcs": "hg",