1 files changed, 177 insertions, 40 deletions

diff --git a/src/ui/devicespage.cpp b/src/ui/devicespage.cpp
index 28cce07..0b39ece 100644
--- a/src/ui/devicespage.cpp
+++ b/src/ui/devicespage.cpp
@@ -64,9 +64,11 @@ DevicesPage::DevicesPage( PulseModel *model, TQWidget *parent )
 
     rebuild();
 
-    connect( model, TQ_SIGNAL(cardAdded(uint32_t)),   this, TQ_SLOT(onCardAdded(uint32_t)) );
-    connect( model, TQ_SIGNAL(cardRemoved(uint32_t)), this, TQ_SLOT(onCardRemoved(uint32_t)) );
-    connect( model, TQ_SIGNAL(cardUpdated(uint32_t)), this, TQ_SLOT(onCardUpdated(uint32_t)) );
+    connect( model, TQ_SIGNAL(cardAdded(uint32_t)),    this, TQ_SLOT(onCardAdded(uint32_t)) );
+    connect( model, TQ_SIGNAL(cardRemoved(uint32_t)),  this, TQ_SLOT(onCardRemoved(uint32_t)) );
+    connect( model, TQ_SIGNAL(cardUpdated(uint32_t)),  this, TQ_SLOT(onCardUpdated(uint32_t)) );
+    connect( model, TQ_SIGNAL(sinkUpdated(uint32_t)),  this, TQ_SLOT(onSinkUpdated(uint32_t)) );
+    connect( model, TQ_SIGNAL(sourceUpdated(uint32_t)),this, TQ_SLOT(onSourceUpdated(uint32_t)) );
 }
 
 void DevicesPage::rebuild()
@@ -75,6 +77,12 @@ void DevicesPage::rebuild()
     m_profileNames.clear();
     m_cardCombo.clear();
     m_cardPorts.clear();
+    m_sinkPortComboSink.clear();
+    m_sinkPortComboNames.clear();
+    m_sinkPortCombos.clear();
+    m_sourcePortComboSource.clear();
+    m_sourcePortComboNames.clear();
+    m_sourcePortCombos.clear();
 
     delete m_container;
     m_container = new TQWidget( m_scroll->viewport() );
@@ -117,6 +125,7 @@ void DevicesPage::rebuild()
         if ( !typeparts.isEmpty() )
             addTextRow( i18n("Type:"), typeparts.join(" / ") );
 
+        // Profile dropdown
         TQComboBox *combo = new TQComboBox( false, grp );
         combo->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
         addRow( i18n("Profile:"), combo );
@@ -139,6 +148,78 @@ void DevicesPage::rebuild()
 
         connect( combo, TQ_SIGNAL(activated(int)), this, TQ_SLOT(onProfileActivated(int)) );
 
