By default, Bugzilla does not search the list of RESOLVED bugs.
You can force it to do so by putting the upper-case word ALL in front of your search query, e.g.: ALL tdelibs
We recommend searching for bugs this way, as you may discover that your bug has already been resolved and fixed in a later release.

[patch] PulseAudio and Master channel true treating

1-kmix-PulseAudio-MasterDCOP.patch (text/plain), 4.34 KB, created by Michele Calgaro on 2020-10-24 20:23:09 CDT

(hide)

Description: PulseAudio and Master channel true treating

Filename:

MIME Type:

Creator: Michele Calgaro

Created: 2020-10-24 20:23:09 CDT

Size: 4.34 KB

patch

obsolete

>diff -uNr tdemultimedia-trinity-14.0.4_old/kmix/mixer.cpp tdemultimedia-trinity-14.0.4/kmix/mixer.cpp >--- tdemultimedia-trinity-14.0.4_old/kmix/mixer.cpp 2017-06-16 19:08:12.000000000 +0300 >+++ tdemultimedia-trinity-14.0.4/kmix/mixer.cpp 2017-06-16 19:32:17.436879484 +0300 >@@ -91,17 +91,7 @@ > _pollingTimer = new TQTimer(); // will be started on open() and stopped on close() > connect( _pollingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(readSetFromHW())); > >- TQCString objid; >-#ifndef KMIX_DCOP_OBJID_TEST >- objid.setNum(_mixerBackend->m_devnum); >-#else >-// should use a nice name like the Unique-Card-ID instead !! >- objid.setNum(Mixer::_dcopID); >- Mixer::_dcopID ++; >-#endif >- objid.prepend("Mixer"); >- DCOPObject::setObjId( objid ); >- >+ setDCOP_id(); > } > > Mixer::~Mixer() { >@@ -110,6 +100,25 @@ > delete _pollingTimer; > } > >+void Mixer::setDCOP_id( bool master ) >+{ >+ TQCString objid; >+ >+ if(master) objid = "MixerMaster"; >+ else { >+#ifndef KMIX_DCOP_OBJID_TEST >+ objid.setNum(_mixerBackend->m_devnum); >+#else >+// should use a nice name like the Unique-Card-ID instead !! >+ objid.setNum(Mixer::_dcopID); >+ Mixer::_dcopID ++; >+#endif >+ objid.prepend("Mixer"); >+ } >+ >+ DCOPObject::setObjId( objid ); >+} >+ > void Mixer::volumeSave( TDEConfig *config ) > { > // kdDebug(67100) << "Mixer::volumeSave()" << endl; >@@ -201,8 +210,9 @@ > } > } > */ >- if ( _mixerBackend->needsPolling() ) { >- _pollingTimer->start(50); >+ >+ if ( _mixerBackend->needsPolling() || id() == "PulseAudio" ) { >+ _pollingTimer->start(500); > } > else { > _mixerBackend->prepareSignalling(this); >@@ -280,12 +290,13 @@ > // This can happen currently only, if the user executes the DCOP close() call. > return; > } >- bool updated = _mixerBackend->prepareUpdateFromHW(); >+ bool updated = _mixerBackend->prepareUpdateFromHW() || (id().section(':',2,2) == "PulseAudio"); > if ( (! updated) && (! _readSetFromHWforceUpdate) ) { > // Some drivers (ALSA) are smart. We don't need to run the following > // time-consuming update loop if there was no change > return; > } >+ > _readSetFromHWforceUpdate = false; > MixDevice* md; > for( md = _mixerBackend->m_mixDevices.first(); md != 0; md = _mixerBackend->m_mixDevices.next() ) >@@ -374,11 +385,17 @@ > > void Mixer::setMasterCard(const TQString& ref_id) > { >+ //Restore DCOP id for previous master >+ Mixer *tCard = NULL; >+ if((tCard=masterCard())) tCard->setDCOP_id(); >+ > // The value is taken over without checking on existance. This allows the User to define > // a MasterCard that is not always available (e.g. it is an USB hotplugging device). > // Also you can set the master at any time you like, e.g. after reading the KMix configuration file > // and before actually constructing the Mixer instances (hint: this mehtod is static!). > _masterCard = ref_id; >+ >+ if((tCard=masterCard())) tCard->setDCOP_id(true); > } > > Mixer* Mixer::masterCard() >diff -uNr tdemultimedia-trinity-14.0.4_old/kmix/mixer.h tdemultimedia-trinity-14.0.4/kmix/mixer.h >--- tdemultimedia-trinity-14.0.4_old/kmix/mixer.h 2017-06-16 19:08:12.000000000 +0300 >+++ tdemultimedia-trinity-14.0.4/kmix/mixer.h 2017-06-13 20:46:27.000000000 +0300 >@@ -53,6 +53,8 @@ > Mixer( int driver, int device ); > virtual ~Mixer(); > >+ void setDCOP_id( bool master = false ); >+ > static int numDrivers(); > > MixDevice* find(TQString& devPK); >@@ -98,6 +100,7 @@ > /// different MasterCard's at the moment (but actually KMixPanelApplet does not read/save this yet). > /// At the moment it is only used for selecting the Mixer to use in KMix's DockIcon. > static void setMasterCard(const TQString& ref_id); >+ static TQString masterCard_( ) { return _masterCard; } > static Mixer* masterCard(); > /// The global Master Device inside the current MasterCard (as returned by masterCard()). > static void setMasterCardDevice(TQString& ref_id); >diff -uNr tdemultimedia-trinity-14.0.4_old/kmix/mixertoolbox.cpp tdemultimedia-trinity-14.0.4/kmix/mixertoolbox.cpp >--- tdemultimedia-trinity-14.0.4_old/kmix/mixertoolbox.cpp 2017-06-16 19:08:12.000000000 +0300 >+++ tdemultimedia-trinity-14.0.4/kmix/mixertoolbox.cpp 2017-06-16 19:32:17.436879484 +0300 >@@ -159,6 +159,7 @@ > > mixer->setID(primaryKeyOfMixer); > >+ if(mixer->id() == Mixer::masterCard_()) mixer->setDCOP_id(true); > } // valid > else > { View Attachment As Diff View Attachment As Raw

• • Home
  • | New
  • | Browse
  • | Search
  • |
    [?]
  • | Reports
  • | Help
  • | New Account
  • | Log In
    [x]
  • | Forgot Password
    Login: [x]