* Finished renaming stuff
git-svn-id: svn+ssh://svn.marcochapeau.org/laditools/trunk@141 bfe161da-02ef-4cea-8c43-ae261ea21ac6
This commit is contained in:
marco
parent
50a4187442
commit
65ca895c2d
|
|
@ -1,2 +1,2 @@
|
|||
recursive-include data *.svg *.glade
|
||||
include TODO INSTALL COPYING
|
||||
include INSTALL COPYING
|
||||
|
|
|
|||
10
README
10
README
|
|
@ -1,13 +1,13 @@
|
|||
The python JACK dbus controller suite
|
||||
Linux Audio Desktop Integration Tools
|
||||
|
||||
This project was created to take advantage of Nedko Arnaudov's JACK Audio Connection Kit (improvements) patches, especially the dbus one. Those patches can be found here : http://sharesource.org/project/jack/
|
||||
LADITools is a set of tools aiming to achieve the goals of the LADI project to improve desktop integration and user workflow of Linux audio system based on JACK and LASH. Those tools take advantage of the DBus interfaces recently added to JACK and LASH to ease the configuration and use of those two great softwares.
|
||||
|
||||
You will find in this suite :
|
||||
- The pyjackctl python module
|
||||
- jacktray : a system tray icon
|
||||
- The laditools python module
|
||||
- laditray : a system tray icon
|
||||
- wmjackctl : a controller as a Window Maker dockapp
|
||||
- ladilog : a JACK, LASH and a2jmidid log viewer
|
||||
- jackconf : a gui to setup jack's configuration
|
||||
- ladiconf : a gui to setup jack's configuration
|
||||
- g15jackmon : a JACK monitor for g15 keyboards
|
||||
|
||||
Enjoy !
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 11 KiB After Width: | Height: | Size: 11 KiB |
|
Before Width: | Height: | Size: 18 KiB After Width: | Height: | Size: 18 KiB |
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# pyjackctl - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# g15jackmon - A jack monitor for the g15 keyboard that uses the dbus interface
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
|
|
|
|||
2
ladiconf
2
ladiconf
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# LADITools - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# ladiconf - A configuration GUI for your Linux Audio Desktop
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
|
|
|
|||
2
ladilog
2
ladilog
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# LADITools - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# ladilog - A log viewer for your Linux Audio Desktop
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
|
|
|
|||
80
laditray
80
laditray
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# LADITools - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# laditray - System tray integration for LADI
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
|
|
@ -26,74 +26,74 @@ import laditools
|
|||
# Default configuration
|
||||
autostart_default = 0
|
||||
|
||||
class jacktray(gtk.StatusIcon, pyjackctl.jack_menu):
|
||||
def __init__(self):
|
||||
class laditray (gtk.StatusIcon, pyjackctl.jack_menu):
|
||||
def __init__ (self):
|
||||
# Handle the configuration
|
||||
self.jacktray_config = pyjackctl.config()
|
||||
self.param_dict = self.jacktray_config.get_as_dict('jacktray')
|
||||
self.jacktray_config = pyjackctl.config ()
|
||||
self.param_dict = self.jacktray_config.get_as_dict ('jacktray')
|
||||
if 'autostart' not in self.param_dict:
|
||||
self.param_dict['autostart'] = str(autostart_default), {}
|
||||
self.autostart, devnull = self.param_dict['autostart']
|
||||
self.autostart = int(self.autostart)
|
||||
self.autostart = int (self.autostart)
|
||||
# Build the UI
|
||||
pyjackctl.jack_menu.__init__(self)
|
||||
gtk.StatusIcon.__init__(self)
|
||||
self.jack = pyjackctl.jack_controller()
|
||||
pyjackctl.jack_menu.__init__ (self)
|
||||
gtk.StatusIcon.__init__ (self)
|
||||
self.jack = pyjackctl.jack_controller ()
|
||||
if self.autostart:
|
||||
self.jack.start()
|
||||
self.jack.start ()
|
||||
# Create the needed pixbufs to manage the status icon's look
|
||||
self.stopped_pixbuf = gtk.gdk.pixbuf_new_from_file("/usr/share/pyjackctl/data/stopped.svg")
|
||||
self.starting_pixbuf = gtk.gdk.pixbuf_new_from_file("/usr/share/pyjackctl/data/starting.svg")
|
||||
self.started_pixbuf = gtk.gdk.pixbuf_new_from_file("/usr/share/pyjackctl/data/started.svg")
|
||||
self.set_from_pixbuf(self.stopped_pixbuf)
|
||||
self.stopped_pixbuf = gtk.gdk.pixbuf_new_from_file ("/usr/share/pyjackctl/data/stopped.svg")
|
||||
self.starting_pixbuf = gtk.gdk.pixbuf_new_from_file ("/usr/share/pyjackctl/data/starting.svg")
|
||||
self.started_pixbuf = gtk.gdk.pixbuf_new_from_file ("/usr/share/pyjackctl/data/started.svg")
|
||||
self.set_from_pixbuf (self.stopped_pixbuf)
|
||||
# Get the initial status
|
||||
self.update()
|
||||
self.update ()
|
||||
# Add the auto update callback
|
||||
self.auto_updater = timeout_add(250, self.update)
|
||||
self.auto_updater = timeout_add (250, self.update)
|
||||
# Make the menu popup when the icon is right clicked
|
||||
self.connect("popup-menu", self.menu_activate)
|
||||
self.connect ("popup-menu", self.menu_activate)
|
||||
|
||||
def menu_activate(self, statusicon, button, activate_time):
|
||||
self.menu.popup(None, None, gtk.status_icon_position_menu, button, activate_time, self)
|
||||
self.menu.reposition()
|
||||
def menu_activate (self, statusicon, button, activate_time):
|
||||
self.menu.popup (None, None, gtk.status_icon_position_menu, button, activate_time, self)
|
||||
self.menu.reposition ()
|
||||
|
||||
def set_starting_status(self):
|
||||
self.set_tooltip("JACK is starting")
|
||||
self.set_from_pixbuf(self.starting_pixbuf)
|
||||
def set_starting_status (self):
|
||||
self.set_tooltip ("JACK is starting")
|
||||
self.set_from_pixbuf (self.starting_pixbuf)
|
||||
|
||||
def update(self):
|
||||
def update (self):
|
||||
try:
|
||||
if not self.jack:
|
||||
self.jack = pyjackctl.jack_controller()
|
||||
if self.jack.is_started():
|
||||
self.jack = pyjackctl.jack_controller ()
|
||||
if self.jack.is_started ():
|
||||
# Get Realtime status
|
||||
if self.jack.is_realtime():
|
||||
if self.jack.is_realtime ():
|
||||
status_text = "RT | "
|
||||
# Get DSP Load
|
||||
status_text += str(round(float(self.jack.get_load()),1)) + "% | "
|
||||
status_text += str (round (float (self.jack.get_load ()),1)) + "% | "
|
||||
# Get Xruns
|
||||
status_text += str(self.jack.get_xruns())
|
||||
status_text += str (self.jack.get_xruns ())
|
||||
# Set a started status
|
||||
self.set_tooltip(status_text)
|
||||
self.set_from_pixbuf(self.started_pixbuf)
|
||||
self.set_tooltip (status_text)
|
||||
self.set_from_pixbuf (self.started_pixbuf)
|
||||
else:
|
||||
self.set_tooltip("JACK is stopped")
|
||||
self.set_from_pixbuf(self.stopped_pixbuf)
|
||||
self.set_tooltip ("JACK is stopped")
|
||||
self.set_from_pixbuf (self.stopped_pixbuf)
|
||||
except:
|
||||
self.set_tooltip("JACK is sick")
|
||||
self.set_from_pixbuf(self.stopped_pixbuf)
|
||||
self.set_tooltip ("JACK is sick")
|
||||
self.set_from_pixbuf (self.stopped_pixbuf)
|
||||
self.jack = None
|
||||
# Take a look at the processes we've started so we don't get any zombies
|
||||
for i in self.proc_list:
|
||||
i.poll()
|
||||
i.poll ()
|
||||
return True
|
||||
|
||||
def run(self):
|
||||
gtk.main()
|
||||
self.jacktray_config.set_as_dict('jacktray', self.param_dict)
|
||||
gtk.main ()
|
||||
self.jacktray_config.set_as_dict ('jacktray', self.param_dict)
|
||||
return 0
|
||||
|
||||
def get_controller(self):
|
||||
def get_controller (self):
|
||||
return self.jack
|
||||
|
||||
jacktray().run()
|
||||
laditray ().run ()
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# pyjackctl - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# pyjackctl - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# pyjackctl - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# pyjackctl - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -14,4 +14,4 @@
|
|||
# You should have received a copy of the GNU General Public License
|
||||
# along with this program. If not, see <http://www.gnu.org/licenses/>.
|
||||
|
||||
#This is planned to be the file for some future error handling...
|
||||
#This is planned to be the file for some future error handling...
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# pyjackctl - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -116,4 +116,4 @@ class jack_configure:
|
|||
value = dbus.Int32(value)
|
||||
elif typestr == "u":
|
||||
value = dbus.UInt32(value)
|
||||
self.iface.SetEngineParameterValue(param, value)
|
||||
self.iface.SetEngineParameterValue(param, value)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# pyjackctl - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
|
|
@ -54,4 +54,4 @@ class jack_controller:
|
|||
self.iface.StopServer()
|
||||
|
||||
def kill(self):
|
||||
self.iface.Exit()
|
||||
self.iface.Exit()
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
# pyjackctl - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
# This program is free software: you can redistribute it and/or modify
|
||||
|
|
|
|||
4
setup.py
4
setup.py
|
|
@ -29,8 +29,8 @@ setup(name='laditools',
|
|||
scripts=['laditray', 'wmjackctl', 'g15jackmon', 'ladilog', 'ladiconf', 'wma2jctl'],
|
||||
data_files=[('share/doc/laditools', ['README', 'COPYING', 'INSTALL', 'TODO']),
|
||||
('share/pixmaps', ['data/pyjackctl.svg']),
|
||||
('share/pyjackctl/data', ['data/pyjackctl.svg']),
|
||||
('share/pyjackctl/data', ['data/pyjackctl_logo.svg',
|
||||
('share/laditools/data', ['data/laditools.svg']),
|
||||
('share/laditools/data', ['data/laditools_logo.svg',
|
||||
'data/ladilog_ui.glade',
|
||||
'data/ladiconf_ui.glade',
|
||||
'data/started.svg',
|
||||
|
|
|
|||
2
wma2jctl
2
wma2jctl
|
|
@ -1,6 +1,6 @@
|
|||
#!/usr/bin/env python
|
||||
|
||||
# pyjackctl - The python jackdbus controller suite
|
||||
# LADITools - Linux Audio Desktop Integration Tools
|
||||
# wmjackctl - Window maker dockapp for jackdbus
|
||||
# Copyright (C) 2007-2008, Marc-Olivier Barre and Nedko Arnaudov.
|
||||
#
|
||||
|
|
|
|||
Loading…
Reference in New Issue