Changeset 1748

Show
Ignore:
Timestamp:
12/04/09 14:44:08 (11 years ago)
Author:
arnonym
Message:

Split the main-part of ffado-mixer.in into ffado/ffadowindow.py.

Use that new independency to create ffado-mixer-profiler (which isn't installed system-wide). Maybe that helps to determine where time is ticking away.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • trunk/libffado/support/mixer-qt4

    • Property svn:ignore changed from
      *ui.py
      *.pyc
      ffado-mixer
      .*.swp
      ffadomixer_config.py
      to
      *.pyc
      ffado-mixer
      ffado-mixer-profiler
      .*.swp
  • trunk/libffado/support/mixer-qt4/ffado-mixer-profiler.in

    r1711 r1748  
    11#!/usr/bin/python 
    22# 
    3 # Copyright (C) 2005-2008 by Pieter Palmers 
    4 #               2007-2008 by Arnold Krille 
     3# Copyright (C) 2005-2009 by Pieter Palmers 
     4#               2007-2009 by Arnold Krille 
    55# 
    66# This file is part of FFADO 
     
    1111# This program is free software: you can redistribute it and/or modify 
    1212# it under the terms of the GNU General Public License as published by 
    13 # the Free Software Foundation, either version 3 of the License, or 
    14 # (at your option) any later version. 
     13# the Free Software Foundation, either version 3 of the License. 
    1514# 
    1615# This program is distributed in the hope that it will be useful, 
     
    2322# 
    2423 
    25 
    26 # QT 4 version 
    27 
    28  
    29 import sys, os 
     24import sys 
    3025 
    3126# Add the path of the installed ffado-modules 
     
    3328sys.path.append( "$PYPKGDIR" ) 
    3429 
    35 from ffado.config import * #POLL_SLEEP_TIME_MSEC, FFADO_DBUS_SERVER, FFADO_DBUS_BASEPATH 
     30from ffado.ffadowindow import * 
    3631 
    37 import os 
    38 import time 
    39  
    40 from PyQt4.QtCore import SIGNAL, SLOT, QObject, QTimer, Qt 
    41 from PyQt4.QtGui import * #QApplication, QMessageBox, QIcon 
    42  
    43 from ffado.dbus_util import * 
    44  
    45 from ffado.panelmanager import PanelManager 
    46  
    47 from ffado.logginghandler import * 
    48  
    49 """Just a small helper to ask the retry-question without a blocking messagebox""" 
    50 class StartDialog(QWidget): 
    51     def __init__(self, parent): 
    52         QWidget.__init__(self, parent) 
    53         self.setObjectName("Restart Dialog") 
    54         self.label = QLabel("Somehow the connection to the dbus-service of FFADO couldn't be established.\nShall we take another try?",self) 
    55         self.button = QPushButton("Retry", self) 
    56         self.layout = QGridLayout(self) 
    57         self.layout.addWidget(self.label, 0, 0, Qt.AlignCenter) 
    58         self.layout.addWidget(self.button, 1, 0, Qt.AlignCenter) 
    59  
    60 class FFADOWindow(QMainWindow): 
    61     def __init__(self, parent): 
    62         QMainWindow.__init__(self, parent) 
    63  
    64         self.textlogger = QTextLogger(self) 
    65         dock = QDockWidget("Log Messages",self) 
    66         dock.setWidget(self.textlogger.textedit) 
    67         logging.getLogger('').addHandler(self.textlogger) 
    68         self.addDockWidget(Qt.BottomDockWidgetArea, dock) 
    69  
    70         self.statuslogger = QStatusLogger(self, self.statusBar(), 20) 
    71         logging.getLogger('').addHandler(self.statuslogger) 
    72  
    73         self.manager = PanelManager(self) 
    74  
    75         filemenu = self.menuBar().addMenu("File") 
    76         quitaction = QAction("Quit", self) 
    77         quitaction.setShortcut(self.tr("Ctrl+q")) 
    78         self.connect(quitaction, SIGNAL("triggered()"), self, SLOT("close()")) 
    79         filemenu.addAction(quitaction) 
    80  
    81         editmenu = self.menuBar().addMenu("Edit") 
    82         self.updateaction = QAction("Update Mixer Panels", self) 
    83         self.updateaction.setEnabled(False) 
    84         self.connect(self.updateaction, SIGNAL("triggered()"), self.manager.updatePanels) 
    85         editmenu.addAction(self.updateaction) 
    86  
    87         helpmenu = self.menuBar().addMenu( "Help" ) 
    88         aboutaction = QAction( "About FFADO", self ) 
    89         self.connect( aboutaction, SIGNAL( "triggered()" ), self.aboutFFADO ) 
    90         helpmenu.addAction( aboutaction ) 
    91         aboutqtaction = QAction( "About Qt", self ) 
    92         self.connect( aboutqtaction, SIGNAL( "triggered()" ), qApp, SLOT( "aboutQt()" ) ) 
    93         helpmenu.addAction( aboutqtaction ) 
    94  
    95         log.info( "Starting up" ) 
    96  
    97         QTimer.singleShot( 1, self.connectToDBUS ) 
    98  
    99     def __del__(self): 
    100         log.info("__del__") 
    101         del self.manager 
    102         log.info("__del__ finished") 
    103  
    104     def closeEvent(self, event): 
    105         log.info("closeEvent()") 
    106         event.accept() 
    107  
    108     def connectToDBUS(self): 
    109         try: 
    110             self.setupDeviceManager() 
    111         except dbus.DBusException, ex: 
    112             log.error("Could not communicate with the FFADO DBus service...") 
    113             if not hasattr(self,"retry"): 
    114                 self.retry = StartDialog(self) 
    115                 self.setCentralWidget(self.retry) 
    116                 self.connect(self.retry.button, SIGNAL("clicked()"), self.tryStartDBUSServer) 
    117             self.retry.setEnabled(True) 
    118  
    119     def tryStartDBUSServer(self): 
    120         try: 
    121             self.setupDeviceManager() 
    122         except dbus.DBusException, ex: 
    123             self.retry.setEnabled(False) 
    124             os.spawnlp( os.P_NOWAIT, "ffado-dbus-server" ) 
    125             QTimer.singleShot(2000, self.connectToDBUS) 
    126  
    127     def setupDeviceManager(self): 
    128         devmgr = DeviceManagerInterface(FFADO_DBUS_SERVER, FFADO_DBUS_BASEPATH) 
    129         #nbDevices = devmgr.getNbDevices() 
    130         self.manager.setManager(devmgr) 
    131         self.setCentralWidget(self.manager) 
    132         self.updateaction.setEnabled(True) 
    133  
    134     def aboutFFADO(self): 
    135         QMessageBox.about( self, "About FFADO", """ 
    136 <h1>ffado.org</h1> 
    137  
    138 <p>FFADO is the new approach to have firewire audio on linux.</p> 
    139  
    140 <p>&copy; 2006-2008 by the FFADO developers<br />ffado is licensed under the GPLv3, for the full license text see <a href="http://www.gnu.org/licenses/">www.gnu.org/licenses</a> or the LICENSE.* files shipped with ffado.</p> 
    141  
    142 <p>FFADO developers are:<ul> 
    143 <li>Pieter Palmers 
    144 <li>Daniel Wagner 
    145 <li>Jonathan Woithe 
    146 <li>Arnold Krille 
    147 </ul> 
    148 """ ) 
    149  
     32import cProfile 
    15033 
    15134if __name__ == "__main__": 
    152     #set up logging 
    153     import logging 
    154     logging.basicConfig( datefmt="%H:%M:%S", format="%(asctime)s %(name)-16s %(levelname)-8s %(message)s" ) 
    155  
    156     if DEBUG: 
    157         debug_level = logging.DEBUG 
    158     else: 
    159         debug_level = logging.INFO 
    160  
    161     # main loggers: 
    162     logging.getLogger('main').setLevel(debug_level) 
    163     logging.getLogger('dbus').setLevel(debug_level) 
    164     logging.getLogger('registration').setLevel(debug_level) 
    165     logging.getLogger('panelmanager').setLevel(debug_level) 
    166     logging.getLogger('configparser').setLevel(logging.INFO) 
    167  
    168     # widgets: 
    169     logging.getLogger('matrixmixer').setLevel(debug_level) 
    170     logging.getLogger('crossbarrouter').setLevel(debug_level) 
    171  
    172     # mixers: 
    173     logging.getLogger('audiofire').setLevel(debug_level) 
    174     logging.getLogger('bridgeco').setLevel(debug_level) 
    175     logging.getLogger('edirolfa101').setLevel(debug_level) 
    176     logging.getLogger('edirolfa66').setLevel(debug_level) 
    177     logging.getLogger('motu').setLevel(debug_level) 
    178     logging.getLogger('rme').setLevel(debug_level) 
    179     logging.getLogger('phase24').setLevel(debug_level) 
    180     logging.getLogger('phase88').setLevel(debug_level) 
    181     logging.getLogger('quatafire').setLevel(debug_level) 
    182     logging.getLogger('saffirebase').setLevel(debug_level) 
    183     logging.getLogger('saffire').setLevel(debug_level) 
    184     logging.getLogger('saffirepro').setLevel(debug_level) 
    185  
    186     logging.getLogger('global').setLevel(debug_level) 
    187  
    188     log = logging.getLogger('main') 
    189  
    190     app = QApplication(sys.argv) 
    191     app.setWindowIcon( QIcon( SHAREDIR + "/icons/hi64-apps-ffado.png" ) ) 
    192  
    193     app.setOrganizationName("FFADO") 
    194     app.setOrganizationDomain("ffado.org") 
    195     app.setApplicationName("ffado-mixer") 
    196  
    197     mainwindow = FFADOWindow(None) 
    198  
    199  
    200     # rock & roll 
    201     mainwindow.show() 
    202     #QObject.connect(app,SIGNAL("lastWindowClosed()"),app,SLOT("quit()")) 
    203     app.exec_() 
     35    cProfile.run('ffadomain(sys.argv)', sort='time') 
    20436 
    20537# 
  • trunk/libffado/support/mixer-qt4/ffado-mixer.in

    r1711 r1748  
    22# 
    33# Copyright (C) 2005-2008 by Pieter Palmers 
    4 #               2007-2008 by Arnold Krille 
     4#               2007-2009 by Arnold Krille 
    55# 
    66# This file is part of FFADO 
     
    2323# 
    2424 
    25 
    26 # QT 4 version 
    27 
    28  
    29 import sys, os 
     25import sys 
    3026 
    3127# Add the path of the installed ffado-modules 
     
    3329sys.path.append( "$PYPKGDIR" ) 
    3430 
    35 from ffado.config import * #POLL_SLEEP_TIME_MSEC, FFADO_DBUS_SERVER, FFADO_DBUS_BASEPATH 
    36  
    37 import os 
    38 import time 
    39  
    40 from PyQt4.QtCore import SIGNAL, SLOT, QObject, QTimer, Qt 
    41 from PyQt4.QtGui import * #QApplication, QMessageBox, QIcon 
    42  
    43 from ffado.dbus_util import * 
    44  
    45 from ffado.panelmanager import PanelManager 
    46  
    47 from ffado.logginghandler import * 
    48  
    49 """Just a small helper to ask the retry-question without a blocking messagebox""" 
    50 class StartDialog(QWidget): 
    51     def __init__(self, parent): 
    52         QWidget.__init__(self, parent) 
    53         self.setObjectName("Restart Dialog") 
    54         self.label = QLabel("Somehow the connection to the dbus-service of FFADO couldn't be established.\nShall we take another try?",self) 
    55         self.button = QPushButton("Retry", self) 
    56         self.layout = QGridLayout(self) 
    57         self.layout.addWidget(self.label, 0, 0, Qt.AlignCenter) 
    58         self.layout.addWidget(self.button, 1, 0, Qt.AlignCenter) 
    59  
    60 class FFADOWindow(QMainWindow): 
    61     def __init__(self, parent): 
    62         QMainWindow.__init__(self, parent) 
    63  
    64         self.textlogger = QTextLogger(self) 
    65         dock = QDockWidget("Log Messages",self) 
    66         dock.setWidget(self.textlogger.textedit) 
    67         logging.getLogger('').addHandler(self.textlogger) 
    68         self.addDockWidget(Qt.BottomDockWidgetArea, dock) 
    69  
    70         self.statuslogger = QStatusLogger(self, self.statusBar(), 20) 
    71         logging.getLogger('').addHandler(self.statuslogger) 
    72  
    73         self.manager = PanelManager(self) 
    74  
    75         filemenu = self.menuBar().addMenu("File") 
    76         quitaction = QAction("Quit", self) 
    77         quitaction.setShortcut(self.tr("Ctrl+q")) 
    78         self.connect(quitaction, SIGNAL("triggered()"), self, SLOT("close()")) 
    79         filemenu.addAction(quitaction) 
    80  
    81         editmenu = self.menuBar().addMenu("Edit") 
    82         self.updateaction = QAction("Update Mixer Panels", self) 
    83         self.updateaction.setEnabled(False) 
    84         self.connect(self.updateaction, SIGNAL("triggered()"), self.manager.updatePanels) 
    85         editmenu.addAction(self.updateaction) 
    86  
    87         helpmenu = self.menuBar().addMenu( "Help" ) 
    88         aboutaction = QAction( "About FFADO", self ) 
    89         self.connect( aboutaction, SIGNAL( "triggered()" ), self.aboutFFADO ) 
    90         helpmenu.addAction( aboutaction ) 
    91         aboutqtaction = QAction( "About Qt", self ) 
    92         self.connect( aboutqtaction, SIGNAL( "triggered()" ), qApp, SLOT( "aboutQt()" ) ) 
    93         helpmenu.addAction( aboutqtaction ) 
    94  
    95         log.info( "Starting up" ) 
    96  
    97         QTimer.singleShot( 1, self.connectToDBUS ) 
    98  
    99     def __del__(self): 
    100         log.info("__del__") 
    101         del self.manager 
    102         log.info("__del__ finished") 
    103  
    104     def closeEvent(self, event): 
    105         log.info("closeEvent()") 
    106         event.accept() 
    107  
    108     def connectToDBUS(self): 
    109         try: 
    110             self.setupDeviceManager() 
    111         except dbus.DBusException, ex: 
    112             log.error("Could not communicate with the FFADO DBus service...") 
    113             if not hasattr(self,"retry"): 
    114                 self.retry = StartDialog(self) 
    115                 self.setCentralWidget(self.retry) 
    116                 self.connect(self.retry.button, SIGNAL("clicked()"), self.tryStartDBUSServer) 
    117             self.retry.setEnabled(True) 
    118  
    119     def tryStartDBUSServer(self): 
    120         try: 
    121             self.setupDeviceManager() 
    122         except dbus.DBusException, ex: 
    123             self.retry.setEnabled(False) 
    124             os.spawnlp( os.P_NOWAIT, "ffado-dbus-server" ) 
    125             QTimer.singleShot(2000, self.connectToDBUS) 
    126  
    127     def setupDeviceManager(self): 
    128         devmgr = DeviceManagerInterface(FFADO_DBUS_SERVER, FFADO_DBUS_BASEPATH) 
    129         #nbDevices = devmgr.getNbDevices() 
    130         self.manager.setManager(devmgr) 
    131         self.setCentralWidget(self.manager) 
    132         self.updateaction.setEnabled(True) 
    133  
    134     def aboutFFADO(self): 
    135         QMessageBox.about( self, "About FFADO", """ 
    136 <h1>ffado.org</h1> 
    137  
    138 <p>FFADO is the new approach to have firewire audio on linux.</p> 
    139  
    140 <p>&copy; 2006-2008 by the FFADO developers<br />ffado is licensed under the GPLv3, for the full license text see <a href="http://www.gnu.org/licenses/">www.gnu.org/licenses</a> or the LICENSE.* files shipped with ffado.</p> 
    141  
    142 <p>FFADO developers are:<ul> 
    143 <li>Pieter Palmers 
    144 <li>Daniel Wagner 
    145 <li>Jonathan Woithe 
    146 <li>Arnold Krille 
    147 </ul> 
    148 """ ) 
    149  
     31from ffado.ffadowindow import * 
    15032 
    15133if __name__ == "__main__": 
    152     #set up logging 
    153     import logging 
    154     logging.basicConfig( datefmt="%H:%M:%S", format="%(asctime)s %(name)-16s %(levelname)-8s %(message)s" ) 
    155  
    156     if DEBUG: 
    157         debug_level = logging.DEBUG 
    158     else: 
    159         debug_level = logging.INFO 
    160  
    161     # main loggers: 
    162     logging.getLogger('main').setLevel(debug_level) 
    163     logging.getLogger('dbus').setLevel(debug_level) 
    164     logging.getLogger('registration').setLevel(debug_level) 
    165     logging.getLogger('panelmanager').setLevel(debug_level) 
    166     logging.getLogger('configparser').setLevel(logging.INFO) 
    167  
    168     # widgets: 
    169     logging.getLogger('matrixmixer').setLevel(debug_level) 
    170     logging.getLogger('crossbarrouter').setLevel(debug_level) 
    171  
    172     # mixers: 
    173     logging.getLogger('audiofire').setLevel(debug_level) 
    174     logging.getLogger('bridgeco').setLevel(debug_level) 
    175     logging.getLogger('edirolfa101').setLevel(debug_level) 
    176     logging.getLogger('edirolfa66').setLevel(debug_level) 
    177     logging.getLogger('motu').setLevel(debug_level) 
    178     logging.getLogger('rme').setLevel(debug_level) 
    179     logging.getLogger('phase24').setLevel(debug_level) 
    180     logging.getLogger('phase88').setLevel(debug_level) 
    181     logging.getLogger('quatafire').setLevel(debug_level) 
    182     logging.getLogger('saffirebase').setLevel(debug_level) 
    183     logging.getLogger('saffire').setLevel(debug_level) 
    184     logging.getLogger('saffirepro').setLevel(debug_level) 
    185  
    186     logging.getLogger('global').setLevel(debug_level) 
    187  
    188     log = logging.getLogger('main') 
    189  
    190     app = QApplication(sys.argv) 
    191     app.setWindowIcon( QIcon( SHAREDIR + "/icons/hi64-apps-ffado.png" ) ) 
    192  
    193     app.setOrganizationName("FFADO") 
    194     app.setOrganizationDomain("ffado.org") 
    195     app.setApplicationName("ffado-mixer") 
    196  
    197     mainwindow = FFADOWindow(None) 
    198  
    199  
    200     # rock & roll 
    201     mainwindow.show() 
    202     #QObject.connect(app,SIGNAL("lastWindowClosed()"),app,SLOT("quit()")) 
    203     app.exec_() 
     34    sys.exit(ffadomain(sys.argv)) 
    20435 
    20536# 
  • trunk/libffado/support/mixer-qt4/ffado/ffadowindow.py

    r1711 r1748  
    22# 
    33# Copyright (C) 2005-2008 by Pieter Palmers 
    4 #               2007-2008 by Arnold Krille 
     4#               2007-2009 by Arnold Krille 
    55# 
    66# This file is part of FFADO 
     
    2323# 
    2424 
    25 # 
    26 # QT 4 version 
    27 # 
    28  
    29 import sys, os 
    30  
    31 # Add the path of the installed ffado-modules 
    32 # for path in sys.path: 
    33 sys.path.append( "$PYPKGDIR" ) 
    34  
    35 from ffado.config import * #POLL_SLEEP_TIME_MSEC, FFADO_DBUS_SERVER, FFADO_DBUS_BASEPATH 
    36  
    3725import os 
    38 import time 
     26 
     27from ffado.config import * 
     28 
     29import os 
    3930 
    4031from PyQt4.QtCore import SIGNAL, SLOT, QObject, QTimer, Qt 
    41 from PyQt4.QtGui import * #QApplication, QMessageBox, QIcon 
     32from PyQt4.QtGui import * 
    4233 
    4334from ffado.dbus_util import * 
     
    149140 
    150141 
    151 if __name__ == "__main__"
     142def ffadomain(args)
    152143    #set up logging 
    153144    import logging 
     
    188179    log = logging.getLogger('main') 
    189180 
    190     app = QApplication(sys.argv
     181    app = QApplication(args
    191182    app.setWindowIcon( QIcon( SHAREDIR + "/icons/hi64-apps-ffado.png" ) ) 
    192183 
     
    200191    # rock & roll 
    201192    mainwindow.show() 
    202     #QObject.connect(app,SIGNAL("lastWindowClosed()"),app,SLOT("quit()")) 
    203     app.exec_() 
     193    return app.exec_() 
     194 
     195if __name__ == "__main__": 
     196    import sys 
     197    sys.exit(ffadomain(sys.argv)) 
    204198 
    205199# 
  • trunk/libffado/support/mixer-qt4/SConscript

    r1640 r1748  
    5151    e.Install( "$bindir", "ffado-mixer" ) 
    5252 
     53    e.ScanReplace( "ffado-mixer-profiler.in" ) 
     54    e.Depends( "ffado-mixer-profiler", "SConscript" ) 
     55    e.Depends( "ffado-mixer-profiler", "#/SConstruct" ) 
     56 
    5357    e.Install( "$sharedir/icons", "../xdg/hi64-apps-ffado.png" ) 
    5458