Hello community, here is the log from the commit of package qjackctl checked in at Tue Apr 3 21:45:16 CEST 2007. -------- --- qjackctl/qjackctl.changes 2006-10-12 18:09:53.000000000 +0200 +++ /mounts/work_src_done/STABLE/qjackctl/qjackctl.changes 2007-04-02 12:03:28.000000000 +0200 @@ -1,0 +2,19 @@ +Mon Apr 2 12:02:29 CEST 2007 - tiwai@suse.de + +- updated to version 0.2.22: + * Fixed default settings for the freebob backend (JACK >= + 0.103.0). + * CPU Load status label now says correctly DSP Load. + * The most recently used patchbay definitions can now be + correctly selected in round-robin fashion from its drop-down + list widget. + * Avoid mixing JACK MIDI ports with regular audio ports on the + Connections and Patchbay widgets; strictly list only audio + ports. + * Added 192k sample rate to setup settings drop down list (as + kindly reminded by Klaus Zimmermann, thanks). + * Most top-level widgets were missing the normal-widget flag, + which were causing some sticky size behavior on some window + managers. + +------------------------------------------------------------------- Old: ---- qjackctl-0.2.21.tar.bz2 New: ---- qjackctl-0.2.22.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qjackctl.spec ++++++ --- /var/tmp/diff_new_pack.X20815/_old 2007-04-03 21:44:15.000000000 +0200 +++ /var/tmp/diff_new_pack.X20815/_new 2007-04-03 21:44:15.000000000 +0200 @@ -1,7 +1,7 @@ # -# spec file for package qjackctl (Version 0.2.21) +# spec file for package qjackctl (Version 0.2.22) # -# Copyright (c) 2006 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2007 SUSE LINUX Products GmbH, Nuernberg, Germany. # This file and all modifications and additions to the pristine # package are under the same license as the package itself. # @@ -13,10 +13,10 @@ Name: qjackctl BuildRequires: alsa-devel jack-devel libdrm-devel libjpeg-devel qt3-devel update-desktop-files Summary: Qt-based interface to JACK -Version: 0.2.21 +Version: 0.2.22 Release: 1 Group: Productivity/Multimedia/Sound/Utilities -License: GPL +License: GNU General Public License (GPL) BuildRoot: %{_tmppath}/%{name}-%{version}-build URL: http://qjackctl.sf.net Source: %{name}-%{version}.tar.bz2 @@ -45,7 +45,7 @@ CFLAGS="$RPM_OPT_FLAGS" \ CXXFLAGS="$CXXFLAGS $RPM_OPT_FLAGS" \ ./configure --prefix=%{_prefix} -make +make %{?jobs:-j %jobs} %install make prefix="$RPM_BUILD_ROOT"%{_prefix} install @@ -66,7 +66,23 @@ %endif %{_datadir}/pixmaps/*.png -%changelog -n qjackctl +%changelog +* Mon Apr 02 2007 - tiwai@suse.de +- updated to version 0.2.22: + * Fixed default settings for the freebob backend (JACK >= + 0.103.0). + * CPU Load status label now says correctly DSP Load. + * The most recently used patchbay definitions can now be + correctly selected in round-robin fashion from its drop-down + list widget. + * Avoid mixing JACK MIDI ports with regular audio ports on the + Connections and Patchbay widgets; strictly list only audio + ports. + * Added 192k sample rate to setup settings drop down list (as + kindly reminded by Klaus Zimmermann, thanks). + * Most top-level widgets were missing the normal-widget flag, + which were causing some sticky size behavior on some window + managers. * Thu Oct 12 2006 - tiwai@suse.de - updated to version 0.2.21: * GPL address update ++++++ qjackctl-0.2.21.tar.bz2 -> qjackctl-0.2.22.tar.bz2 ++++++ ++++ 8682 lines of diff (skipped) ++++ retrying with extended exclude list diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/ChangeLog new/qjackctl-0.2.22/ChangeLog --- old/qjackctl-0.2.21/ChangeLog 2006-10-07 01:02:15.000000000 +0200 +++ new/qjackctl-0.2.22/ChangeLog 2007-03-31 15:25:42.000000000 +0200 @@ -3,6 +3,25 @@ ChangeLog +0.2.22 2007-03-31 Long overdue but better late than never. + +- Fixed default settings for the freebob backend (JACK >= 0.103.0). + +- CPU Load status label now says correctly DSP Load. + +- The most recently used patchbay definitions can now be correctly + selected in round-robin fashion from its drop-down list widget. + +- Avoid mixing JACK MIDI ports with regular audio ports on the + Connections and Patchbay widgets; strictly list only audio ports. + +- Added 192k sample rate to setup settings drop down list (as kindly + reminded by Klaus Zimmermann, thanks). + +- Most top-level widgets were missing the normal-widget flag, which + were causing some sticky size behavior on some window managers. + + 0.2.21 2006-10-07 Shrinking on screen real-estate. - GPL address update. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/configure.ac new/qjackctl-0.2.22/configure.ac --- old/qjackctl-0.2.21/configure.ac 2006-10-07 01:02:15.000000000 +0200 +++ new/qjackctl-0.2.22/configure.ac 2007-03-31 15:25:42.000000000 +0200 @@ -1,5 +1,5 @@ # Process this file with autoconf to produce a configure script. -AC_INIT(QjackCtl, 0.2.21, rncbc@rncbc.org, qjackctl) +AC_INIT(QjackCtl, 0.2.22, rncbc@rncbc.org, qjackctl) AC_CONFIG_SRCDIR(src/qjackctlMainForm.ui.h) AC_CONFIG_HEADERS(config.h) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/main.cpp new/qjackctl-0.2.22/src/main.cpp --- old/qjackctl-0.2.21/src/main.cpp 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/main.cpp 2006-12-05 13:23:16.000000000 +0100 @@ -68,6 +68,7 @@ // What style do we create these forms? Qt::WFlags wflags = Qt::WStyle_Customize + | Qt::WStyle_NormalBorder | Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlAbout.h new/qjackctl-0.2.22/src/qjackctlAbout.h --- old/qjackctl-0.2.21/src/qjackctlAbout.h 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlAbout.h 2007-01-22 18:45:55.000000000 +0100 @@ -1,7 +1,7 @@ // qjackctlAbout.h // /**************************************************************************** - Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -33,7 +33,7 @@ #define QJACKCTL_SUBTITLE QJACKCTL_SUBTITLE1 " - " QJACKCTL_SUBTITLE2 #define QJACKCTL_WEBSITE "http://qjackctl.sourceforge.net" -#define QJACKCTL_COPYRIGHT "Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved." +#define QJACKCTL_COPYRIGHT "Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved." #endif // __qjackctlAbout_h diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlJackConnect.cpp new/qjackctl-0.2.22/src/qjackctlJackConnect.cpp --- old/qjackctl-0.2.21/src/qjackctlJackConnect.cpp 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlJackConnect.cpp 2006-12-26 17:17:03.000000000 +0100 @@ -127,10 +127,12 @@ return 0; int iDirtyCount = 0; - + markClientPorts(0); - const char **ppszClientPorts = jack_get_ports(m_pJackClient, 0, 0, isReadable() ? JackPortIsOutput : JackPortIsInput); + const char **ppszClientPorts = jack_get_ports(m_pJackClient, + 0, JACK_DEFAULT_AUDIO_TYPE, + isReadable() ? JackPortIsOutput : JackPortIsInput); if (ppszClientPorts) { int iClientPort = 0; while (ppszClientPorts[iClientPort]) { @@ -162,7 +164,7 @@ } cleanClientPorts(0); - + return iDirtyCount; } @@ -287,4 +289,3 @@ QPixmap *qjackctlJackConnect::g_apPixmaps[QJACKCTL_XPM_APIXMAPS]; // end of qjackctlJackConnect.cpp - diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlMainForm.ui new/qjackctl-0.2.22/src/qjackctlMainForm.ui --- old/qjackctl-0.2.21/src/qjackctlMainForm.ui 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlMainForm.ui 2007-01-22 18:57:34.000000000 +0100 @@ -2,7 +2,7 @@ <class>qjackctlMainForm</class> <comment>JACK Audio Connection Kit - Qt GUI Interface. - Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -542,7 +542,7 @@ </widget> <widget class="QLabel" row="0" column="3" rowspan="1" colspan="2"> <property name="name"> - <cstring>CpuLoadTextLabel</cstring> + <cstring>DspLoadTextLabel</cstring> </property> <property name="minimumSize"> <size> @@ -561,7 +561,7 @@ <set>AlignCenter</set> </property> <property name="toolTip" stdset="0"> - <string>CPU Load</string> + <string>DSP Load</string> </property> </widget> <widget class="QLabel" row="0" column="5"> @@ -608,7 +608,7 @@ <number>2</number> </property> <property name="toolTip" stdset="0"> - <string>XRUN Count</string> + <string>XRUN Count (notifications)</string> </property> </widget> <widget class="QLabel" row="1" column="1" rowspan="1" colspan="5"> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlMainForm.ui.h new/qjackctl-0.2.22/src/qjackctlMainForm.ui.h --- old/qjackctl-0.2.21/src/qjackctlMainForm.ui.h 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlMainForm.ui.h 2007-02-01 16:33:42.000000000 +0100 @@ -2,7 +2,7 @@ // // ui.h extension file, included from the uic-generated form implementation. /**************************************************************************** - Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -185,6 +185,7 @@ // What style do we create these forms? WFlags wflags = Qt::WStyle_Customize + | Qt::WStyle_NormalBorder | Qt::WStyle_Title | Qt::WStyle_SysMenu | Qt::WStyle_MinMax @@ -287,6 +288,8 @@ m_pPatchbayForm->setRecentPatchbays(m_pSetup->patchbays); if (!m_pSetup->sPatchbayPath.isEmpty()) m_pPatchbayForm->loadPatchbayFile(m_pSetup->sPatchbayPath); + m_pPatchbayForm->updateRecentPatchbays(); + m_pPatchbayForm->stabilizeForm(); } // Try to find if we can start in detached mode (client-only) @@ -646,20 +649,25 @@ m_pJack->addArgument("-o" + QString::number(m_preset.iOutChannels)); } else if (bCoreaudio) { - if (m_preset.iInChannels >= 0 && m_preset.iAudio != QJACKCTL_PLAYBACK) + if (m_preset.iInChannels > 0 && m_preset.iAudio != QJACKCTL_PLAYBACK) m_pJack->addArgument("-i" + QString::number(m_preset.iInChannels)); - if (m_preset.iOutChannels >= 0 && m_preset.iAudio != QJACKCTL_CAPTURE) + if (m_preset.iOutChannels > 0 && m_preset.iAudio != QJACKCTL_CAPTURE) m_pJack->addArgument("-o" + QString::number(m_preset.iOutChannels)); } else if (bFreebob) { - if (m_preset.iInChannels >= 0 && m_preset.iAudio != QJACKCTL_PLAYBACK) - m_pJack->addArgument("-i" + QString::number(m_preset.iInChannels)); - else - m_pJack->addArgument("-i0"); - if (m_preset.iOutChannels >= 0 && m_preset.iAudio != QJACKCTL_CAPTURE) - m_pJack->addArgument("-o" + QString::number(m_preset.iOutChannels)); - else - m_pJack->addArgument("-o0"); + switch (m_preset.iAudio) { + case QJACKCTL_DUPLEX: + m_pJack->addArgument("-D"); + break; + case QJACKCTL_CAPTURE: + m_pJack->addArgument("-C"); + m_pJack->addArgument("-o0"); + break; + case QJACKCTL_PLAYBACK: + m_pJack->addArgument("-P"); + m_pJack->addArgument("-i0"); + break; + } } if (bDummy && m_preset.iWait > 0 && m_preset.iWait != 21333) m_pJack->addArgument("-w" + QString::number(m_preset.iWait)); @@ -1058,7 +1066,7 @@ if (!m_pSetup->sDisplayFont2.isEmpty() && font.fromString(m_pSetup->sDisplayFont2)) { ServerStateTextLabel->setFont(font); ServerModeTextLabel->setFont(font); - CpuLoadTextLabel->setFont(font); + DspLoadTextLabel->setFont(font); SampleRateTextLabel->setFont(font); XrunCountTextLabel->setFont(font); TransportStateTextLabel->setFont(font); @@ -1766,7 +1774,7 @@ // All displays are highlighted from now on. ServerStateTextLabel->setPaletteForegroundColor(Qt::yellow); ServerModeTextLabel->setPaletteForegroundColor(Qt::darkYellow); - CpuLoadTextLabel->setPaletteForegroundColor(Qt::yellow); + DspLoadTextLabel->setPaletteForegroundColor(Qt::yellow); SampleRateTextLabel->setPaletteForegroundColor(Qt::darkYellow); TimeDisplayTextLabel->setPaletteForegroundColor(Qt::green); TransportStateTextLabel->setPaletteForegroundColor(Qt::green); @@ -1831,7 +1839,7 @@ // Displays are dimmed again. ServerModeTextLabel->setPaletteForegroundColor(Qt::darkYellow); - CpuLoadTextLabel->setPaletteForegroundColor(Qt::darkYellow); + DspLoadTextLabel->setPaletteForegroundColor(Qt::darkYellow); SampleRateTextLabel->setPaletteForegroundColor(Qt::darkYellow); TimeDisplayTextLabel->setPaletteForegroundColor(Qt::darkGreen); TransportStateTextLabel->setPaletteForegroundColor(Qt::darkGreen); @@ -2206,7 +2214,7 @@ // Less frequent status items update... if (m_iStatusRefresh >= QJACKCTL_STATUS_CYCLE) { m_iStatusRefresh = 0; - updateStatusItem(STATUS_CPU_LOAD, QString::number(jack_cpu_load(m_pJackClient), 'g', 2) + s + "%"); + updateStatusItem(STATUS_DSP_LOAD, QString::number(jack_cpu_load(m_pJackClient), 'g', 2) + s + "%"); updateStatusItem(STATUS_SAMPLE_RATE, QString::number(jack_get_sample_rate(m_pJackClient)) + s + tr("Hz")); updateStatusItem(STATUS_BUFFER_SIZE, QString::number(g_nframes) + " " + tr("frames")); #ifdef CONFIG_JACK_REALTIME @@ -2271,7 +2279,7 @@ } // No need to update often if we're just idle... else if (m_iStatusRefresh >= QJACKCTL_STATUS_CYCLE) { m_iStatusRefresh = 0; - updateStatusItem(STATUS_CPU_LOAD, n); + updateStatusItem(STATUS_DSP_LOAD, n); updateStatusItem(STATUS_SAMPLE_RATE, n); updateStatusItem(STATUS_BUFFER_SIZE, n); updateStatusItem(STATUS_REALTIME, n); @@ -2299,8 +2307,8 @@ case STATUS_SERVER_STATE: ServerStateTextLabel->setText(sText); break; - case STATUS_CPU_LOAD: - CpuLoadTextLabel->setText(sText); + case STATUS_DSP_LOAD: + DspLoadTextLabel->setText(sText); break; case STATUS_SAMPLE_RATE: SampleRateTextLabel->setText(sText); diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlPatchbay.cpp new/qjackctl-0.2.22/src/qjackctlPatchbay.cpp --- old/qjackctl-0.2.21/src/qjackctlPatchbay.cpp 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlPatchbay.cpp 2006-12-26 17:17:03.000000000 +0100 @@ -473,7 +473,8 @@ { // Grab JACK client:port's... if (m_pJackClient) { - const char **ppszClientPorts = jack_get_ports(m_pJackClient, 0, 0, + const char **ppszClientPorts = jack_get_ports(m_pJackClient, + 0, JACK_DEFAULT_AUDIO_TYPE, (m_bReadable ? JackPortIsOutput : JackPortIsInput)); if (ppszClientPorts) { int iClientPort = 0; diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlPatchbayForm.ui new/qjackctl-0.2.22/src/qjackctlPatchbayForm.ui --- old/qjackctl-0.2.21/src/qjackctlPatchbayForm.ui 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlPatchbayForm.ui 2006-12-26 17:17:03.000000000 +0100 @@ -940,7 +940,7 @@ <function specifier="non virtual" returnType="bool">loadPatchbayFile( const QString & sFileName )</function> <function specifier="non virtual" returnType="bool">savePatchbayFile( const QString & sFileName )</function> <function specifier="non virtual">setRecentPatchbays( const QStringList & patchbays )</function> - <function access="private" specifier="non virtual">updateRecentPatchbays(const QString & sPatchbayPath )</function> + <function specifier="non virtual">updateRecentPatchbays()</function> <function specifier="non virtual">setJackClient( jack_client_t * pJackClient )</function> <function specifier="non virtual">setAlsaSeq( snd_seq_t *pAlsaSeq )</function> </functions> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlPatchbayForm.ui.h new/qjackctl-0.2.22/src/qjackctlPatchbayForm.ui.h --- old/qjackctl-0.2.21/src/qjackctlPatchbayForm.ui.h 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlPatchbayForm.ui.h 2006-12-26 17:17:03.000000000 +0100 @@ -46,6 +46,7 @@ QObject::connect(PatchbayView, SIGNAL(contentsChanged()), this, SLOT(contentsChanged())); newPatchbayFile(false); + stabilizeForm(); } @@ -206,7 +207,7 @@ m_sPatchbayName = tr("Untitled") + QString::number(m_iUntitled++); if (bSnapshot) m_pPatchbay->connectionsSnapshot(); - stabilizeForm(); +// stabilizeForm(); } @@ -235,7 +236,7 @@ // Step 3: stabilize form... m_sPatchbayPath = sFileName; m_sPatchbayName = QFileInfo(sFileName).baseName(); - updateRecentPatchbays(m_sPatchbayPath); +// updateRecentPatchbays(); return true; } @@ -259,7 +260,7 @@ // Step 3: stabilize form... m_sPatchbayPath = sFileName; m_sPatchbayName = QFileInfo(sFileName).baseName(); - updateRecentPatchbays(m_sPatchbayPath); +// updateRecentPatchbays(); // Step 4: notify main form if applicable ... qjackctlMainForm *pMainForm = (qjackctlMainForm *) QWidget::parentWidget(); @@ -301,6 +302,7 @@ // Reset patchbay editor. newPatchbayFile(bSnapshot); + stabilizeForm(); } @@ -317,8 +319,11 @@ if (sFileName.isEmpty()) return; - // Load it right away. - loadPatchbayFile(sFileName); + // Load it right away. + if (loadPatchbayFile(sFileName)) + updateRecentPatchbays(); + + stabilizeForm(); } @@ -339,8 +344,11 @@ if (QFileInfo(sFileName).extension().isEmpty()) sFileName += ".xml"; - // Save it right away. - savePatchbayFile(sFileName); + // Save it right away. + if (savePatchbayFile(sFileName)) + updateRecentPatchbays(); + + stabilizeForm(); } @@ -353,6 +361,8 @@ if (!loadPatchbayFile(m_recentPatchbays[iPatchbay])) PatchbayComboBox->setCurrentItem(0); } + + stabilizeForm(); } @@ -371,7 +381,8 @@ } // Need to force/refresh the patchbay list... - updateRecentPatchbays(m_sPatchbayPath); + updateRecentPatchbays(); + stabilizeForm(); } @@ -383,14 +394,14 @@ // Update patchbay MRU variables and widgets. -void qjackctlPatchbayForm::updateRecentPatchbays ( const QString& sPatchbayPath ) +void qjackctlPatchbayForm::updateRecentPatchbays (void) { // Remove from list if already there (avoid duplicates)... - QStringList::Iterator iter = m_recentPatchbays.find(sPatchbayPath); + QStringList::Iterator iter = m_recentPatchbays.find(m_sPatchbayPath); if (iter != m_recentPatchbays.end()) m_recentPatchbays.remove(iter); // Put it to front... - m_recentPatchbays.push_front(sPatchbayPath); + m_recentPatchbays.push_front(m_sPatchbayPath); // Time to keep the list under limits. while (m_recentPatchbays.count() > 8) @@ -414,7 +425,7 @@ // Sure this one must be currently selected. PatchbayComboBox->setCurrentItem(0); - stabilizeForm(); +// stabilizeForm(); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlPatchbayRack.cpp new/qjackctl-0.2.22/src/qjackctlPatchbayRack.cpp --- old/qjackctl-0.2.21/src/qjackctlPatchbayRack.cpp 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlPatchbayRack.cpp 2006-12-26 17:17:03.000000000 +0100 @@ -539,8 +539,10 @@ // Cache client descriptor. m_pJackClient = pJackClient; // Cache all current client-ports... - m_ppszOAudioPorts = jack_get_ports(m_pJackClient, 0, 0, JackPortIsOutput); - m_ppszIAudioPorts = jack_get_ports(m_pJackClient, 0, 0, JackPortIsInput); + m_ppszOAudioPorts = jack_get_ports(m_pJackClient, + 0, JACK_DEFAULT_AUDIO_TYPE, JackPortIsOutput); + m_ppszIAudioPorts = jack_get_ports(m_pJackClient, + 0, JACK_DEFAULT_AUDIO_TYPE, JackPortIsInput); // Start looking for connections... if (m_ppszOAudioPorts && m_ppszIAudioPorts) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlSetupForm.ui new/qjackctl-0.2.22/src/qjackctlSetupForm.ui --- old/qjackctl-0.2.21/src/qjackctlSetupForm.ui 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlSetupForm.ui 2007-02-01 16:29:27.000000000 +0100 @@ -2,7 +2,7 @@ <class>qjackctlSetupForm</class> <comment>JACK Audio Connection Kit - Qt GUI Interface. - Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -592,6 +592,11 @@ <string>96000</string> </property> </item> + <item> + <property name="text"> + <string>192000</string> + </property> + </item> <property name="name"> <cstring>SampleRateComboBox</cstring> </property> @@ -4500,6 +4505,7 @@ <function access="private" specifier="non virtual" returnType="bool">deletePreset( const QString & sPreset )</function> <function access="private" specifier="non virtual">resetPresets()</function> <function access="private" specifier="non virtual">computeLatency()</function> + <function access="private" specifier="non virtual">changeDriverUpdate( const QString & sDriver, bool bUpdate )</function> <function access="private" specifier="non virtual">changeDriverAudio( const QString & sDriver, int iAudio )</function> <function access="private" specifier="non virtual">stabilizeForm()</function> <function access="private" specifier="non virtual">deviceMenu( QLineEdit * pLineEdit, QToolButton * pToolButton, int iAudio )</function> diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlSetupForm.ui.h new/qjackctl-0.2.22/src/qjackctlSetupForm.ui.h --- old/qjackctl-0.2.21/src/qjackctlSetupForm.ui.h 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlSetupForm.ui.h 2007-02-01 16:29:27.000000000 +0100 @@ -2,7 +2,7 @@ // // ui.h extension file, included from the uic-generated form implementation. /**************************************************************************** - Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -424,14 +424,14 @@ switch (iAudio) { case QJACKCTL_DUPLEX: - bInEnabled = (bOss || bAlsa || bCoreaudio || bFreebob); - bOutEnabled = (bOss || bAlsa || bCoreaudio || bFreebob); + bInEnabled = (bOss || bAlsa || bCoreaudio); + bOutEnabled = (bOss || bAlsa || bCoreaudio); break; case QJACKCTL_CAPTURE: - bInEnabled = (bOss || bCoreaudio || bFreebob); + bInEnabled = (bOss || bCoreaudio); break; case QJACKCTL_PLAYBACK: - bOutEnabled = (bOss || bCoreaudio || bFreebob); + bOutEnabled = (bOss || bCoreaudio); break; } @@ -451,14 +451,14 @@ OutChannelsSpinBox->setEnabled(bOutEnabled || (bAlsa && iAudio != QJACKCTL_CAPTURE)); - InLatencyTextLabel->setEnabled((bInEnabled) - || (bAlsa && iAudio != QJACKCTL_PLAYBACK)); - InLatencySpinBox->setEnabled((bInEnabled) - || (bAlsa && iAudio != QJACKCTL_PLAYBACK)); - OutLatencyTextLabel->setEnabled((bOutEnabled) - || (bAlsa && iAudio != QJACKCTL_CAPTURE)); - OutLatencySpinBox->setEnabled((bOutEnabled) - || (bAlsa && iAudio != QJACKCTL_CAPTURE)); + InLatencyTextLabel->setEnabled(bInEnabled + || ((bAlsa || bFreebob) && iAudio != QJACKCTL_PLAYBACK)); + InLatencySpinBox->setEnabled(bInEnabled + || ((bAlsa || bFreebob) && iAudio != QJACKCTL_PLAYBACK)); + OutLatencyTextLabel->setEnabled(bOutEnabled + || ((bAlsa || bFreebob) && iAudio != QJACKCTL_CAPTURE)); + OutLatencySpinBox->setEnabled(bOutEnabled + || ((bAlsa || bFreebob) && iAudio != QJACKCTL_CAPTURE)); computeLatency(); } @@ -472,6 +472,12 @@ void qjackctlSetupForm::changeDriver ( const QString& sDriver ) { + changeDriverUpdate(sDriver, true); +} + + +void qjackctlSetupForm::changeDriverUpdate ( const QString& sDriver, bool bUpdate ) +{ bool bDummy = (sDriver == "dummy"); bool bOss = (sDriver == "oss"); bool bAlsa = (sDriver == "alsa"); @@ -502,6 +508,9 @@ PeriodsTextLabel->setEnabled(bAlsa || bOss || bFreebob); PeriodsSpinBox->setEnabled(bAlsa || bOss || bFreebob); + if (bUpdate && bFreebob && PeriodsSpinBox->value() < 3) + PeriodsSpinBox->setValue(3); + WordLengthTextLabel->setEnabled(bOss); WordLengthComboBox->setEnabled(bOss); @@ -583,7 +592,7 @@ TransportButtonsCheckBox->setEnabled(LeftButtonsCheckBox->isChecked()); - changeDriver(DriverComboBox->currentText()); + changeDriverUpdate(DriverComboBox->currentText(), false); } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlSocketForm.ui.h new/qjackctl-0.2.22/src/qjackctlSocketForm.ui.h --- old/qjackctl-0.2.21/src/qjackctlSocketForm.ui.h 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlSocketForm.ui.h 2006-12-26 17:17:03.000000000 +0100 @@ -396,7 +396,9 @@ pXpmPlug = m_ppPixmaps[QJACKCTL_XPM_AUDIO_PLUG]; if (m_pJackClient) { // Grab all client ports. - const char **ppszClientPorts = jack_get_ports(m_pJackClient, 0, 0, (bReadable ? JackPortIsOutput : JackPortIsInput)); + const char **ppszClientPorts = jack_get_ports(m_pJackClient, + 0, JACK_DEFAULT_AUDIO_TYPE, + (bReadable ? JackPortIsOutput : JackPortIsInput)); if (ppszClientPorts) { int iClientPort = 0; while (ppszClientPorts[iClientPort]) { @@ -532,7 +534,9 @@ switch (iSocketType) { case 0: // QJACKCTL_SOCKETTYPE_AUDIO if (m_pJackClient) { - const char **ppszClientPorts = jack_get_ports(m_pJackClient, 0, 0, (bReadable ? JackPortIsOutput : JackPortIsInput)); + const char **ppszClientPorts = jack_get_ports(m_pJackClient, + 0, JACK_DEFAULT_AUDIO_TYPE, + (bReadable ? JackPortIsOutput : JackPortIsInput)); if (ppszClientPorts) { int iClientPort = 0; while (ppszClientPorts[iClientPort]) { diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlStatusForm.ui new/qjackctl-0.2.22/src/qjackctlStatusForm.ui --- old/qjackctl-0.2.21/src/qjackctlStatusForm.ui 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlStatusForm.ui 2007-01-22 18:45:55.000000000 +0100 @@ -2,7 +2,7 @@ <class>qjackctlStatusForm</class> <comment>JACK Audio Connection Kit - Qt GUI Interface. - Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlStatusForm.ui.h new/qjackctl-0.2.22/src/qjackctlStatusForm.ui.h --- old/qjackctl-0.2.21/src/qjackctlStatusForm.ui.h 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlStatusForm.ui.h 2007-01-22 18:45:55.000000000 +0100 @@ -2,7 +2,7 @@ // // ui.h extension file, included from the uic-generated form implementation. /**************************************************************************** - Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -89,7 +89,7 @@ m_apStatus[STATUS_REALTIME] = new QListViewItem(StatsListView, s + tr("Realtime Mode") + c, n); m_apStatus[STATUS_BUFFER_SIZE] = new QListViewItem(StatsListView, s + tr("Buffer Size") + c, n); m_apStatus[STATUS_SAMPLE_RATE] = new QListViewItem(StatsListView, s + tr("Sample Rate") + c, n); - m_apStatus[STATUS_CPU_LOAD] = new QListViewItem(StatsListView, s + tr("CPU Load") + c, n); + m_apStatus[STATUS_DSP_LOAD] = new QListViewItem(StatsListView, s + tr("DSP Load") + c, n); m_apStatus[STATUS_SERVER_STATE] = new QListViewItem(StatsListView, s + tr("Server state") + c, n); // Create the tooltip handler... diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/src/qjackctlStatus.h new/qjackctl-0.2.22/src/qjackctlStatus.h --- old/qjackctl-0.2.21/src/qjackctlStatus.h 2006-09-24 14:29:31.000000000 +0200 +++ new/qjackctl-0.2.22/src/qjackctlStatus.h 2007-01-22 18:45:55.000000000 +0100 @@ -1,7 +1,7 @@ // qjackctlStatus.h // /**************************************************************************** - Copyright (C) 2003-2006, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2003-2007, rncbc aka Rui Nuno Capela. All rights reserved. This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License @@ -24,7 +24,7 @@ // List view statistics item indexes #define STATUS_SERVER_STATE 0 -#define STATUS_CPU_LOAD 1 +#define STATUS_DSP_LOAD 1 #define STATUS_SAMPLE_RATE 2 #define STATUS_BUFFER_SIZE 3 #define STATUS_REALTIME 4 diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/qjackctl-0.2.21/win32/config.h new/qjackctl-0.2.22/win32/config.h --- old/qjackctl-0.2.21/win32/config.h 2006-07-10 09:57:43.000000000 +0200 +++ new/qjackctl-0.2.22/win32/config.h 2007-03-31 15:25:42.000000000 +0200 @@ -1,6 +1,6 @@ #define PACKAGE_NAME "QjackCtl" -#define PACKAGE_VERSION "0.2.20" +#define PACKAGE_VERSION "0.2.22" #define CONFIG_PREFIX "." ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... --------------------------------------------------------------------- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org