rpms/kdemultimedia/F-12 kdemultimedia-4.4.4-kmix-pulse.patch, NONE, 1.1 kdemultimedia.spec, 1.167, 1.168 sources, 1.78, 1.79 kmix-pulse.patch, 1.1, NONE
Than Ngo
than at fedoraproject.org
Sun Jun 6 22:35:50 UTC 2010
Author: than
Update of /cvs/extras/rpms/kdemultimedia/F-12
In directory cvs01.phx2.fedoraproject.org:/tmp/cvs-serv23860
Modified Files:
kdemultimedia.spec sources
Added Files:
kdemultimedia-4.4.4-kmix-pulse.patch
Removed Files:
kmix-pulse.patch
Log Message:
4.4.4
kdemultimedia-4.4.4-kmix-pulse.patch:
CMakeLists.txt | 1
KMixApp.cpp | 14
dialogviewconfiguration.cpp | 4
kmix-platforms.cpp | 8
kmix.cpp | 53 +
kmix.h | 1
kmixerwidget.cpp | 2
kmixerwidget.h | 1
kmixprefdlg.h | 2
main.cpp | 1
mdwmoveaction.cpp | 48 +
mdwmoveaction.h | 46 +
mdwslider.cpp | 158 ++---
mdwslider.h | 14
mixdevice.cpp | 105 ++-
mixdevice.h | 15
mixdevicewidget.cpp | 1
mixdevicewidget.h | 2
mixer.cpp | 27
mixer.h | 9
mixer_alsa9.cpp | 4
mixer_backend.cpp | 17
mixer_backend.h | 6
mixer_pulse.cpp | 1345 +++++++++++++++++++++++++++++++++++++-------
mixer_pulse.h | 69 +-
verticaltext.cpp | 7
verticaltext.h | 1
viewbase.cpp | 72 ++
viewbase.h | 7
viewdockareapopup.cpp | 51 +
viewdockareapopup.h | 3
viewsliders.cpp | 16
viewsliders.h | 4
33 files changed, 1768 insertions(+), 346 deletions(-)
--- NEW FILE kdemultimedia-4.4.4-kmix-pulse.patch ---
diff -up kdemultimedia-4.4.4/kmix/CMakeLists.txt.kmix-pulse kdemultimedia-4.4.4/kmix/CMakeLists.txt
--- kdemultimedia-4.4.4/kmix/CMakeLists.txt.kmix-pulse 2009-12-11 00:15:09.000000000 +0100
+++ kdemultimedia-4.4.4/kmix/CMakeLists.txt 2010-06-02 15:20:54.000000000 +0200
@@ -18,6 +18,7 @@ set(kmix_KDEINIT_SRCS ${kmix_adaptor_SRC
viewdockareapopup.cpp
viewsliders.cpp
mixdevicewidget.cpp
+ mdwmoveaction.cpp
mdwslider.cpp
mdwenum.cpp
kmixerwidget.cpp
diff -up kdemultimedia-4.4.4/kmix/dialogviewconfiguration.cpp.kmix-pulse kdemultimedia-4.4.4/kmix/dialogviewconfiguration.cpp
--- kdemultimedia-4.4.4/kmix/dialogviewconfiguration.cpp.kmix-pulse 2010-03-26 18:28:51.000000000 +0100
+++ kdemultimedia-4.4.4/kmix/dialogviewconfiguration.cpp 2010-06-02 15:20:54.000000000 +0200
@@ -264,10 +264,10 @@ void DialogViewConfiguration::createPage
//qDebug() << "add DialogViewConfigurationItem: " << mdName << " visible=" << mdw->isVisible() << "splitted=" << splitted;
if ( mdw->isVisible() ) {
- new DialogViewConfigurationItem(_qlw, md->id(), mdw->isVisible(), mdName, splitted, mdw->iconName());
+ new DialogViewConfigurationItem(_qlw, md->id(), mdw->isVisible(), mdName, splitted, mdw->mixDevice()->iconName());
}
else {
- new DialogViewConfigurationItem(_qlwInactive, md->id(), mdw->isVisible(), mdName, splitted, mdw->iconName());
+ new DialogViewConfigurationItem(_qlwInactive, md->id(), mdw->isVisible(), mdName, splitted, mdw->mixDevice()->iconName());
}
/*
diff -up kdemultimedia-4.4.4/kmix/KMixApp.cpp.kmix-pulse kdemultimedia-4.4.4/kmix/KMixApp.cpp
--- kdemultimedia-4.4.4/kmix/KMixApp.cpp.kmix-pulse 2008-11-04 18:13:12.000000000 +0100
+++ kdemultimedia-4.4.4/kmix/KMixApp.cpp 2010-06-02 15:20:54.000000000 +0200
@@ -51,7 +51,8 @@ KMixApp::newInstance()
// There are 3 cases for a new instance
//kDebug(67100) << "KMixApp::newInstance() isRestored()=" << isRestored() << "_keepVisibility=" << _keepVisibility;
- if ( m_kmix )
+ static bool first = true;
+ if ( !first )
{ // There already exists an instance/window
/* !!! @bug : _keepVisibilty has the wrong value here.
@@ -74,7 +75,11 @@ KMixApp::newInstance()
// starts it again, the KMix main window will be shown.
// If KMix is restored by SM or the --keepvisibilty is used, KMix will NOT
// explicitly be shown.
- m_kmix->show();
+ if ( !m_kmix ) {
+ m_kmix->show();
+ } else {
+ kWarning(67100) << "KMixApp::newInstance() Window has not finished constructing yet so ignoring the show() request.";
+ }
}
else {
// CASE 2: If KMix is running, AND ( session gets restored OR keepvisibilty command line switch )
@@ -92,6 +97,11 @@ KMixApp::newInstance()
{
// CASE 3: KMix was not running yet => instanciate a new one
//kDebug(67100) << "KMixApp::newInstance() Instanciate: _keepVisibility=" << _keepVisibility ;
+ first = false; // NB See https://qa.mandriva.com/show_bug.cgi?id=56893#c3
+ // It is important to track this via a separate variable and not
+ // based on m_kmix to handle this race condition.
+ // Specific protection for the activation-prior-to-full-construction
+ // case exists above in the 'already running case'
m_kmix = new KMixWindow(_keepVisibility);
//connect(this, SIGNAL(stopUpdatesOnVisibility()), m_kmix, SLOT(stopVisibilityUpdates()));
if ( isSessionRestored() && KMainWindow::canBeRestored(0) )
diff -up kdemultimedia-4.4.4/kmix/kmix.cpp.kmix-pulse kdemultimedia-4.4.4/kmix/kmix.cpp
--- kdemultimedia-4.4.4/kmix/kmix.cpp.kmix-pulse 2010-05-28 11:43:36.000000000 +0200
+++ kdemultimedia-4.4.4/kmix/kmix.cpp 2010-06-02 15:20:54.000000000 +0200
@@ -49,6 +49,7 @@
#include <ktoggleaction.h>
// KMix
+#include "guiprofile.h"
#include "mixertoolbox.h"
#include "kmix.h"
#include "kmixdevicemanager.h"
@@ -398,11 +399,30 @@ void KMixWindow::recreateGUIwithoutSavin
*/
void KMixWindow::recreateGUI(bool saveConfig)
{
+ // Find out which of the tabs is currently selected for restoration
+ int current_tab = -1;
+ if (m_wsMixers)
+ current_tab = m_wsMixers->currentIndex();
+
+ // NOTE (coling) This is a bug but I don't have time to find the source.
+ // When returning from "Configure Mixers..." we MUST save, but the
+ // flag comes through as false, presumably due to the rebuildGUI() signal
+ // being tied to the recreateGUIwithoutSavingView() slot.
+ // This should really be fixed :s
+ Q_UNUSED(saveConfig);
saveViewConfig(); // save the state before recreating
+
+ // Before clearing the mixer widgets, we must increase the refcount on the guiprof to save it deleting the ViewBase object.
+ if ( Mixer::mixers().count() > 0 )
+ for (int i=0; i<Mixer::mixers().count(); ++i)
+ MixerToolBox::instance()->selectProfile((Mixer::mixers())[i])->increaseRefcount();
clearMixerWidgets();
+
if ( Mixer::mixers().count() > 0 ) {
for (int i=0; i<Mixer::mixers().count(); ++i) {
Mixer *mixer = (Mixer::mixers())[i];
+ // We've increased the refcount before clearing, so remember and decrease it again.
+ MixerToolBox::instance()->selectProfile(mixer)->decreaseRefcount();
addMixerWidget(mixer->id());
}
bool dockingSucceded = updateDocking();
@@ -414,6 +434,39 @@ void KMixWindow::recreateGUI(bool saveCo
updateDocking(); // -<- removes the DockIcon
hide();
}
+
+ if (current_tab >= 0) {
+ m_wsMixers->setCurrentIndex(current_tab);
+ }
+}
+
+
+/**
+* Create or recreate the Mixer GUI elements
+*/
+void KMixWindow::redrawMixer( const QString& mixer_ID )
+{
+ for ( int i=0; i<m_wsMixers->count() ; ++i )
+ {
+ QWidget *w = m_wsMixers->widget(i);
+ if ( w->inherits("KMixerWidget") )
+ {
+ KMixerWidget* kmw = (KMixerWidget*)w;
+ if ( kmw->mixer()->id() == mixer_ID )
+ {
+ kDebug(67100) << "KMixWindow::redrawMixer() " << mixer_ID << " is being redrawn";
+ kmw->loadConfig( KGlobal::config().data() );
+
+ // Is the below needed? It is done on startup so copied it here...
+ kmw->setTicks( m_showTicks );
+ kmw->setLabels( m_showLabels );
+
+ return;
+ }
+ }
+ }
+
+ kWarning(67100) << "KMixWindow::redrawMixer() Requested to redraw " << mixer_ID << " but I cannot find it :s";
}
diff -up kdemultimedia-4.4.4/kmix/kmixerwidget.cpp.kmix-pulse kdemultimedia-4.4.4/kmix/kmixerwidget.cpp
--- kdemultimedia-4.4.4/kmix/kmixerwidget.cpp.kmix-pulse 2009-07-06 13:20:22.000000000 +0200
+++ kdemultimedia-4.4.4/kmix/kmixerwidget.cpp 2010-06-02 15:20:54.000000000 +0200
@@ -92,6 +92,7 @@ void KMixerWidget::createLayout(ViewBase
// delete old objects
if( m_balanceSlider ) {
delete m_balanceSlider;
+ m_balanceSlider = 0;
}
if( m_topLayout ) {
delete m_topLayout;
@@ -182,6 +183,7 @@ bool KMixerWidget::possiblyAddView(ViewB
connect( vbase, SIGNAL(toggleMenuBar()), parentWidget(), SLOT(toggleMenuBar()) );
// *this will be deleted on rebuildGUI(), so lets queue the signal
connect( vbase, SIGNAL(rebuildGUI()) , parentWidget(), SLOT(recreateGUIwithoutSavingView()), Qt::QueuedConnection );
+ connect( vbase, SIGNAL(redrawMixer(const QString&)), parentWidget(), SLOT(redrawMixer(const QString&)), Qt::QueuedConnection );
return true;
}
}
diff -up kdemultimedia-4.4.4/kmix/kmixerwidget.h.kmix-pulse kdemultimedia-4.4.4/kmix/kmixerwidget.h
--- kdemultimedia-4.4.4/kmix/kmixerwidget.h.kmix-pulse 2009-07-06 13:20:22.000000000 +0200
+++ kdemultimedia-4.4.4/kmix/kmixerwidget.h 2010-06-02 15:20:54.000000000 +0200
@@ -62,6 +62,7 @@ class KMixerWidget : public QWidget
signals:
void toggleMenuBar();
void rebuildGUI();
+ void redrawMixer( const QString& mixer_ID );
public slots:
void setTicks( bool on );
diff -up kdemultimedia-4.4.4/kmix/kmix.h.kmix-pulse kdemultimedia-4.4.4/kmix/kmix.h
--- kdemultimedia-4.4.4/kmix/kmix.h.kmix-pulse 2010-05-28 11:43:36.000000000 +0200
+++ kdemultimedia-4.4.4/kmix/kmix.h 2010-06-02 15:20:54.000000000 +0200
@@ -87,6 +87,7 @@ KMixWindow : public KXmlGuiWindow
virtual void applyPrefs( KMixPrefDlg *prefDlg );
void recreateGUI(bool saveView);
void recreateGUIwithoutSavingView();
+ void redrawMixer( const QString& mixer_ID );
//void stopVisibilityUpdates();
diff -up kdemultimedia-4.4.4/kmix/kmix-platforms.cpp.kmix-pulse kdemultimedia-4.4.4/kmix/kmix-platforms.cpp
--- kdemultimedia-4.4.4/kmix/kmix-platforms.cpp.kmix-pulse 2009-09-23 21:24:16.000000000 +0200
+++ kdemultimedia-4.4.4/kmix/kmix-platforms.cpp 2010-06-02 15:20:54.000000000 +0200
@@ -129,6 +129,10 @@ MixerFactory g_mixerFactories[] = {
{ IRIX_getMixer, IRIX_getDriverName },
#endif
+#if defined(PULSE_MIXER)
+ { PULSE_getMixer, PULSE_getDriverName },
+#endif
+
[...2534 lines suppressed...]
+ virtual void _setMixSet() = 0;
+
public slots:
+ virtual void controlsReconfigured( const QString& mixer_ID );
virtual void refreshVolumeLevels();
virtual void configureView();
void toggleMenuBarSlot();
diff -up kdemultimedia-4.4.4/kmix/viewdockareapopup.cpp.kmix-pulse kdemultimedia-4.4.4/kmix/viewdockareapopup.cpp
--- kdemultimedia-4.4.4/kmix/viewdockareapopup.cpp.kmix-pulse 2009-07-06 13:20:22.000000000 +0200
+++ kdemultimedia-4.4.4/kmix/viewdockareapopup.cpp 2010-06-02 15:21:02.000000000 +0200
@@ -46,7 +46,7 @@
// Users will not be able to close the Popup without opening the KMix main window then.
// See Bug #93443, #96332 and #96404 for further details. -- esken
ViewDockAreaPopup::ViewDockAreaPopup(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KMixWindow *dockW )
- : ViewBase(parent, name, mixer, /*Qt::FramelessWindowHint | Qt::MSWindowsFixedSizeDialogHint*/0, vflags, guiprof), _mdw(0), _dock(dockW)
+ : ViewBase(parent, name, mixer, /*Qt::FramelessWindowHint | Qt::MSWindowsFixedSizeDialogHint*/0, vflags, guiprof), _dock(dockW)
{
_layoutMDW = new QGridLayout( this );
_layoutMDW->setSpacing( KDialog::spacingHint() );
@@ -63,14 +63,23 @@ ViewDockAreaPopup::~ViewDockAreaPopup()
void ViewDockAreaPopup::wheelEvent ( QWheelEvent * e ) {
// Pass wheel event from "border widget" to child
- if ( _mdw != 0 ) {
- QApplication::sendEvent( _mdw, e);
- }
+ QWidget* mdw = 0;
+ if ( !_mdws.isEmpty() )
+ mdw = _mdws.first();
+
+ if ( mdw != 0 )
+ QApplication::sendEvent( mdw, e);
}
MixDevice* ViewDockAreaPopup::dockDevice()
{
- return _mdw->mixDevice();
+ MixDeviceWidget* mdw = 0;
+ if ( !_mdws.isEmpty() )
+ mdw = (MixDeviceWidget*)_mdws.first();
+
+ if ( mdw != 0 )
+ return mdw->mixDevice();
+ return (MixDevice*)(0);
}
@@ -81,9 +90,18 @@ void ViewDockAreaPopup::showContextMenu(
}
-void ViewDockAreaPopup::setMixSet()
+void ViewDockAreaPopup::_setMixSet()
{
// kDebug(67100) << "ViewDockAreaPopup::setMixSet()\n";
+
+ if ( _mixer->dynamic() ) {
+ // Our _layoutMDW now should only contain spacer widgets from the QSpacerItems's in add() below.
+ // We need to trash those too otherwise all sliders gradually migrate away from the edge :p
+ QLayoutItem *li;
+ while ( ( li = _layoutMDW->takeAt(0) ) )
+ delete li;
+ }
+
MixDevice *dockMD = Mixer::getGlobalMasterMD();
if ( dockMD == 0 ) {
// If we have no dock device yet, we will take the first available mixer device
@@ -98,7 +116,7 @@ void ViewDockAreaPopup::setMixSet()
QWidget* ViewDockAreaPopup::add(MixDevice *md)
{
- _mdw = new MDWSlider(
+ MixDeviceWidget *mdw = new MDWSlider(
md, // only 1 device. This is actually _dockDevice
true, // Show Mute LED
false, // Show Record LED
@@ -109,7 +127,7 @@ QWidget* ViewDockAreaPopup::add(MixDevic
);
_layoutMDW->addItem( new QSpacerItem( 5, 20 ), 0, 2 );
_layoutMDW->addItem( new QSpacerItem( 5, 20 ), 0, 0 );
- _layoutMDW->addWidget( _mdw, 0, 1 );
+ _layoutMDW->addWidget( mdw, 0, 1 );
// Add button to show main panel
_showPanelBox = new QPushButton( i18n("Mixer"), this );
@@ -117,21 +135,28 @@ QWidget* ViewDockAreaPopup::add(MixDevic
connect ( _showPanelBox, SIGNAL( clicked() ), SLOT( showPanelSlot() ) );
_layoutMDW->addWidget( _showPanelBox, 1, 0, 1, 3 );
- return _mdw;
+ return mdw;
}
void ViewDockAreaPopup::constructionFinished() {
// kDebug(67100) << "ViewDockAreaPopup::constructionFinished()\n";
- if (_mdw != 0) {
- _mdw->move(0,0);
- _mdw->show();
+ QWidget* mdw = 0;
+ if ( !_mdws.isEmpty() )
+ mdw = _mdws.first();
+
+ if ( mdw != 0 ) {
+ mdw->move(0,0);
+ mdw->show();
}
}
void ViewDockAreaPopup::refreshVolumeLevels() {
// kDebug(67100) << "ViewDockAreaPopup::refreshVolumeLevels()\n";
- QWidget* mdw = _mdws.first();
+ QWidget* mdw = 0;
+ if ( !_mdws.isEmpty() )
+ mdw = _mdws.first();
+
if ( mdw == 0 ) {
kError(67100) << "ViewDockAreaPopup::refreshVolumeLevels(): mdw == 0\n";
// sanity check (normally the lists are set up correctly)
diff -up kdemultimedia-4.4.4/kmix/viewdockareapopup.h.kmix-pulse kdemultimedia-4.4.4/kmix/viewdockareapopup.h
--- kdemultimedia-4.4.4/kmix/viewdockareapopup.h.kmix-pulse 2009-06-17 22:09:26.000000000 +0200
+++ kdemultimedia-4.4.4/kmix/viewdockareapopup.h 2010-06-02 15:21:02.000000000 +0200
@@ -43,7 +43,6 @@ public:
~ViewDockAreaPopup();
MixDevice* dockDevice();
- virtual void setMixSet();
virtual QWidget* add(MixDevice *mdw);
virtual void constructionFinished();
virtual void refreshVolumeLevels();
@@ -52,12 +51,12 @@ public:
//QSize sizeHint() const;
protected:
- MixDeviceWidget *_mdw;
KMixWindow *_dock;
//MixDevice *_dockDevice;
QPushButton *_showPanelBox;
void wheelEvent ( QWheelEvent * e );
+ virtual void _setMixSet();
private:
QGridLayout* _layoutMDW;
diff -up kdemultimedia-4.4.4/kmix/viewsliders.cpp.kmix-pulse kdemultimedia-4.4.4/kmix/viewsliders.cpp
--- kdemultimedia-4.4.4/kmix/viewsliders.cpp.kmix-pulse 2009-07-06 13:20:22.000000000 +0200
+++ kdemultimedia-4.4.4/kmix/viewsliders.cpp 2010-06-02 15:21:02.000000000 +0200
@@ -119,10 +119,20 @@ QWidget* ViewSliders::add(MixDevice *md)
}
-void ViewSliders::setMixSet()
+void ViewSliders::_setMixSet()
{
- const MixSet& mixset = _mixer->getMixSet();
+ const MixSet& mixset = _mixer->getMixSet();
+ if ( _mixer->dynamic() ) {
+ // We will be recreating our sliders, so make sure we trash all the separators too.
+ qDeleteAll(_separators);
+ _separators.clear();
+ // Our _layoutSliders now should only contain spacer widgets from the addSpacing() calls in add() above.
+ // We need to trash those too otherwise all sliders gradually migrate away from the edge :p
+ QLayoutItem *li;
+ while ( ( li = _layoutSliders->takeAt(0) ) )
+ delete li;
+ }
// This method iterates the controls from the Profile
// Each control is checked, whether it is also contained in the mixset, and
@@ -135,7 +145,7 @@ void ViewSliders::setMixSet()
if ( control->tab == id() ) {
// The TabName of the control matches this View name (!! attention: Better use some ID, due to i18n() )
bool isUsed = false;
-
+
QRegExp idRegexp(control->id);
//kDebug(67100) << "ViewSliders::setMixSet(): Check GUIProfile id==" << control->id << "\n";
// The following for-loop could be simplified by using a std::find_if
diff -up kdemultimedia-4.4.4/kmix/viewsliders.h.kmix-pulse kdemultimedia-4.4.4/kmix/viewsliders.h
--- kdemultimedia-4.4.4/kmix/viewsliders.h.kmix-pulse 2008-01-05 01:02:14.000000000 +0100
+++ kdemultimedia-4.4.4/kmix/viewsliders.h 2010-06-02 15:21:02.000000000 +0200
@@ -36,7 +36,6 @@ public:
ViewSliders(QWidget* parent, const char* name, Mixer* mixer, ViewBase::ViewFlags vflags, GUIProfile *guiprof, KActionCollection *actColl);
~ViewSliders();
- virtual void setMixSet();
virtual QWidget* add(MixDevice *mdw);
virtual void constructionFinished();
virtual void configurationUpdate();
@@ -44,6 +43,9 @@ public:
public slots:
virtual void refreshVolumeLevels();
+protected:
+ virtual void _setMixSet();
+
private:
QBoxLayout* _layoutMDW;
QLayout* _layoutSliders;
Index: kdemultimedia.spec
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-12/kdemultimedia.spec,v
retrieving revision 1.167
retrieving revision 1.168
diff -u -p -r1.167 -r1.168
--- kdemultimedia.spec 5 May 2010 20:11:31 -0000 1.167
+++ kdemultimedia.spec 6 Jun 2010 22:35:49 -0000 1.168
@@ -1,8 +1,8 @@
Name: kdemultimedia
Epoch: 6
-Version: 4.4.3
-Release: 1%{?dist}.1
+Version: 4.4.4
+Release: 1%{?dist}
Summary: KDE Multimedia applications
Group: Applications/Multimedia
@@ -19,7 +19,7 @@ Patch2: kdemultimedia-4.3.75-kscd_doc.pa
# git checkout -t origin/pulse
# git diff master..pulse > kmix_pa-<date>.patch
# See also, http://svn.mandriva.com/cgi-bin/viewvc.cgi/packages/cooker/kdemultimedia4/current/SOURCES/kmix-pulse.patch
-Patch3: kmix-pulse.patch
+Patch3: kdemultimedia-4.4.4-kmix-pulse.patch
## upstream patches
@@ -189,6 +189,9 @@ fi
%changelog
+* Sun May 30 2010 Than Ngo <than at redhat.com> - 6:4.4.4-1
+- 4.4.4
+
* Wed May 05 2010 Rex Dieter <rdieter at math.unl.edu> - 6:4.4.3-1.1
- rebuild against correct tag
Index: sources
===================================================================
RCS file: /cvs/extras/rpms/kdemultimedia/F-12/sources,v
retrieving revision 1.78
retrieving revision 1.79
diff -u -p -r1.78 -r1.79
--- sources 1 May 2010 17:53:07 -0000 1.78
+++ sources 6 Jun 2010 22:35:50 -0000 1.79
@@ -1 +1 @@
-cb1648e560f523a1bac6caf5574854be kdemultimedia-4.4.3.tar.bz2
+2e7275b769090461c72ce4c5583374be kdemultimedia-4.4.4.tar.bz2
--- kmix-pulse.patch DELETED ---
More information about the scm-commits
mailing list