+        // Sink port dropdowns — only when a sink has 2+ ports
+        TQValueList<PulseModel::DevicePortInfo> sinks = m_model->sinksForCard( info.index );
+        bool multiSink = false;
+        for ( TQValueList<PulseModel::DevicePortInfo>::Iterator sit = sinks.begin();
+              sit != sinks.end(); ++sit )
+            if ( (int)sit->ports.count() >= 2 ) { multiSink = ( sinks.count() > 1 ); break; }
+
+        for ( TQValueList<PulseModel::DevicePortInfo>::Iterator sit = sinks.begin();
+              sit != sinks.end(); ++sit ) {
+            if ( (int)sit->ports.count() < 2 ) continue;
+
+            TQComboBox *pc = new TQComboBox( false, grp );
+            pc->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
+            TQString label = multiSink
+                ? sit->description + i18n(" port:")
+                : i18n("Output port:");
+            addRow( label, pc );
+
+            TQValueList<TQString> portNames;
+            int activePort = 0, pi = 0;
+            for ( TQValueList<PulseDevicePort>::ConstIterator pit = sit->ports.begin();
+                  pit != sit->ports.end(); ++pit, ++pi ) {
+                pc->insertItem( (*pit).description );
+                portNames.append( (*pit).name );
+                if ( (*pit).name == sit->activePort )
+                    activePort = pi;
+            }
+            pc->setCurrentItem( activePort );
+
+            m_sinkPortComboNames[pc] = portNames;
+            m_sinkPortComboSink[pc]  = sit->paIndex;
+            m_sinkPortCombos[sit->paIndex] = pc;
+
+            connect( pc, TQ_SIGNAL(activated(int)), this, TQ_SLOT(onSinkPortActivated(int)) );
+        }
+
+        // Source port dropdowns — only when a source has 2+ ports
+        TQValueList<PulseModel::DevicePortInfo> sources = m_model->sourcesForCard( info.index );
+        bool multiSource = false;
+        for ( TQValueList<PulseModel::DevicePortInfo>::Iterator sit = sources.begin();
+              sit != sources.end(); ++sit )
+            if ( (int)sit->ports.count() >= 2 ) { multiSource = ( sources.count() > 1 ); break; }
+
+        for ( TQValueList<PulseModel::DevicePortInfo>::Iterator sit = sources.begin();
+              sit != sources.end(); ++sit ) {
+            if ( (int)sit->ports.count() < 2 ) continue;
+
+            TQComboBox *pc = new TQComboBox( false, grp );
+            pc->setSizePolicy( TQSizePolicy::Preferred, TQSizePolicy::Fixed );
+            TQString label = multiSource
+                ? sit->description + i18n(" port:")
+                : i18n("Input port:");
+            addRow( label, pc );
+
+            TQValueList<TQString> portNames;
+            int activePort = 0, pi = 0;
+            for ( TQValueList<PulseDevicePort>::ConstIterator pit = sit->ports.begin();
+                  pit != sit->ports.end(); ++pit, ++pi ) {
+                pc->insertItem( (*pit).description );
+                portNames.append( (*pit).name );
+                if ( (*pit).name == sit->activePort )
+                    activePort = pi;
+            }
+            pc->setCurrentItem( activePort );
+
+            m_sourcePortComboNames[pc]       = portNames;
+            m_sourcePortComboSource[pc]      = sit->paIndex;
+            m_sourcePortCombos[sit->paIndex] = pc;
+
+            connect( pc, TQ_SIGNAL(activated(int)), this, TQ_SLOT(onSourcePortActivated(int)) );
+        }
+
         // Ports — 2-column grid to keep tall cards compact
         if ( !info.ports.isEmpty() ) {
             TQLabel *portsHdr = new TQLabel( i18n("Ports:"), grp );
@@ -196,42 +277,7 @@ void DevicesPage::rebuild()
 
 void DevicesPage::onCardAdded( uint32_t )   { rebuild(); }
 void DevicesPage::onCardRemoved( uint32_t ) { rebuild(); }
-
-void DevicesPage::onCardUpdated( uint32_t index )
-{
-    TQMap<uint32_t, TQComboBox*>::Iterator cit = m_cardCombo.find( index );
-    if ( cit == m_cardCombo.end() ) return;
-    TQComboBox *combo = cit.data();
-
-    const PulseCardInfo *info = m_model->card( index );
-    if ( !info ) return;
-
-    // Update active profile in combo
-    TQMap<TQComboBox*, TQValueList<TQString> >::Iterator nit = m_profileNames.find( combo );
-    if ( nit != m_profileNames.end() ) {
-        TQValueList<TQString> &names = nit.data();
-        for ( int i = 0; i < (int)names.count(); ++i ) {
-            if ( names[i] == info->activeProfile ) {
-                combo->blockSignals( true );
-                combo->setCurrentItem( i );
-                combo->blockSignals( false );
-                break;
-            }
-        }
-    }
-
-    // Update port availability indicators in-place
-    TQMap<uint32_t, TQValueList<PortWidgets> >::Iterator pit = m_cardPorts.find( index );
-    if ( pit == m_cardPorts.end() ) return;
-    TQValueList<PortWidgets> &portWidgets = pit.data();
-
-    int i = 0;
-    for ( TQValueList<PulseCardPort>::ConstIterator p = info->ports.begin();
-          p != info->ports.end() && i < (int)portWidgets.count(); ++p, ++i ) {
-        bool plugged = ( (*p).available != PA_PORT_AVAILABLE_NO );
-        portWidgets[i].dot->setPixmap( availDot( plugged, 10 ) );
-    }
-}
+void DevicesPage::onCardUpdated( uint32_t ) { rebuild(); }
 
 void DevicesPage::onProfileActivated( int idx )
 {
@@ -242,10 +288,101 @@ void DevicesPage::onProfileActivated( int idx )
     if ( cit == m_comboCard.end() ) return;
     uint32_t cardIndex = cit.data();
 
-    TQMap<TQComboBox*, TQValueList<TQString> >::Iterator nit = m_profileNames.find( combo );
+    TQMap<TQComboBox*, TQValueList<TQString>>::Iterator nit = m_profileNames.find( combo );
     if ( nit == m_profileNames.end() || idx >= (int)nit.data().count() ) return;
 
     m_model->setCardProfile( cardIndex, nit.data()[idx] );
 }
 
+void DevicesPage::onSinkPortActivated( int idx )
+{
+    TQComboBox *combo = dynamic_cast<TQComboBox*>( const_cast<TQObject*>( sender() ) );
+    if ( !combo ) return;
+
+    TQMap<TQComboBox*, uint32_t>::Iterator cit = m_sinkPortComboSink.find( combo );
+    if ( cit == m_sinkPortComboSink.end() ) return;
+
+    TQMap<TQComboBox*, TQValueList<TQString>>::Iterator nit = m_sinkPortComboNames.find( combo );
+    if ( nit == m_sinkPortComboNames.end() || idx >= (int)nit.data().count() ) return;
+
+    m_model->setSinkPort( cit.data(), nit.data()[idx] );
+}
+
+void DevicesPage::onSourcePortActivated( int idx )
+{
+    TQComboBox *combo = dynamic_cast<TQComboBox*>( const_cast<TQObject*>( sender() ) );
+    if ( !combo ) return;
+
+    TQMap<TQComboBox*, uint32_t>::Iterator cit = m_sourcePortComboSource.find( combo );
+    if ( cit == m_sourcePortComboSource.end() ) return;
+
+    TQMap<TQComboBox*, TQValueList<TQString>>::Iterator nit = m_sourcePortComboNames.find( combo );
+    if ( nit == m_sourcePortComboNames.end() || idx >= (int)nit.data().count() ) return;
+
+    m_model->setSourcePort( cit.data(), nit.data()[idx] );
+}
+
+void DevicesPage::onSinkUpdated( uint32_t paIndex )
+{
+    TQMap<uint32_t, TQComboBox*>::Iterator cit = m_sinkPortCombos.find( paIndex );
+    if ( cit == m_sinkPortCombos.end() ) {
+        // Sink with ports appeared after last rebuild — refresh.
+        rebuild();
+        return;
+    }
+    TQComboBox *combo = cit.data();
+    TQMap<TQComboBox*, TQValueList<TQString>>::Iterator nit = m_sinkPortComboNames.find( combo );
+    if ( nit == m_sinkPortComboNames.end() ) return;
+
+    // Find current active port from the model's sinksForCard lookup.
+    // Walk all cards to find this sink.
+    TQValueList<PulseCardInfo> cards = m_model->cards();
+    for ( TQValueList<PulseCardInfo>::ConstIterator it = cards.begin(); it != cards.end(); ++it ) {
+        TQValueList<PulseModel::DevicePortInfo> sinks = m_model->sinksForCard( (*it).index );
+        for ( TQValueList<PulseModel::DevicePortInfo>::ConstIterator sit = sinks.begin();
+              sit != sinks.end(); ++sit ) {
+            if ( (*sit).paIndex != paIndex ) continue;
+            TQValueList<TQString> &names = nit.data();
+            for ( int i = 0; i < (int)names.count(); ++i ) {
+                if ( names[i] == (*sit).activePort ) {
+                    combo->blockSignals( true );
+                    combo->setCurrentItem( i );
+                    combo->blockSignals( false );
+                    return;
+                }
+            }
+        }
+    }
+}
+
+void DevicesPage::onSourceUpdated( uint32_t paIndex )
+{
+    TQMap<uint32_t, TQComboBox*>::Iterator cit = m_sourcePortCombos.find( paIndex );
+    if ( cit == m_sourcePortCombos.end() ) {
+        rebuild();
+        return;
+    }
+    TQComboBox *combo = cit.data();
+    TQMap<TQComboBox*, TQValueList<TQString>>::Iterator nit = m_sourcePortComboNames.find( combo );
+    if ( nit == m_sourcePortComboNames.end() ) return;
+
+    TQValueList<PulseCardInfo> cards = m_model->cards();
+    for ( TQValueList<PulseCardInfo>::ConstIterator it = cards.begin(); it != cards.end(); ++it ) {
+        TQValueList<PulseModel::DevicePortInfo> sources = m_model->sourcesForCard( (*it).index );
+        for ( TQValueList<PulseModel::DevicePortInfo>::ConstIterator sit = sources.begin();
+              sit != sources.end(); ++sit ) {
+            if ( (*sit).paIndex != paIndex ) continue;
+            TQValueList<TQString> &names = nit.data();
+            for ( int i = 0; i < (int)names.count(); ++i ) {
+                if ( names[i] == (*sit).activePort ) {
+                    combo->blockSignals( true );
+                    combo->setCurrentItem( i );
+                    combo->blockSignals( false );
+                    return;
+                }
+            }
+        }
+    }
+}
+
 #include "devicespage.moc"