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.

Sign up for GitHub

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

[WIP] Use jack module from system #83

Open
wants to merge 8 commits into
base: master
Choose a base branch
from
Open

[WIP] Use jack module from system #83

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
1bbae40
Use jack module from system
Vampouille Sep 30, 2019
7ff9f62
Fix use of deprecated transport_locate()
Vampouille Oct 1, 2019
4faa13b
FIX #16: handle file not found
damdam-s Oct 3, 2019
dc931da
Update SuperBoucle.sh
Vampouille Oct 6, 2019
9db9284
Fix dirty setup.py when deb Makefile target failed
Vampouille Oct 8, 2019
89d2286
Set python version to 3 in launch script
Vampouille Oct 8, 2019
b9fd8ed
Add debug on jack
Vampouille Nov 14, 2019
56ac778
Fix device mapping
Vampouille Dec 24, 2019
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
Prev Previous commit
Next Next commit
Fix use of deprecated transport_locate()
  • Loading branch information
@Vampouille
Vampouille committed Oct 1, 2019
commit 7ff9f62eb0a070e4ea4736961a1f01f5a7af4853
15 changes: 7 additions & 8 deletions setup.py.debian.patch
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,10 @@
--- setup.py.orig 2019-09-20 20:37:21.225084734 +0200
+++ setup.py 2019-09-20 20:37:36.697702211 +0200
@@ -9,7 +9,7 @@
author_email='superboucle@nura.eu',
--- setup.py.orig 2019-09-30 19:16:22.578773094 +0200
+++ setup.py 2019-09-30 19:16:29.371726762 +0200
@@ -10,7 +10,6 @@
description='Loop application synced with jack transport',
long_description=open('readme.md').read(),
- install_requires=["SoundFile>=0.10", "PyQt5>=5.11", "numpy>=1.16"],
+ install_requires=["SoundFile>=0.10", "numpy>=1.16"],
install_requires=["JACK-Client>=0.4.5",
- "PyQt5>=5.11",
"SoundFile>=0.10",
"numpy>=1.16"],
include_package_data=True,
url='http://superboucle.nura.eu',
classifiers=[
4 changes: 1 addition & 3 deletions superboucle/boucle.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,8 +186,6 @@ def my_callback(frames):
except Empty:
pass

return jack.CALL_AGAIN


client.set_process_callback(my_callback)

Expand Down Expand Up @@ -222,4 +220,4 @@ def start():


if __name__ == "__main__":
start()
start()
6 changes: 3 additions & 3 deletions superboucle/gui.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,7 @@ def initUI(self, song):

def openSongFromDisk(self, file_name):
self._jack_client.transport_stop()
self._jack_client.transport_locate(0)
self._jack_client.transport_frame = 0

self.setEnabled(False)
message = QMessageBox(self)
Expand Down Expand Up @@ -338,7 +338,7 @@ def onGotoClicked(self):
* (self.gotoTarget.value() - 1)
* position['frame_rate']
* (60 / position['beats_per_minute']))
self._jack_client.transport_locate(int(round(new_position, 0)))
self._jack_client.transport_frame = int(round(new_position, 0))

def onRecord(self):
self.song.is_record = not self.song.is_record
Expand All @@ -356,7 +356,7 @@ def updateRecordBtn(self):
self.queue_out.put(((msg_type << 4) + channel, pitch, color))

def onRewindClicked(self):
self._jack_client.transport_locate(0)
self._jack_client.transport_frame = 0

def onClipNameChange(self):
self.last_clip.name = self.clip_name.text()
Expand Down