merge with recent tidal changes

tidalcycles · Aug 11, 2022 · 4db0d1a · 4db0d1a
2 parents ac66771 + 2df335d
commit 4db0d1a
Show file tree

Hide file tree

Showing 1,559 changed files with 452,744 additions and 1,111 deletions.
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
@@ -17,23 +17,27 @@ jobs:
             cabal: latest
             args: --allow-newer=base,template-haskell
             experimental: true
+          - ghc: 9.4.1
+            cabal: 3.8.1.0
+            args: --allow-newer=base,template-haskell
+            experimental: false
           - ghc: 9.0.1
             cabal: 3.4.0.0
             args: --allow-newer=base,template-haskell
             experimental: false
           - ghc: 8.10.1
-            cabal: 3.2.0.0
+            cabal: 3.4.0.0
             args: --allow-newer=base,template-haskell
             experimental: false
           - ghc: 8.8.3
-            cabal: 3.0.0.0
+            cabal: 3.4.0.0
             args: --allow-newer=base,template-haskell
             experimental: false
           - ghc: 8.6.5
-            cabal: 2.4.1.0
+            cabal: 3.4.0.0
             experimental: false
           - ghc: 8.4.4
-            cabal: 2.4.1.0
+            cabal: 3.4.0.0
             experimental: false
 
     continue-on-error: ${{ matrix.versions.experimental }}

diff --git a/.github/workflows/listener-build-linux.yml b/.github/workflows/listener-build-linux.yml
@@ -112,16 +112,17 @@ jobs:
     - name: move executable
       run: |
         cp dist-newstyle/build/x86_64-linux/ghc-${{ matrix.ghc }}/tidal-listener-0.1.0.0/x/tidal-listener/build/tidal-listener/tidal-listener tidal-listener/binary/tidal-listener
-        cp dist-newstyle/build/x86_64-linux/ghc-${{ matrix.ghc }}/tidal-1.7.10/x/tidal/build/tidal/tidal tidal-listener/binary/tidal
+        cp dist-newstyle/build/x86_64-linux/ghc-${{ matrix.ghc }}/tidal-*/x/tidal/build/tidal/tidal tidal-listener/binary/tidal
   
     - name: zip files
       run: |
         cd tidal-listener/
-        tar cvfj binary.tar binary/*
+        mv binary tidal
+        tar cvfj linux.tar tidal/*
 
     - uses: actions/upload-artifact@v2
       with:
-        path: tidal-listener/binary.tar
+        path: tidal-listener/linux.tar
 
   release:
     runs-on: ubuntu-latest
@@ -133,4 +134,4 @@ jobs:
 
     - uses: softprops/action-gh-release@v1
       with:
-        files: artifact/binary.tar
+        files: artifact/linux.tar
diff --git a/.github/workflows/listener-build-macosx.yml b/.github/workflows/listener-build-macosx.yml
@@ -101,7 +101,7 @@ jobs:
       - name: move executables
         run: |
           cp -r dist-newstyle/build/x86_64-osx/ghc-${{ matrix.ghc }}/tidal-listener-0.1.0.0/x/tidal-listener/build/tidal-listener/tidal-listener tidal-listener/binary/tidal-listener
-          cp -r dist-newstyle/build/x86_64-osx/ghc-${{ matrix.ghc }}/tidal-1.7.10/x/tidal/build/tidal/tidal tidal-listener/binary/tidal
+          cp -r dist-newstyle/build/x86_64-osx/ghc-${{ matrix.ghc }}/tidal-*/x/tidal/build/tidal/tidal tidal-listener/binary/tidal
 
       - name: zip files
         run: |
@@ -122,4 +122,4 @@ jobs:
 
       - uses: softprops/action-gh-release@v1
         with:
-          files: artifact/macosx.tar
+          files: artifact/macosx.tar
diff --git a/.github/workflows/listener-build-windows.yml b/.github/workflows/listener-build-windows.yml
@@ -82,7 +82,7 @@ jobs:
       - name: move executables
         run: |
           Copy-Item -Path 'dist-newstyle\build\x86_64-windows\ghc-${{ matrix.ghc }}\tidal-listener-0.1.0.0\x\tidal-listener\build\tidal-listener\tidal-listener.exe' -Recurse -Destination 'tidal-listener\binary\tidal-listener.exe'
-          Copy-Item -Path 'dist-newstyle\build\x86_64-windows\ghc-${{ matrix.ghc }}\tidal-1.7.10\x\tidal\build\tidal\tidal.exe' -Recurse -Destination 'tidal-listener\binary\tidal.exe'
+          Copy-Item -Path 'dist-newstyle\build\x86_64-windows\ghc-${{ matrix.ghc }}\tidal-*\x\tidal\build\tidal\tidal.exe' -Recurse -Destination 'tidal-listener\binary\tidal.exe'
 
       - name: zip files
         run: Compress-Archive -LiteralPath 'tidal-listener\binary\' -DestinationPath 'tidal-listener\windows.zip'
@@ -101,4 +101,4 @@ jobs:
 
       - uses: softprops/action-gh-release@v1
         with:
-          files: artifact/windows.zip
+          files: artifact/windows.zip
diff --git a/BootTidal.hs b/BootTidal.hs
@@ -6,8 +6,7 @@ import Sound.Tidal.Context
 import System.IO (hSetEncoding, stdout, utf8)
 hSetEncoding stdout utf8
 
--- total latency = oLatency + cFrameTimespan
-tidal <- startTidal (superdirtTarget {oLatency = 0.1, oAddress = "127.0.0.1", oPort = 57120}) (defaultConfig {cVerbose = True, cFrameTimespan = 1/20})
+tidal <- startTidal (superdirtTarget {oLatency = 0.05, oAddress = "127.0.0.1", oPort = 57120}) (defaultConfig {cVerbose = True, cFrameTimespan = 1/20})
 
 :{
 let only = (hush >>)

diff --git a/cabal.project b/cabal.project
@@ -1 +1 @@
-packages: ./ tidal-parse tidal-listener
+packages: ./ tidal-parse tidal-listener tidal-link
diff --git a/old/sync/Canute.hs b/old/sync/Canute.hs
diff --git a/old/sync/CanuteMIDI.hs b/old/sync/CanuteMIDI.hs
diff --git a/old/sync/Leafcutter.hs b/old/sync/Leafcutter.hs
diff --git a/old/sync/Sync.hs b/old/sync/Sync.hs
diff --git a/old/sync/serial.hs b/old/sync/serial.hs
diff --git a/src/Sound/Tidal/Carabiner.hs b/src/Sound/Tidal/Carabiner.hs
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		packages: ./ tidal-parse tidal-listener
		packages: ./ tidal-parse tidal-listener tidal-link